Use portable comparison syntax in wx-config.

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 99a424bfd3ba289c1da7f7a74f53d63cf88f68cf..98d73a6dde719983961b243bc0bdc9b41fefebf6 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -42,6 +42,7 @@
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"

+#include "wx/private/threadinfo.h"

 #include "wx/crt.h"
 #include "wx/vector.h"
 
 #include "wx/crt.h"
 #include "wx/vector.h"
 


@@ -67,16 +68,6 @@
 #undef wxLOG_COMPONENT
 const char *wxLOG_COMPONENT = "";
 
 #undef wxLOG_COMPONENT
 const char *wxLOG_COMPONENT = "";
 

-#if wxUSE_THREADS
-
-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
 // 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


@@ -84,18 +75,32 @@ wxLogRecords gs_bufferedLogRecords;
 // are initialized by the time static initialization is done, i.e. before any
 // threads are created hopefully
 //
 // 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
 //
 // 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()
+
+#if wxUSE_THREADS
+
+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;
+
+#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
 
 // this critical section is used for buffering the messages from threads other
 // than main, i.e. it protects all accesses to gs_bufferedLogRecords above


@@ -104,7 +109,7 @@ WX_DEFINE_LOG_CS(BackgroundLog);
 // this one is used for protecting ms_aTraceMasks from concurrent access
 WX_DEFINE_LOG_CS(TraceMask);
 
 // 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
 WX_DEFINE_LOG_CS(Levels);
 
 } // anonymous namespace


@@ -158,7 +163,26 @@ 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
 // 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);
+
+// ----------------------------------------------------------------------------
+// wxLogOutputBest: wxLog wrapper around wxMessageOutputBest
+// ----------------------------------------------------------------------------
+
+class wxLogOutputBest : public wxLog
+{
+public:
+    wxLogOutputBest() { }
+
+protected:
+    virtual void DoLogText(const wxString& msg)
+    {
+        wxMessageOutputBest().Output(msg);
+    }
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxLogOutputBest);
+};

 
 } // anonymous namespace
 
 
 } // anonymous namespace
 


@@ -259,31 +283,48 @@ wxLog::OnLog(wxLogLevel level,
 #endif
     }
 
 #endif
     }
 

-    wxLog *pLogger = GetActiveTarget();
-    if ( !pLogger )
-        return;
+    wxLog *logger;

 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {

-        wxCriticalSectionLocker lock(GetBackgroundLogCS());
+        logger = wxThreadInfo.logger;
+        if ( !logger )
+        {
+            if ( ms_pLogger )
+            {
+                // buffer the messages until they can be shown from the main
+                // thread
+                wxCriticalSectionLocker lock(GetBackgroundLogCS());

 
 

-        gs_bufferedLogRecords.push_back(wxLogRecord(level, msg, info));
+                gs_bufferedLogRecords.push_back(wxLogRecord(level, msg, info));

 
 

-        // ensure that our Flush() will be called soon
-        wxWakeUpIdle();
+                // ensure that our Flush() will be called soon
+                wxWakeUpIdle();
+            }
+            //else: we don't have any logger at all, there is no need to log
+            //      anything

 
 

-        return;
+            return;
+        }
+        //else: we have a thread-specific logger, we can send messages to it
+        //      directly

     }
     }

+    else

 #endif // wxUSE_THREADS
 #endif // wxUSE_THREADS

+    {
+        logger = GetMainThreadActiveTarget();
+        if ( !logger )
+            return;
+    }

 
 

-    pLogger->OnLogInMainThread(level, msg, info);
+    logger->CallDoLogNow(level, msg, info);

 }
 
 void
 }
 
 void

-wxLog::OnLogInMainThread(wxLogLevel level,
-                         const wxString& msg,
-                         const wxLogRecordInfo& info)
+wxLog::CallDoLogNow(wxLogLevel level,
+                    const wxString& msg,
+                    const wxLogRecordInfo& info)

 {
     if ( GetRepetitionCounting() )
     {
 {
     if ( GetRepetitionCounting() )
     {


@@ -309,9 +350,7 @@ wxLog::OnLogInMainThread(wxLogLevel level,
     wxUIntPtr num = 0;
     if ( info.GetNumValue(wxLOG_KEY_SYS_ERROR_CODE, &num) )
     {
     wxUIntPtr num = 0;
     if ( info.GetNumValue(wxLOG_KEY_SYS_ERROR_CODE, &num) )
     {

-        long err = static_cast<long>(num);
-        if ( !err )
-            err = wxSysErrorCode();
+        const long err = static_cast<long>(num);

 
         suffix.Printf(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
     }
 
         suffix.Printf(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
     }


@@ -340,7 +379,9 @@ void wxLog::DoLogRecord(wxLogLevel level,
     // but to call both of them
     DoLog(level, (const char*)msg.mb_str(), info.timestamp);
     DoLog(level, (const wchar_t*)msg.wc_str(), info.timestamp);
     // but to call both of them
     DoLog(level, (const char*)msg.mb_str(), info.timestamp);
     DoLog(level, (const wchar_t*)msg.wc_str(), info.timestamp);

-#endif // WXWIN_COMPATIBILITY_2_8
+#else // !WXWIN_COMPATIBILITY_2_8
+    wxUnusedVar(info);
+#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8

 
 
     // TODO: it would be better to extract message formatting in a separate
 
 
     // TODO: it would be better to extract message formatting in a separate


@@ -428,6 +469,25 @@ void wxLog::DoLog(wxLogLevel WXUNUSED(level), const wchar_t *wzString, time_t t)
 // ----------------------------------------------------------------------------
 
 wxLog *wxLog::GetActiveTarget()
 // ----------------------------------------------------------------------------
 
 wxLog *wxLog::GetActiveTarget()

+{
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // check if we have a thread-specific log target
+        wxLog * const logger = wxThreadInfo.logger;
+
+        // the code below should be only executed for the main thread as
+        // CreateLogTarget() is not meant for auto-creating log targets for
+        // worker threads so skip it in any case
+        return logger ? logger : ms_pLogger;
+    }
+#endif // wxUSE_THREADS
+
+    return GetMainThreadActiveTarget();
+}
+
+/* static */
+wxLog *wxLog::GetMainThreadActiveTarget()

 {
     if ( ms_bAutoCreate && ms_pLogger == NULL ) {
         // prevent infinite recursion if someone calls wxLogXXX() from
 {
     if ( ms_bAutoCreate && ms_pLogger == NULL ) {
         // prevent infinite recursion if someone calls wxLogXXX() from


@@ -440,7 +500,7 @@ wxLog *wxLog::GetActiveTarget()
             if ( wxTheApp != NULL )
                 ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
             else
             if ( wxTheApp != NULL )
                 ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
             else

-                ms_pLogger = new wxLogStderr;
+                ms_pLogger = new wxLogOutputBest;

 
             s_bInGetActiveTarget = false;
 
 
             s_bInGetActiveTarget = false;
 


@@ -465,6 +525,22 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
     return pOldLogger;
 }
 
     return pOldLogger;
 }
 

+#if wxUSE_THREADS
+/* static */
+wxLog *wxLog::SetThreadActiveTarget(wxLog *logger)
+{
+    wxASSERT_MSG( !wxThread::IsMain(), "use SetActiveTarget() for main thread" );
+
+    wxLog * const oldLogger = wxThreadInfo.logger;
+    if ( oldLogger )
+        oldLogger->Flush();
+
+    wxThreadInfo.logger = logger;
+
+    return oldLogger;
+}
+#endif // wxUSE_THREADS
+

 void wxLog::DontCreateOnDemand()
 {
     ms_bAutoCreate = false;
 void wxLog::DontCreateOnDemand()
 {
     ms_bAutoCreate = false;


@@ -495,7 +571,7 @@ void wxLog::SetComponentLevel(const wxString& component, wxLogLevel level)
     {
         wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
 
     {
         wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
 

-        gs_componentLevels[component] = level;
+        GetComponentLevels()[component] = level;

     }
 }
 
     }
 }
 


@@ -504,11 +580,12 @@ wxLogLevel wxLog::GetComponentLevel(wxString component)
 {
     wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
 
 {
     wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
 

+    const wxStringToNumHashMap& componentLevels = GetComponentLevels();

     while ( !component.empty() )
     {
         wxStringToNumHashMap::const_iterator
     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('/');
             return static_cast<wxLogLevel>(it->second);
 
         component = component.BeforeLast('/');


@@ -582,12 +659,10 @@ void wxLog::TimeStamp(wxString *str)
 #endif // wxUSE_DATETIME
 }
 
 #endif // wxUSE_DATETIME
 }
 

-void wxLog::Flush()
-{

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxASSERT_MSG( wxThread::IsMain(),
-                  "should be called from the main thread only" );

 
 

+void wxLog::FlushThreadMessages()
+{

     // check if we have queued messages from other threads
     wxLogRecords bufferedLogRecords;
 
     // check if we have queued messages from other threads
     wxLogRecords bufferedLogRecords;
 


@@ -605,14 +680,50 @@ void wxLog::Flush()
               it != bufferedLogRecords.end();
               ++it )
         {
               it != bufferedLogRecords.end();
               ++it )
         {

-            OnLogInMainThread(it->level, it->msg, it->info);
+            CallDoLogNow(it->level, it->msg, it->info);

         }
     }
         }
     }

+}
+
+/* static */
+bool wxLog::IsThreadLoggingEnabled()
+{
+    return !wxThreadInfo.loggingDisabled;
+}
+
+/* static */
+bool wxLog::EnableThreadLogging(bool enable)
+{
+    const bool wasEnabled = !wxThreadInfo.loggingDisabled;
+    wxThreadInfo.loggingDisabled = !enable;
+    return wasEnabled;
+}
+

 #endif // wxUSE_THREADS
 
 #endif // wxUSE_THREADS
 

+void wxLog::Flush()
+{

     LogLastRepeatIfNeeded();
 }
 
     LogLastRepeatIfNeeded();
 }
 

+/* static */
+void wxLog::FlushActive()
+{
+    if ( ms_suspendCount )
+        return;
+
+    wxLog * const log = GetActiveTarget();
+    if ( log )
+    {
+#if wxUSE_THREADS
+        if ( wxThread::IsMain() )
+            log->FlushThreadMessages();
+#endif // wxUSE_THREADS
+
+        log->Flush();
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxLogBuffer implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxLogBuffer implementation
 // ----------------------------------------------------------------------------