use static functions instead of static variables for critical sections to avoid crash...

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

diff --git a/include/wx/log.h b/include/wx/log.h
index a4f1168db6252efe27e2f8109323da369b76618c..01d37ca61d04a4da56d2aa0aabf88058f2754247 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -14,10 +14,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_THREADS
-    class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
-#endif
-

 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
 // ----------------------------------------------------------------------------


@@ -324,9 +320,6 @@ private:
     // with the number of times it was repeated
     static bool        ms_bRepetCounting;
 
     // with the number of times it was repeated
     static bool        ms_bRepetCounting;
 

-#if wxUSE_THREADS
-    static wxCriticalSection ms_prevCS; // protects the ms_prev values below
-#endif

     static wxString    ms_prevString;   // previous message that was logged
     static unsigned    ms_prevCounter;  // how many times it was repeated
     static time_t      ms_prevTimeStamp;// timestamp of the previous message
     static wxString    ms_prevString;   // previous message that was logged
     static unsigned    ms_prevCounter;  // how many times it was repeated
     static time_t      ms_prevTimeStamp;// timestamp of the previous message


@@ -345,9 +338,6 @@ private:
     // disabled
     static wxString    ms_timestamp;
 
     // disabled
     static wxString    ms_timestamp;
 

-#if wxUSE_THREADS
-    static wxCriticalSection ms_traceCS; // protects ms_aTraceMasks
-#endif

     static wxTraceMask ms_ulTraceMask;   // controls wxLogTrace behaviour
     static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace
 };
     static wxTraceMask ms_ulTraceMask;   // controls wxLogTrace behaviour
     static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace
 };

diff --git a/src/common/log.cpp b/src/common/log.cpp
index bbd0c5829223b746c5425ef9dc91ac8af0699dd6..9cdf13a271914e3ec106bd6cfad99d9cb66a4b50 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -63,6 +63,30 @@
     #include "wx/msw/private.h" // includes windows.h
 #endif
 
     #include "wx/msw/private.h" // includes windows.h
 #endif
 

+#if wxUSE_THREADS
+
+// define static functions providing access to the critical sections we use
+// instead of just using static critical section variables as log functions may
+// be used during static initialization and while this is certainly not
+// advisable it's still better to not crash (as we'd do if we used a yet
+// uninitialized critical section) if it happens
+
+static inline wxCriticalSection& GetTraceMaskCS()
+{
+    static wxCriticalSection s_csTrace;
+
+    return s_csTrace;
+}
+
+static inline wxCriticalSection& GetPreviousLogCS()
+{
+    static wxCriticalSection s_csPrev;
+
+    return s_csPrev;
+}
+
+#endif // wxUSE_THREADS
+

 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------


@@ -461,7 +485,7 @@ void WXDLLIMPEXP_BASE wxVLogSysError(unsigned long err, const wxString& format,
 
 unsigned wxLog::LogLastRepeatIfNeeded()
 {
 
 unsigned wxLog::LogLastRepeatIfNeeded()
 {

-    wxCRIT_SECT_LOCKER(lock, ms_prevCS);
+    wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS());

 
     return LogLastRepeatIfNeededUnlocked();
 }
 
     return LogLastRepeatIfNeededUnlocked();
 }


@@ -515,7 +539,7 @@ void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t)
         {
             if ( GetRepetitionCounting() )
             {
         {
             if ( GetRepetitionCounting() )
             {

-                wxCRIT_SECT_LOCKER(lock, ms_prevCS);
+                wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS());

 
                 if ( szString == ms_prevString )
                 {
 
                 if ( szString == ms_prevString )
                 {


@@ -620,14 +644,14 @@ void wxLog::DoCreateOnDemand()
 
 void wxLog::AddTraceMask(const wxString& str)
 {
 
 void wxLog::AddTraceMask(const wxString& str)
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     ms_aTraceMasks.push_back(str);
 }
 
 void wxLog::RemoveTraceMask(const wxString& str)
 {
 
     ms_aTraceMasks.push_back(str);
 }
 
 void wxLog::RemoveTraceMask(const wxString& str)
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )
 
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )


@@ -636,7 +660,7 @@ void wxLog::RemoveTraceMask(const wxString& str)
 
 void wxLog::ClearTraceMasks()
 {
 
 void wxLog::ClearTraceMasks()
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     ms_aTraceMasks.Clear();
 }
 
     ms_aTraceMasks.Clear();
 }


@@ -733,7 +757,7 @@ void wxLog::Flush()
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 {
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 {

-    wxCRIT_SECT_LOCKER(lock, ms_traceCS);
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());

 
     for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
                                   en = ms_aTraceMasks.end();
 
     for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
                                   en = ms_aTraceMasks.end();


@@ -924,7 +948,7 @@ wxLogInterposer::wxLogInterposer()
 wxLogInterposerTemp::wxLogInterposerTemp()
                 : wxLogChain(this)
 {
 wxLogInterposerTemp::wxLogInterposerTemp()
                 : wxLogChain(this)
 {

-       DetachOldLog();
+    DetachOldLog();

 }
 
 #ifdef __VISUALC__
 }
 
 #ifdef __VISUALC__


@@ -939,10 +963,6 @@ wxLogInterposerTemp::wxLogInterposerTemp()
 // static variables
 // ----------------------------------------------------------------------------
 
 // static variables
 // ----------------------------------------------------------------------------
 

-#if wxUSE_THREADS
-wxCriticalSection wxLog::ms_prevCS,
-                  wxLog::ms_traceCS;
-#endif // wxUSE_THREADS

 bool            wxLog::ms_bRepetCounting = false;
 wxString        wxLog::ms_prevString;
 unsigned int    wxLog::ms_prevCounter = 0;
 bool            wxLog::ms_bRepetCounting = false;
 wxString        wxLog::ms_prevString;
 unsigned int    wxLog::ms_prevCounter = 0;