X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/642c0eda2ff36f5c5d0a93949c834ffda98cab82..7419ba028c7e2d0e585a9b043af587d993da16a7:/src/common/module.cpp?ds=sidebyside diff --git a/src/common/module.cpp b/src/common/module.cpp index e4b0ea9afa..9167848b89 100644 --- a/src/common/module.cpp +++ b/src/common/module.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: module.cpp +// Name: src/common/module.cpp // Purpose: Modules initialization/destruction // Author: Wolfram Gloger/adapted by Guilhem Lavaux // Modified by: @@ -9,24 +9,26 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "module.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #include "wx/module.h" -#include "wx/hash.h" -#include "wx/intl.h" -#include "wx/log.h" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif + #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxModuleList); +#define TRACE_MODULE _T("module") + +WX_DEFINE_LIST(wxModuleList) IMPLEMENT_CLASS(wxModule, wxObject) @@ -34,6 +36,7 @@ wxModuleList wxModule::m_modules; void wxModule::RegisterModule(wxModule* module) { + module->m_state = State_Registered; m_modules.Append(module); } @@ -58,6 +61,8 @@ void wxModule::RegisterModules() if ( classInfo->IsKindOf(CLASSINFO(wxModule)) && (classInfo != (& (wxModule::ms_classInfo))) ) { + wxLogTrace(TRACE_MODULE, wxT("Registering module %s"), + classInfo->GetClassName()); wxModule* module = (wxModule *)classInfo->CreateObject(); RegisterModule(module); } @@ -65,41 +70,133 @@ void wxModule::RegisterModules() } } -bool wxModule::InitializeModules() +bool wxModule::DoInitializeModule(wxModule *module, + wxModuleList &initializedModules) { - // Initialize user-defined modules - wxModuleList::compatibility_iterator node; - for ( node = m_modules.GetFirst(); node; node = node->GetNext() ) + if ( module->m_state == State_Initializing ) { - wxModule *module = node->GetData(); - if ( !module->Init() ) + wxLogError(_("Circular dependency involving module \"%s\" detected."), + module->GetClassInfo()->GetClassName()); + return false; + } + + module->m_state = State_Initializing; + + const wxArrayClassInfo& dependencies = module->m_dependencies; + + // satisfy module dependencies by loading them before the current module + for ( unsigned int i = 0; i < dependencies.size(); ++i ) + { + wxClassInfo * cinfo = dependencies[i]; + + // Check if the module is already initialized + wxModuleList::compatibility_iterator node; + for ( node = initializedModules.GetFirst(); node; node = node->GetNext() ) { - wxLogError(_("Module \"%s\" initialization failed"), - module->GetClassInfo()->GetClassName()); + if ( node->GetData()->GetClassInfo() == cinfo ) + break; + } + + if ( node ) + { + // this dependency is already initialized, nothing to do + continue; + } - // clean up already initialized modules - process in reverse order - wxModuleList::compatibility_iterator n; - for ( n = node->GetPrevious(); n; n = n->GetPrevious() ) + // find the module in the registered modules list + for ( node = m_modules.GetFirst(); node; node = node->GetNext() ) + { + wxModule *moduleDep = node->GetData(); + if ( moduleDep->GetClassInfo() == cinfo ) { - n->GetData()->OnExit(); + if ( !DoInitializeModule(moduleDep, initializedModules ) ) + { + // failed to initialize a dependency, so fail this one too + return false; + } + + break; } + } + if ( !node ) + { + wxLogError(_("Dependency \"%s\" of module \"%s\" doesn't exist."), + cinfo->GetClassName(), + module->GetClassInfo()->GetClassName()); return false; } } + if ( !module->Init() ) + { + wxLogError(_("Module \"%s\" initialization failed"), + module->GetClassInfo()->GetClassName()); + return false; + } + + wxLogTrace(TRACE_MODULE, wxT("Module \"%s\" initialized"), + module->GetClassInfo()->GetClassName()); + + module->m_state = State_Initialized; + initializedModules.Append(module); + + return true; +} + +// Initialize user-defined modules +bool wxModule::InitializeModules() +{ + wxModuleList initializedModules; + + for ( wxModuleList::compatibility_iterator node = m_modules.GetFirst(); + node; + node = node->GetNext() ) + { + wxModule *module = node->GetData(); + + // the module could have been already initialized as dependency of + // another one + if ( module->m_state == State_Registered ) + { + if ( !DoInitializeModule( module, initializedModules ) ) + { + // failed to initialize all modules, so clean up the already + // initialized ones + DoCleanUpModules(initializedModules); + + return false; + } + } + } + + // remember the real initialisation order + m_modules = initializedModules; + return true; } -void wxModule::CleanUpModules() +// Clean up all currently initialized modules +void wxModule::DoCleanUpModules(const wxModuleList& modules) { - // Cleanup user-defined modules - wxModuleList::compatibility_iterator node; - for ( node = m_modules.GetFirst(); node; node = node->GetNext() ) + // cleanup user-defined modules in the reverse order compared to their + // initialization -- this ensures that dependencies are respected + for ( wxModuleList::compatibility_iterator node = modules.GetLast(); + node; + node = node->GetPrevious() ) { - node->GetData()->Exit(); + wxLogTrace(TRACE_MODULE, wxT("Cleanup module %s"), + node->GetData()->GetClassInfo()->GetClassName()); + + wxModule * module = node->GetData(); + + wxASSERT_MSG( module->m_state == State_Initialized, + _T("not initialized module being cleaned up") ); + + module->Exit(); + module->m_state = State_Registered; } + // clear all modules, even the non-initialized ones WX_CLEAR_LIST(wxModuleList, m_modules); } -