Fix bug with unloading wxPluginLibrary objects in "wrong" order.

wxPluginLibrary objects had to be unloaded in exactly the reverse order to
which they were loaded in. This was not documented and was a serious
limitation for any realistic use of plugins anyhow, so fix it and allow
unloading them in any order now.

Instead of keeping a pointer to the last wxClassInfo not created by this
plugin, now keep a pointer to the first wxClassInfo that was created by it.
This makes the code slightly more complex but this pointer, unlike the old
one, remains valid even if another plugin was unloaded.

Closes #14261.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-26 12:29:54 +00:00
parent f0d38b659f
commit 7ed9cd2891
3 changed files with 57 additions and 12 deletions

View File

@@ -522,6 +522,7 @@ All:
- Implement wxThread::SetConcurrency() for POSIX systems (Igor Korot). - Implement wxThread::SetConcurrency() for POSIX systems (Igor Korot).
- Fix deadlock due to too many events in Unix console apps (Lukasz Michalski). - Fix deadlock due to too many events in Unix console apps (Lukasz Michalski).
- Added wxDir::GetNameWithSep(). - Added wxDir::GetNameWithSep().
- Allow unloading wxPluginLibrary objects in any order (manyleaves).
All (GUI): All (GUI):

View File

@@ -82,8 +82,11 @@ public:
private: private:
const wxClassInfo *m_before; // sm_first before loading this lib // These pointers may be NULL but if they are not, then m_ourLast follows
const wxClassInfo *m_after; // ..and after. // m_ourFirst in the linked list, i.e. can be found by calling GetNext() a
// sufficient number of times.
const wxClassInfo *m_ourFirst; // first class info in this plugin
const wxClassInfo *m_ourLast; // ..and the last one
size_t m_linkcount; // Ref count of library link calls size_t m_linkcount; // Ref count of library link calls
size_t m_objcount; // ..and (pluggable) object instantiations. size_t m_objcount; // ..and (pluggable) object instantiations.

View File

@@ -76,9 +76,32 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
: m_linkcount(1) : m_linkcount(1)
, m_objcount(0) , m_objcount(0)
{ {
m_before = wxClassInfo::GetFirst(); const wxClassInfo* const oldFirst = wxClassInfo::GetFirst();
Load( libname, flags ); Load( libname, flags );
m_after = wxClassInfo::GetFirst();
// It is simple to know what is the last object we registered, it's just
// the new head of the wxClassInfo list:
m_ourLast = wxClassInfo::GetFirst();
// But to find the first wxClassInfo created by this library we need to
// iterate until we get to the previous head as we don't have the links in
// the backwards direction:
if ( m_ourLast != oldFirst )
{
for ( const wxClassInfo* info = m_ourLast; ; info = info->GetNext() )
{
if ( info->GetNext() == oldFirst )
{
m_ourFirst = info;
break;
}
}
}
else // We didn't register any classes at all.
{
m_ourFirst =
m_ourLast = NULL;
}
if( m_handle != 0 ) if( m_handle != 0 )
{ {
@@ -130,7 +153,10 @@ bool wxPluginLibrary::UnrefLib()
void wxPluginLibrary::UpdateClasses() void wxPluginLibrary::UpdateClasses()
{ {
for (const wxClassInfo *info = m_after; info != m_before; info = info->GetNext()) if ( !m_ourFirst )
return;
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{ {
if( info->GetClassName() ) if( info->GetClassName() )
{ {
@@ -138,6 +164,9 @@ void wxPluginLibrary::UpdateClasses()
// we can quickly find the entry they correspond to. // we can quickly find the entry they correspond to.
(*ms_classes)[info->GetClassName()] = this; (*ms_classes)[info->GetClassName()] = this;
} }
if ( info == m_ourLast )
break;
} }
} }
@@ -147,9 +176,15 @@ void wxPluginLibrary::RestoreClasses()
if (!ms_classes) if (!ms_classes)
return; return;
for(const wxClassInfo *info = m_after; info != m_before; info = info->GetNext()) if ( !m_ourFirst )
return;
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{ {
ms_classes->erase(ms_classes->find(info->GetClassName())); ms_classes->erase(ms_classes->find(info->GetClassName()));
if ( info == m_ourLast )
break;
} }
} }
@@ -166,7 +201,9 @@ void wxPluginLibrary::RegisterModules()
wxASSERT_MSG( m_linkcount == 1, wxASSERT_MSG( m_linkcount == 1,
wxT("RegisterModules should only be called for the first load") ); wxT("RegisterModules should only be called for the first load") );
for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext()) if ( m_ourFirst )
{
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{ {
if( info->IsKindOf(CLASSINFO(wxModule)) ) if( info->IsKindOf(CLASSINFO(wxModule)) )
{ {
@@ -177,6 +214,10 @@ void wxPluginLibrary::RegisterModules()
m_wxmodules.push_back(m); m_wxmodules.push_back(m);
wxModule::RegisterModule(m); wxModule::RegisterModule(m);
} }
if ( info == m_ourLast )
break;
}
} }
// FIXME: Likewise this is (well was) very similar to InitializeModules() // FIXME: Likewise this is (well was) very similar to InitializeModules()