AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed two or three things in sckint.cpp but I still don't manage to

Browse Source 
fix the bug in wxSocketInternal::StopWaiter (Main thread hangs in
  wxThreadInternal::Wait). If someone has an idea I would be very happy ...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux 1999-05-09 12:24:13 +00:00
parent 31276cb5e7
commit 63496c98fa
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/sckint.h
View File

@ -126,13 +126,14 @@ class wxSocketInternal {
SockRequest *WaitForReq();
void EndRequest(SockRequest *req);
public:
wxMutex m_socket_locker, m_fd_locker, m_request_locker;
wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
wxCondition m_socket_cond;
wxSocketBase *m_socket;
SocketWaiter *m_thread_waiter;
SocketRequester *m_thread_requester;
wxList m_requests;
int m_fd;
bool m_invalid_requester;
};
#endif

43
src/common/sckint.cpp
View File

@ -161,11 +161,9 @@ void *SocketWaiter::Entry()
#endif
#endif
/*
if (ret == 0)
// If nothing happened, we wait for 100 ms.
wxUsleep(10);
*/
// Check whether we should exit.
if (TestDestroy()) {
@ -291,8 +289,13 @@ void *SocketRequester::Entry()
while (1) {
// Wait for a new request or a destroy message.
req = m_internal->WaitForReq();
if (TestDestroy() || req == NULL)
m_internal->m_end_requester.Lock();
if (TestDestroy() || req == NULL) {
m_internal->m_invalid_requester = TRUE;
m_internal->m_end_requester.Unlock();
return NULL;
}
m_internal->m_end_requester.Unlock();
if ((req->type & wxSocketBase::REQ_WAIT) != 0) {
ProcessWaitEvent(req);
@ -321,12 +324,15 @@ wxSocketInternal::wxSocketInternal(wxSocketBase *socket)
m_socket = socket;
m_thread_requester = NULL;
m_thread_waiter = NULL;
m_invalid_requester = TRUE;
m_request_locker.Lock();
}
wxSocketInternal::~wxSocketInternal()
{
StopRequester();
wxASSERT(m_thread_requester == NULL);
StopWaiter();
wxASSERT(m_thread_waiter == NULL);
m_request_locker.Unlock();
}
@ -341,7 +347,7 @@ SockRequest *wxSocketInternal::WaitForReq()
node = m_requests.First();
if (node == NULL) {
m_socket_cond.Wait(m_request_locker);
m_socket_cond.Wait(m_request_locker, 1, 0);
node = m_requests.First();
if (node == NULL)
@ -381,18 +387,33 @@ void wxSocketInternal::ResumeRequester()
wxASSERT(m_thread_requester == NULL);
m_thread_requester = new SocketRequester(m_socket, this);
m_thread_requester->m_fd = m_socket->m_fd;
m_end_requester.Lock();
if (m_invalid_requester) {
delete m_thread_requester;
err = m_thread_requester->Create();
wxASSERT(err == wxTHREAD_NO_ERROR);
m_thread_requester = new SocketRequester(m_socket, this);
m_thread_requester->m_fd = m_socket->m_fd;
err = m_thread_requester->Run();
wxASSERT(err == wxTHREAD_NO_ERROR);
err = m_thread_requester->Create();
wxASSERT(err == wxTHREAD_NO_ERROR);
err = m_thread_requester->Run();
wxASSERT(err == wxTHREAD_NO_ERROR);
m_invalid_requester = FALSE;
}
m_end_requester.Unlock();
}
void wxSocketInternal::StopRequester()
{
if (m_invalid_requester) {
delete m_thread_requester;
m_thread_requester = NULL;
m_invalid_requester = FALSE;
return;
}
wxASSERT(m_thread_requester != NULL);
m_socket_locker.Lock();
@ -429,7 +450,6 @@ void wxSocketInternal::ResumeWaiter()
void wxSocketInternal::StopWaiter()
{
/*
if (m_thread_waiter == NULL)
return;
@ -437,7 +457,6 @@ void wxSocketInternal::StopWaiter()
delete m_thread_waiter;
m_thread_waiter = NULL;
*/
}
// ----------------------------------------------------------------------