Ensure that component levels map is initialized before it's used (closes #10990).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/log.cpp b/src/common/log.cpp
index da6f70cb3a2a6d3a4e2f5ff06304aa773336ac9e..d3595d123495f3deea60905c620174c8809424a7 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -72,14 +72,6 @@ const char *wxLOG_COMPONENT = "";
 
 wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
 
-namespace
-{
-
-// contains messages logged by the other threads and waiting to be shown until
-// Flush() is called in the main one
-typedef wxVector<wxLogRecord> wxLogRecords;
-wxLogRecords gs_bufferedLogRecords;
-
 // this macro allows to define an object which will be initialized before any
 // other function in this file is called: this is necessary to allow log
 // functions to be used during static initialization (this is not advisable
@@ -87,18 +79,28 @@ wxLogRecords gs_bufferedLogRecords;
 // are initialized by the time static initialization is done, i.e. before any
 // threads are created hopefully
 //
-// the net effect of all this is that you can use Get##name##CS() function to
-// access the critical function without worrying about it being not initialized
+// the net effect of all this is that you can use Get##name() function to
+// access the object without worrying about it being not initialized
 //
 // see also WX_DEFINE_GLOBAL_CONV2() in src/common/strconv.cpp
-#define WX_DEFINE_LOG_CS(name)                                                \
-    inline wxCriticalSection& Get##name##CS()                                 \
+#define WX_DEFINE_GLOBAL_VAR(type, name)                                      \
+    inline type& Get##name()                                                  \
     {                                                                         \
-        static wxCriticalSection s_cs##name;                                  \
-        return s_cs##name;                                                    \
+        static type s_##name;                                                 \
+        return s_##name;                                                      \
     }                                                                         \
                                                                               \
-    wxCriticalSection *gs_##name##CSPtr = &Get##name##CS()
+    type *gs_##name##Ptr = &Get##name()
+
+namespace
+{
+
+// contains messages logged by the other threads and waiting to be shown until
+// Flush() is called in the main one
+typedef wxVector<wxLogRecord> wxLogRecords;
+wxLogRecords gs_bufferedLogRecords;
+
+#define WX_DEFINE_LOG_CS(name) WX_DEFINE_GLOBAL_VAR(wxCriticalSection, name##CS)
 
 // this critical section is used for buffering the messages from threads other
 // than main, i.e. it protects all accesses to gs_bufferedLogRecords above
@@ -107,7 +109,7 @@ WX_DEFINE_LOG_CS(BackgroundLog);
 // this one is used for protecting ms_aTraceMasks from concurrent access
 WX_DEFINE_LOG_CS(TraceMask);
 
-// and this one is used for gs_componentLevels 
+// and this one is used for GetComponentLevels() 
 WX_DEFINE_LOG_CS(Levels);
 
 } // anonymous namespace
@@ -161,7 +163,7 @@ PreviousLogInfo gs_prevLog;
 // map containing all components for which log level was explicitly set
 //
 // NB: all accesses to it must be protected by GetLevelsCS() critical section
-wxStringToNumHashMap gs_componentLevels;
+WX_DEFINE_GLOBAL_VAR(wxStringToNumHashMap, ComponentLevels);
 
 } // anonymous namespace
 
@@ -544,7 +546,7 @@ void wxLog::SetComponentLevel(const wxString& component, wxLogLevel level)
     {
         wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
 
-        gs_componentLevels[component] = level;
+        GetComponentLevels()[component] = level;
     }
 }
 
@@ -553,11 +555,12 @@ wxLogLevel wxLog::GetComponentLevel(wxString component)
 {
     wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
 
+    const wxStringToNumHashMap& componentLevels = GetComponentLevels();
     while ( !component.empty() )
     {
         wxStringToNumHashMap::const_iterator
-            it = gs_componentLevels.find(component);
-        if ( it != gs_componentLevels.end() )
+            it = componentLevels.find(component);
+        if ( it != componentLevels.end() )
             return static_cast<wxLogLevel>(it->second);
 
         component = component.BeforeLast('/');