X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4017f5ca49e153e04ffd1c49bc93afd31c1cdf87..cc4d5638c66a409e421420ed7110917755a66788:/src/common/socket.cpp?ds=inline diff --git a/src/common/socket.cpp b/src/common/socket.cpp index fb18c2e341..a793e3520d 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -6,8 +6,7 @@ // Copyright: (C) 1999-1997, Guilhem Lavaux // (C) 1999-2000, Guillermo Rodriguez Garcia // (C) 2008 Vadim Zeitlin -// RCS_ID: $Id$ -// License: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ========================================================================== @@ -172,7 +171,9 @@ public: m_oldflags(socket->GetFlags()) { - wxASSERT_MSG( flag == wxSOCKET_WAITALL || flag == wxSOCKET_NOWAIT, + // We can be passed only wxSOCKET_WAITALL{_READ,_WRITE} or + // wxSOCKET_NOWAIT{_READ,_WRITE} normally. + wxASSERT_MSG( !(flag & wxSOCKET_WAITALL) || !(flag & wxSOCKET_NOWAIT), "not a wait flag" ); // preserve wxSOCKET_BLOCK value when switching to wxSOCKET_WAITALL @@ -524,7 +525,7 @@ wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket) { wxSockAddressStorage from; WX_SOCKLEN_T fromlen = sizeof(from); - const SOCKET fd = accept(m_fd, &from.addr, &fromlen); + const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen); // accepting is similar to reading in the sense that it resets "ready for // read" flag on the socket @@ -753,8 +754,11 @@ int wxSocketImpl::Write(const void *buffer, int size) namespace { -// flag indicating whether wxSocketManager was already initialized -bool gs_socketInitDone = false; +// counts the number of calls to Initialize() minus the number of calls to +// Shutdown(): we don't really need it any more but it was documented that +// Shutdown() must be called the same number of times as Initialize() and using +// a counter helps us to check it +int gs_socketInitCount = 0; } // anonymous namespace @@ -762,7 +766,7 @@ bool wxSocketBase::IsInitialized() { wxASSERT_MSG( wxIsMainThread(), "unsafe to call from other threads" ); - return gs_socketInitDone; + return gs_socketInitCount != 0; } bool wxSocketBase::Initialize() @@ -770,15 +774,15 @@ bool wxSocketBase::Initialize() wxCHECK_MSG( wxIsMainThread(), false, "must be called from the main thread" ); - if ( !gs_socketInitDone ) + if ( !gs_socketInitCount ) { wxSocketManager * const manager = wxSocketManager::Get(); if ( !manager || !manager->OnInit() ) return false; - - gs_socketInitDone = true; } + gs_socketInitCount++; + return true; } @@ -786,14 +790,15 @@ void wxSocketBase::Shutdown() { wxCHECK_RET( wxIsMainThread(), "must be called from the main thread" ); - wxCHECK_RET( gs_socketInitDone, "unnecessary call to Shutdown()" ); + wxCHECK_RET( gs_socketInitCount > 0, "too many calls to Shutdown()" ); - gs_socketInitDone = false; - - wxSocketManager * const manager = wxSocketManager::Get(); - wxCHECK_RET( manager, "should have a socket manager" ); + if ( !--gs_socketInitCount ) + { + wxSocketManager * const manager = wxSocketManager::Get(); + wxCHECK_RET( manager, "should have a socket manager" ); - manager->OnExit(); + manager->OnExit(); + } } // -------------------------------------------------------------------------- @@ -813,6 +818,8 @@ void wxSocketBase::Init() m_writing = m_closed = false; m_lcount = 0; + m_lcount_read = 0; + m_lcount_write = 0; m_timeout = 600; m_beingDeleted = false; @@ -883,8 +890,12 @@ bool wxSocketBase::Destroy() Notify(false); // Schedule this object for deletion instead of destroying it right now if - // possible as we may have other events pending for it - if ( wxTheApp ) + // it can have other events pending for it and we have a way to do it. + // + // Notice that sockets used in other threads won't have any events for them + // and we shouldn't use delayed destruction mechanism for them as it's not + // MT-safe. + if ( wxIsMainThread() && wxTheApp ) { wxTheApp->ScheduleForDestruction(this); } @@ -939,7 +950,8 @@ wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes) { wxSocketReadGuard read(this); - m_lcount = DoRead(buffer, nbytes); + m_lcount_read = DoRead(buffer, nbytes); + m_lcount = m_lcount_read; return *this; } @@ -975,8 +987,12 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK ) { // if we don't want to wait, just return immediately - if ( m_flags & wxSOCKET_NOWAIT ) + if ( m_flags & wxSOCKET_NOWAIT_READ ) + { + // this shouldn't be counted as an error in this case + SetError(wxSOCKET_NOERROR); break; + } // otherwise wait until the socket becomes ready for reading or // an error occurs on it @@ -1007,7 +1023,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) // we're not going to read anything else and so if we haven't read // anything (or not everything in wxSOCKET_WAITALL case) already, // signal an error - if ( (m_flags & wxSOCKET_WAITALL) || !total ) + if ( (m_flags & wxSOCKET_WAITALL_READ) || !total ) SetError(wxSOCKET_IOERR); break; } @@ -1016,7 +1032,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) // if we are happy to read something and not the entire nbytes bytes, // then we're done - if ( !(m_flags & wxSOCKET_WAITALL) ) + if ( !(m_flags & wxSOCKET_WAITALL_READ) ) break; nbytes -= ret; @@ -1036,7 +1052,7 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes) wxSocketReadGuard read(this); - wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL); + wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_READ); bool ok = false; if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) ) @@ -1063,7 +1079,8 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes) len2 = 0; // Don't attempt to read if the msg was zero bytes long. - m_lcount = len ? DoRead(buffer, len) : 0; + m_lcount_read = len ? DoRead(buffer, len) : 0; + m_lcount = m_lcount_read; if ( len2 ) { @@ -1105,6 +1122,9 @@ wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes) { wxSocketReadGuard read(this); + // Peek() should never block + wxSocketWaitModeChanger changeFlags(this, wxSOCKET_NOWAIT); + m_lcount = DoRead(buffer, nbytes); Pushback(buffer, m_lcount); @@ -1116,7 +1136,8 @@ wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes) { wxSocketWriteGuard write(this); - m_lcount = DoWrite(buffer, nbytes); + m_lcount_write = DoWrite(buffer, nbytes); + m_lcount = m_lcount_write; return *this; } @@ -1136,7 +1157,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) { if ( m_impl->m_stream && !m_connected ) { - if ( (m_flags & wxSOCKET_WAITALL) || !total ) + if ( (m_flags & wxSOCKET_WAITALL_WRITE) || !total ) SetError(wxSOCKET_IOERR); break; } @@ -1146,7 +1167,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) { if ( m_impl->GetLastError() == wxSOCKET_WOULDBLOCK ) { - if ( m_flags & wxSOCKET_NOWAIT ) + if ( m_flags & wxSOCKET_NOWAIT_WRITE ) break; if ( !DoWaitWithTimeout(wxSOCKET_OUTPUT_FLAG) ) @@ -1166,7 +1187,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) total += ret; - if ( !(m_flags & wxSOCKET_WAITALL) ) + if ( !(m_flags & wxSOCKET_WAITALL_WRITE) ) break; nbytes -= ret; @@ -1186,7 +1207,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes) wxSocketWriteGuard write(this); - wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL); + wxSocketWaitModeChanger changeFlags(this, wxSOCKET_WAITALL_WRITE); msg.sig[0] = (unsigned char) 0xad; msg.sig[1] = (unsigned char) 0xde; @@ -1201,8 +1222,9 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes) bool ok = false; if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg) ) { - m_lcount = DoWrite(buffer, nbytes); - if ( m_lcount == nbytes ) + m_lcount_write = DoWrite(buffer, nbytes); + m_lcount = m_lcount_write; + if ( m_lcount_write == nbytes ) { msg.sig[0] = (unsigned char) 0xed; msg.sig[1] = (unsigned char) 0xfe; @@ -1286,17 +1308,31 @@ wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags, exceptfds; // always want to know about errors if ( flags & wxSOCKET_INPUT_FLAG ) - { preadfds = &readfds; + + if ( flags & wxSOCKET_OUTPUT_FLAG ) + pwritefds = &writefds; + + // When using non-blocking connect() the client socket becomes connected + // (successfully or not) when it becomes writable but when using + // non-blocking accept() the server socket becomes connected when it + // becomes readable. + if ( flags & wxSOCKET_CONNECTION_FLAG ) + { + if ( m_server ) + preadfds = &readfds; + else + pwritefds = &writefds; + } + + if ( preadfds ) + { wxFD_ZERO(preadfds); wxFD_SET(m_fd, preadfds); } - // when using non-blocking connect() the socket becomes connected - // (successfully or not) when it becomes writable - if ( flags & (wxSOCKET_OUTPUT_FLAG | wxSOCKET_CONNECTION_FLAG) ) + if ( pwritefds ) { - pwritefds = &writefds; wxFD_ZERO(pwritefds); wxFD_SET(m_fd, pwritefds); } @@ -1365,10 +1401,11 @@ wxSocketBase::DoWait(long timeout, wxSocketEventFlags flags) { wxCHECK_MSG( m_impl, -1, "can't wait on invalid socket" ); - // we're never going to become ready in a client if we're not connected any - // more (OTOH a server can call this to precisely wait for a connection so - // do wait for it in this case) - if ( !m_impl->IsServer() && !m_connected && !m_establishing ) + // we're never going to become ready in a TCP client if we're not connected + // any more (OTOH a server can call this to precisely wait for a connection + // so do wait for it in this case and UDP client is never "connected") + if ( !m_impl->IsServer() && + m_impl->m_stream && !m_connected && !m_establishing ) return -1; // This can be set to true from Interrupt() to exit this function a.s.a.p. @@ -1782,14 +1819,17 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr, if (m_impl->CreateServer() != wxSOCKET_NOERROR) { - delete m_impl; - m_impl = NULL; + wxDELETE(m_impl); wxLogTrace( wxTRACE_Socket, wxT("*** CreateServer() failed") ); return; } - wxLogTrace( wxTRACE_Socket, wxT("wxSocketServer on fd %d"), m_impl->m_fd ); + // Notice that we need a cast as wxSOCKET_T is 64 bit under Win64 and that + // the cast is safe because a wxSOCKET_T is a handle and so limited to 32 + // (or, actually, even 24) bit values anyhow. + wxLogTrace( wxTRACE_Socket, wxT("wxSocketServer on fd %u"), + static_cast(m_impl->m_fd) ); } // -------------------------------------------------------------------------- @@ -1853,6 +1893,14 @@ bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG) == 1; } +wxSOCKET_T wxSocketBase::GetSocket() const +{ + wxASSERT_MSG( m_impl, wxS("Socket not initialised") ); + + return m_impl->m_fd; +} + + bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen) { wxASSERT_MSG( m_impl, wxT("Socket not initialised") ); @@ -2023,8 +2071,7 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr, if ( m_impl->CreateUDP() != wxSOCKET_NOERROR ) { - delete m_impl; - m_impl = NULL; + wxDELETE(m_impl); return; } @@ -2087,12 +2134,12 @@ wxFORCE_LINK_MODULE( socketiohandler ) #endif // same for ManagerSetter in the MSW file -#ifdef __WXMSW__ +#ifdef __WINDOWS__ wxFORCE_LINK_MODULE( mswsocket ) #endif // and for OSXManagerSetter in the OS X one -#ifdef __WXMAC__ +#ifdef __WXOSX__ wxFORCE_LINK_MODULE( osxsocket ) #endif