Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxSocket::Initialize() and Shutdown() are for main thread only.

Browse Source 
Calling Initialize() from another thread could never work before but it wasn't
clear that this was the case so document it in the functions comments and
documentation now and add asserts checking that they are called from the main
thread only.

Also simplify the code as we don't actually need to do any reference-counting
here and a simple boolean flag indicating whether the sockets are initialized
is enough.

Closes #11119.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-21 08:44:35 +00:00
parent 7b7ad6a7f2
commit 4017f5ca49
3 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/common/socket.cpp
View File

@@ -750,26 +750,33 @@ int wxSocketImpl::Write(const void *buffer, int size)
// Initialization and shutdown
// --------------------------------------------------------------------------
// FIXME-MT: all this is MT-unsafe, of course, we should protect all accesses
// to m_countInit with a crit section
size_t wxSocketBase::m_countInit = 0;
namespace
{
// flag indicating whether wxSocketManager was already initialized
bool gs_socketInitDone = false;
} // anonymous namespace
bool wxSocketBase::IsInitialized()
{
return m_countInit > 0;
wxASSERT_MSG( wxIsMainThread(), "unsafe to call from other threads" );
return gs_socketInitDone;
}
bool wxSocketBase::Initialize()
{
if ( !m_countInit++ )
wxCHECK_MSG( wxIsMainThread(), false,
"must be called from the main thread" );
if ( !gs_socketInitDone )
{
wxSocketManager * const manager = wxSocketManager::Get();
if ( !manager || !manager->OnInit() )
{
m_countInit--;
return false;
}
gs_socketInitDone = true;
}
return true;
@@ -777,15 +784,16 @@ bool wxSocketBase::Initialize()
void wxSocketBase::Shutdown()
{
// we should be initialized
wxASSERT_MSG( m_countInit > 0, wxT("extra call to Shutdown()") );
if ( --m_countInit == 0 )
{
wxSocketManager * const manager = wxSocketManager::Get();
wxCHECK_RET( manager, "should have a socket manager" );
wxCHECK_RET( wxIsMainThread(), "must be called from the main thread" );
manager->OnExit();
}
wxCHECK_RET( gs_socketInitDone, "unnecessary call to Shutdown()" );
gs_socketInitDone = false;
wxSocketManager * const manager = wxSocketManager::Get();
wxCHECK_RET( manager, "should have a socket manager" );
manager->OnExit();
}
// --------------------------------------------------------------------------
@@ -821,13 +829,15 @@ void wxSocketBase::Init()
m_eventmask =
m_eventsgot = 0;
if ( !IsInitialized() )
// when we create the first socket in the main thread we initialize the
// OS-dependent socket stuff: notice that this means that the user code
// needs to call wxSocket::Initialize() itself if the first socket it
// creates is not created in the main thread
if ( wxIsMainThread() )
{
// this Initialize() will be undone by wxSocketModule::OnExit(), all
// the other calls to it should be matched by a call to Shutdown()
if (!Initialize())
if ( !Initialize() )
{
wxLogError("Cannot initialize wxSocketBase");
wxLogError(_("Cannot initialize sockets"));
}
}
}