X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63496c98fae055cfc33d9f9f688f97bf43956b21..0c589ad076cb531a3ef7808aaedadc03c8286942:/src/common/sckint.cpp

diff --git a/src/common/sckint.cpp b/src/common/sckint.cpp
index 35c95d2a43..8531c9b3a9 100644
--- a/src/common/sckint.cpp
+++ b/src/common/sckint.cpp
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:       socket.cpp
-// Purpose:    Socket handler classes
-// Authors:    Guilhem Lavaux (completely rewritten from a basic API of Andrew
-//             Davidson(1995) in wxWeb)
-// Created:    April 1997
-// Updated:    April 1999
+// Name:       sckint.cpp
+// Purpose:    Socket internal classes
+// Authors:    Guilhem Lavaux
+// Created:    April 1999
+// Updated:
 // Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux
 // RCS_ID:     $Id$
 // License:    see wxWindows license
@@ -84,9 +83,11 @@
 // --------- SocketWaiter ---------------------------------------
 // --------------------------------------------------------------
 
+#if wxUSE_THREADS
 SocketWaiter::SocketWaiter(wxSocketBase *socket,
 				 wxSocketInternal *internal)
-  : m_socket(socket), m_internal(internal), m_fd(internal->GetFD())
+  : wxThread(), 
+    m_socket(socket), m_internal(internal), m_fd(internal->GetFD())
 {
 }
 
@@ -99,7 +100,9 @@ void SocketWaiter::ProcessReadEvent()
   int ret;
   char c;
 
+  m_internal->AcquireFD();
   ret = recv(m_fd, &c, 1, MSG_PEEK);
+  m_internal->ReleaseFD();
   
   // We are a server => emit a EVT_ACCEPT event.
   if (ret == -1 && m_socket->GetType() == wxSocketBase::SOCK_SERVER) {
@@ -109,10 +112,11 @@ void SocketWaiter::ProcessReadEvent()
   
   // Else, no error => there is something to be read else
   // we've lost the connection.
-  if (ret > 0)
+  if (ret > 0) {
     m_socket->OnRequest(wxSocketBase::EVT_READ);
-  else {
+  } else {
     m_socket->OnRequest(wxSocketBase::EVT_LOST);
+    m_internal->ReleaseData();  // In that case, we mustn't forget to unlock the mutex.
     Exit(NULL);
   }
 }
@@ -139,14 +143,16 @@ void *SocketWaiter::Entry()
 
     FD_ZERO(&sockrd_set);
     FD_ZERO(&sockwr_set);
-    
+
+    m_internal->AcquireData();
+
     if ((m_socket->NeededReq() & READ_MASK) != 0)
       FD_SET(m_fd, &sockrd_set);
     if ((m_socket->NeededReq() & WRITE_MASK) != 0)
       FD_SET(m_fd, &sockwr_set);
 
     m_internal->AcquireFD();
-    ret = select(FD_SETSIZE, &sockrd_set, &sockwr_set, NULL, &tv);
+    ret = select(m_fd+1, &sockrd_set, &sockwr_set, NULL, &tv);
     m_internal->ReleaseFD();
 
     if (FD_ISSET(m_fd, &sockrd_set))
@@ -155,20 +161,20 @@ void *SocketWaiter::Entry()
     if (FD_ISSET(m_fd, &sockwr_set))
       ProcessWriteEvent();
 
+    m_internal->ReleaseData();
+
 #if wxUSE_THREADS
 #ifdef Yield
 #undef Yield
 #endif
 #endif
 
-    if (ret == 0)
-      // If nothing happened, we wait for 100 ms.
-      wxUsleep(10);
+   // We wait for 100 ms to prevent the CPU from burning.
+   wxUsleep(100);
 
     // Check whether we should exit.
-    if (TestDestroy()) {
+    if (TestDestroy())
       return NULL;
-    }
   }
   return NULL;
 }
@@ -179,7 +185,11 @@ void *SocketWaiter::Entry()
 
 SocketRequester::SocketRequester(wxSocketBase *socket,
 				 wxSocketInternal *internal)
-  : m_socket(socket), m_internal(internal), m_fd(internal->GetFD())
+  :
+#if wxUSE_THREADS
+    wxThread(),
+#endif
+    m_socket(socket), m_internal(internal), m_fd(internal->GetFD())
 {
 }
 
@@ -197,15 +207,15 @@ bool SocketRequester::WaitFor(wxSocketBase::wxRequestNotify req, int millisec)
   tv.tv_sec = millisec / 1000;
   tv.tv_usec = (millisec % 1000) * 1000;
 
-  if ((req & READ_MASK) != 0)  
-    FD_ZERO(&sockrd_set);
+  FD_ZERO(&sockrd_set);
   FD_ZERO(&sockwr_set);
-
-  FD_SET(m_fd, &sockrd_set);
-  FD_SET(m_fd, &sockwr_set);
+  if ((req & READ_MASK) != 0)  
+    FD_SET(m_fd, &sockrd_set);
+  if ((req & WRITE_MASK) != 0)
+    FD_SET(m_fd, &sockwr_set);
   
   m_internal->AcquireFD();
-  ret = select(FD_SETSIZE, &sockrd_set, &sockwr_set, NULL, &tv);
+  ret = select(m_fd+1, &sockrd_set, &sockwr_set, NULL, &tv);
   m_internal->ReleaseFD();
 
   return (ret != 0);
@@ -240,6 +250,9 @@ void SocketRequester::ProcessReadEvent(SockRequest *req)
     req->size -= len;
     req->io_nbytes += len;
     req->buffer += len;
+
+    if (len == 0)
+      m_internal->EndRequest(req); 
     return;
   }
   // The End.
@@ -252,6 +265,11 @@ void SocketRequester::ProcessWriteEvent(SockRequest *req)
   int ret;
   size_t len;
 
+  if (!WaitFor(wxSocketBase::REQ_WRITE, req->timeout)) {
+    m_internal->EndRequest(req);
+    return;
+  }
+
   m_internal->AcquireFD();
   ret = send(m_fd, req->buffer, req->size, 0);
   m_internal->ReleaseFD();
@@ -286,13 +304,15 @@ void *SocketRequester::Entry()
 {
   SockRequest *req;
 
+  m_internal->m_request_locker.Lock();
   while (1) {
     // Wait for a new request or a destroy message.
     req = m_internal->WaitForReq();
     m_internal->m_end_requester.Lock();
-    if (TestDestroy() || req == NULL) {
+    if (req == NULL) {
       m_internal->m_invalid_requester = TRUE;
       m_internal->m_end_requester.Unlock();
+      m_internal->m_request_locker.Unlock();
       return NULL;
     }
     m_internal->m_end_requester.Unlock();
@@ -314,6 +334,7 @@ void *SocketRequester::Entry()
   }
   return NULL;
 }
+#endif
 
 // --------------------------------------------------------------
 // --------- wxSocketInternal -----------------------------------
@@ -325,7 +346,6 @@ wxSocketInternal::wxSocketInternal(wxSocketBase *socket)
   m_thread_requester = NULL;
   m_thread_waiter = NULL;
   m_invalid_requester = TRUE;
-  m_request_locker.Lock();
 }
 
 wxSocketInternal::~wxSocketInternal()
@@ -334,7 +354,6 @@ wxSocketInternal::~wxSocketInternal()
   wxASSERT(m_thread_requester == NULL);
   StopWaiter();
   wxASSERT(m_thread_waiter == NULL);
-  m_request_locker.Unlock();
 }
 
 // ----------------------------------------------------------------------
@@ -343,18 +362,24 @@ wxSocketInternal::~wxSocketInternal()
 // ----------------------------------------------------------------------
 SockRequest *wxSocketInternal::WaitForReq()
 {
+#if wxUSE_THREADS
   wxNode *node;
 
+  // First try.
   node = m_requests.First();
   if (node == NULL) {
-    m_socket_cond.Wait(m_request_locker, 1, 0);
+    m_socket_cond.Wait(m_request_locker, 10, 0);
 
+    // Second try, if it is unsuccessul we give up.
     node = m_requests.First();
     if (node == NULL)
       return NULL;
   }
 
   return (SockRequest *)node->Data();
+#else
+  return NULL;
+#endif
 }
 
 // ----------------------------------------------------------------------
@@ -371,85 +396,128 @@ void wxSocketInternal::EndRequest(SockRequest *req)
     delete node;
 }
 
+void wxSocketInternal::AcquireData()
+{
+#if wxUSE_THREADS
+  m_socket_locker.Lock();
+#endif
+}
+
+void wxSocketInternal::ReleaseData()
+{
+#if wxUSE_THREADS
+  m_socket_locker.Unlock();
+#endif
+}
+
 void wxSocketInternal::AcquireFD()
 {
+#if wxUSE_THREADS
   m_fd_locker.Lock();
+#endif
 }
 
 void wxSocketInternal::ReleaseFD()
 {
+#if wxUSE_THREADS
   m_fd_locker.Unlock();
+#endif
 }
 
 void wxSocketInternal::ResumeRequester()
 {
+#if wxUSE_THREADS
   wxThreadError err;
 
-  wxASSERT(m_thread_requester == NULL);
+  wxASSERT(m_invalid_requester);
 
   m_end_requester.Lock();
-  if (m_invalid_requester) {
+
+  if (m_thread_requester != NULL) {
+    m_thread_requester->Delete(); // We must join it.
     delete m_thread_requester;
+  }
 
-    m_thread_requester = new SocketRequester(m_socket, this);
-    m_thread_requester->m_fd = m_socket->m_fd;
+  m_invalid_requester = FALSE;
 
-    err = m_thread_requester->Create();
-    wxASSERT(err == wxTHREAD_NO_ERROR);
+  m_end_requester.Unlock();
 
-    err = m_thread_requester->Run();
-    wxASSERT(err == wxTHREAD_NO_ERROR);
+  m_thread_requester = new SocketRequester(m_socket, this);
 
-    m_invalid_requester = FALSE;
-  }
-  m_end_requester.Unlock();
+  err = m_thread_requester->Create();
+  wxASSERT(err == wxTHREAD_NO_ERROR);
+
+  err = m_thread_requester->Run();
+  wxASSERT(err == wxTHREAD_NO_ERROR);
+#else
+  if (!m_invalid_requester) 
+    return;
+  m_thread_requester = new SocketRequester(m_socket, this);
+  m_invalid_requester = FALSE;
+#endif
 }
 
 void wxSocketInternal::StopRequester()
 {
+#if wxUSE_THREADS
+  m_end_requester.Lock();
   if (m_invalid_requester) {
-    delete m_thread_requester;
-    m_thread_requester = NULL;
-    m_invalid_requester = FALSE;
+    m_end_requester.Unlock();
+    if (m_thread_requester) {
+      m_thread_requester->Delete();
+      delete m_thread_requester;
+      m_thread_requester = NULL;
+    }
+    m_invalid_requester = TRUE;
     return;
   }
+  m_end_requester.Unlock();
 
   wxASSERT(m_thread_requester != NULL);
 
-  m_socket_locker.Lock();
+  m_request_locker.Lock();
 
   // Send a signal to the requester.
-  if (m_requests.Number() == 0)
-    m_socket_cond.Signal();
+  m_socket_cond.Signal();
 
-  m_socket_locker.Unlock();
+  m_request_locker.Unlock();
 
   // Finish the destruction of the requester.
   m_thread_requester->Delete();
 
   delete m_thread_requester;
   m_thread_requester = NULL;
+  m_invalid_requester = TRUE;
+#else
+  delete m_thread_requester;
+  m_thread_requester = NULL;
+  m_invalid_requester = TRUE;
+#endif
 }
 
 void wxSocketInternal::ResumeWaiter()
 {
+#if wxUSE_THREADS
   wxThreadError err;
 
   if (m_thread_waiter != NULL)
     return;
 
   m_thread_waiter = new SocketWaiter(m_socket, this);
-  m_thread_waiter->m_fd = m_socket->m_fd;
+
+  m_thread_waiter->SetPriority(WXTHREAD_MIN_PRIORITY);
 
   err = m_thread_waiter->Create();
   wxASSERT(err == wxTHREAD_NO_ERROR);
 
   err = m_thread_waiter->Run();
   wxASSERT(err == wxTHREAD_NO_ERROR);
+#endif
 }
 
 void wxSocketInternal::StopWaiter()
 {
+#if wxUSE_THREADS
   if (m_thread_waiter == NULL)
     return;
 
@@ -457,6 +525,7 @@ void wxSocketInternal::StopWaiter()
 
   delete m_thread_waiter;
   m_thread_waiter = NULL;
+#endif
 }
 
 // ----------------------------------------------------------------------
@@ -464,9 +533,11 @@ void wxSocketInternal::StopWaiter()
 // ----------------------------------------------------------------------
 void wxSocketInternal::QueueRequest(SockRequest *request, bool async)
 {
+  if (m_invalid_requester)
+    ResumeRequester();
+
+#if wxUSE_THREADS
   if (async) {
-    if (m_thread_requester == NULL)
-      ResumeRequester();
 
     m_request_locker.Lock();
     request->done = FALSE;
@@ -488,6 +559,7 @@ void wxSocketInternal::QueueRequest(SockRequest *request, bool async)
     }
   } else {
     m_request_locker.Lock();
+#endif
 
     if ((request->type & wxSocketBase::REQ_WAIT) != 0) {
       m_thread_requester->ProcessWaitEvent(request);
@@ -506,13 +578,17 @@ void wxSocketInternal::QueueRequest(SockRequest *request, bool async)
       }
     }
     request->done = TRUE;
+#if wxUSE_THREADS
     m_request_locker.Unlock();
   }
+#endif
 }
 
 void wxSocketInternal::WaitForEnd(SockRequest *request)
 {
+#if wxUSE_THREADS
   // TODOTODO
+#endif
 }
 
 #endif