X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbbc4e8f80430ba7b747d8cb4716a4d0dbc76971..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/log.cpp diff --git a/src/common/log.cpp b/src/common/log.cpp index eea84cbf12..5135eadaa3 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -42,7 +42,9 @@ #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" // other standard headers #ifndef __WXWINCE__ @@ -51,39 +53,64 @@ #include -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #else #include "wx/msw/wince/time.h" #endif -#endif /* ! __WXPALMOS5__ */ #if defined(__WINDOWS__) #include "wx/msw/private.h" // includes windows.h #endif +#undef wxLOG_COMPONENT +const char *wxLOG_COMPONENT = ""; + +// 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 +// anyhow but we should at least try to not crash) and to also ensure that they +// 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() 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_GLOBAL_VAR(type, name) \ + inline type& Get##name() \ + { \ + static type s_##name; \ + return s_##name; \ + } \ + \ + type *gs_##name##Ptr = &Get##name() + #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 +wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar; -static inline wxCriticalSection& GetTraceMaskCS() +namespace { - static wxCriticalSection s_csTrace; - return s_csTrace; -} +// contains messages logged by the other threads and waiting to be shown until +// Flush() is called in the main one +typedef wxVector wxLogRecords; +wxLogRecords gs_bufferedLogRecords; -static inline wxCriticalSection& GetPreviousLogCS() -{ - static wxCriticalSection s_csPrev; +#define WX_DEFINE_LOG_CS(name) WX_DEFINE_GLOBAL_VAR(wxCriticalSection, name##CS) - return s_csPrev; -} +// this critical section is used for buffering the messages from threads other +// than main, i.e. it protects all accesses to gs_bufferedLogRecords above +WX_DEFINE_LOG_CS(BackgroundLog); + +// this one is used for protecting TraceMasks() from concurrent access +WX_DEFINE_LOG_CS(TraceMask); + +// and this one is used for GetComponentLevels() +WX_DEFINE_LOG_CS(Levels); + +} // anonymous namespace #endif // wxUSE_THREADS @@ -130,88 +157,40 @@ struct PreviousLogInfo PreviousLogInfo gs_prevLog; -} // anonymous namespace -// ============================================================================ -// implementation -// ============================================================================ +// map containing all components for which log level was explicitly set +// +// NB: all accesses to it must be protected by GetLevelsCS() critical section +WX_DEFINE_GLOBAL_VAR(wxStringToNumHashMap, ComponentLevels); // ---------------------------------------------------------------------------- -// implementation of Log functions -// -// NB: unfortunately we need all these distinct functions, we can't make them -// macros and not all compilers inline vararg functions. +// wxLogOutputBest: wxLog wrapper around wxMessageOutputBest // ---------------------------------------------------------------------------- -// generic log function -void wxVLogGeneric(wxLogLevel level, const wxString& format, va_list argptr) +class wxLogOutputBest : public wxLog { - if ( wxLog::IsEnabled() ) +public: + wxLogOutputBest() { } + +protected: + virtual void DoLogText(const wxString& msg) { - wxLog::OnLog(level, wxString::FormatV(format, argptr)); + wxMessageOutputBest().Output(msg); } -} -#if !wxUSE_UTF8_LOCALE_ONLY -void wxDoLogGenericWchar(wxLogLevel level, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogGeneric(level, format, argptr); - va_end(argptr); -} -#endif // wxUSE_UTF8_LOCALE_ONLY +private: + wxDECLARE_NO_COPY_CLASS(wxLogOutputBest); +}; -#if wxUSE_UNICODE_UTF8 -void wxDoLogGenericUtf8(wxLogLevel level, const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogGeneric(level, format, argptr); - va_end(argptr); -} -#endif // wxUSE_UNICODE_UTF8 - -#if !wxUSE_UTF8_LOCALE_ONLY - #define IMPLEMENT_LOG_FUNCTION_WCHAR(level) \ - void wxDoLog##level##Wchar(const wxChar *format, ...) \ - { \ - va_list argptr; \ - va_start(argptr, format); \ - wxVLog##level(format, argptr); \ - va_end(argptr); \ - } -#else - #define IMPLEMENT_LOG_FUNCTION_WCHAR(level) -#endif +} // anonymous namespace -#if wxUSE_UNICODE_UTF8 - #define IMPLEMENT_LOG_FUNCTION_UTF8(level) \ - void wxDoLog##level##Utf8(const char *format, ...) \ - { \ - va_list argptr; \ - va_start(argptr, format); \ - wxVLog##level(format, argptr); \ - va_end(argptr); \ - } -#else - #define IMPLEMENT_LOG_FUNCTION_UTF8(level) -#endif +// ============================================================================ +// implementation +// ============================================================================ -#define IMPLEMENT_LOG_FUNCTION(level) \ - void wxVLog##level(const wxString& format, va_list argptr) \ - { \ - if ( wxLog::IsEnabled() ) \ - wxLog::OnLog(wxLOG_##level, wxString::FormatV(format, argptr)); \ - } \ - IMPLEMENT_LOG_FUNCTION_WCHAR(level) \ - IMPLEMENT_LOG_FUNCTION_UTF8(level) - -IMPLEMENT_LOG_FUNCTION(Error) -IMPLEMENT_LOG_FUNCTION(Warning) -IMPLEMENT_LOG_FUNCTION(Message) -IMPLEMENT_LOG_FUNCTION(Info) -IMPLEMENT_LOG_FUNCTION(Status) +// ---------------------------------------------------------------------------- +// helper global functions +// ---------------------------------------------------------------------------- void wxSafeShowMessage(const wxString& title, const wxString& text) { @@ -223,303 +202,67 @@ void wxSafeShowMessage(const wxString& title, const wxString& text) #endif } -// fatal errors can't be suppressed nor handled by the custom log target and -// always terminate the program -void wxVLogFatalError(const wxString& format, va_list argptr) -{ - wxSafeShowMessage(wxS("Fatal Error"), wxString::FormatV(format, argptr)); - -#ifdef __WXWINCE__ - ExitThread(3); -#else - abort(); -#endif -} - -#if !wxUSE_UTF8_LOCALE_ONLY -void wxDoLogFatalErrorWchar(const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogFatalError(format, argptr); - - // some compilers warn about unreachable code and it shouldn't matter - // for the others anyhow... - //va_end(argptr); -} -#endif // wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -void wxDoLogFatalErrorUtf8(const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogFatalError(format, argptr); - - // some compilers warn about unreachable code and it shouldn't matter - // for the others anyhow... - //va_end(argptr); -} -#endif // wxUSE_UNICODE_UTF8 - -// same as info, but only if 'verbose' mode is on -void wxVLogVerbose(const wxString& format, va_list argptr) -{ - if ( wxLog::IsEnabled() ) { - if ( wxLog::GetActiveTarget() != NULL && wxLog::GetVerbose() ) - wxLog::OnLog(wxLOG_Info, wxString::FormatV(format, argptr)); - } -} - -#if !wxUSE_UTF8_LOCALE_ONLY -void wxDoLogVerboseWchar(const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogVerbose(format, argptr); - va_end(argptr); -} -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 -void wxDoLogVerboseUtf8(const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogVerbose(format, argptr); - va_end(argptr); -} -#endif // wxUSE_UNICODE_UTF8 - // ---------------------------------------------------------------------------- -// debug and trace functions +// wxLogFormatter class implementation // ---------------------------------------------------------------------------- -#if wxUSE_LOG_DEBUG - void wxVLogDebug(const wxString& format, va_list argptr) - { - if ( wxLog::IsEnabled() ) - { - wxLog::OnLog(wxLOG_Debug, wxString::FormatV(format, argptr)); - } - } - -#if !wxUSE_UTF8_LOCALE_ONLY - void wxDoLogDebugWchar(const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogDebug(format, argptr); - va_end(argptr); - } -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 - void wxDoLogDebugUtf8(const char *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogDebug(format, argptr); - va_end(argptr); - } -#endif // wxUSE_UNICODE_UTF8 -#endif // wxUSE_LOG_DEBUG - -#if wxUSE_LOG_TRACE - void wxVLogTrace(const wxString& mask, const wxString& format, va_list argptr) - { - if ( wxLog::IsEnabled() && wxLog::IsAllowedTraceMask(mask) ) { - wxString msg; - msg << wxS("(") << mask << wxS(") ") << wxString::FormatV(format, argptr); - - wxLog::OnLog(wxLOG_Trace, msg); - } - } - -#if !wxUSE_UTF8_LOCALE_ONLY - void wxDoLogTraceWchar(const wxString& mask, const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 - void wxDoLogTraceUtf8(const wxString& mask, const char *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } -#endif // wxUSE_UNICODE_UTF8 - -// deprecated (but not declared as such because we don't want to complicate -// DECLARE_LOG_FUNCTION macros even more) overloads for wxTraceMask -#if WXWIN_COMPATIBILITY_2_8 - void wxVLogTrace(wxTraceMask mask, const wxString& format, va_list argptr) - { - // we check that all of mask bits are set in the current mask, so - // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something - // if both bits are set. - if ( wxLog::IsEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) { - wxLog::OnLog(wxLOG_Trace, wxString::FormatV(format, argptr)); - } - } - -#if !wxUSE_UTF8_LOCALE_ONLY - void wxDoLogTraceWchar(wxTraceMask mask, const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } -#endif // !wxUSE_UTF8_LOCALE_ONLY - -#if wxUSE_UNICODE_UTF8 - void wxDoLogTraceUtf8(wxTraceMask mask, const char *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } -#endif // wxUSE_UNICODE_UTF8 - -#endif // WXWIN_COMPATIBILITY_2_8 - -#ifdef __WATCOMC__ -#if WXWIN_COMPATIBILITY_2_8 - // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351 - void wxDoLogTraceWchar(int mask, const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } -#endif // WXWIN_COMPATIBILITY_2_8 - - void wxDoLogTraceWchar(const char *mask, const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } - - void wxDoLogTraceWchar(const wchar_t *mask, const wxChar *format, ...) - { - va_list argptr; - va_start(argptr, format); - wxVLogTrace(mask, format, argptr); - va_end(argptr); - } - -#if WXWIN_COMPATIBILITY_2_8 - void wxVLogTrace(int mask, const wxString& format, va_list argptr) - { wxVLogTrace((wxTraceMask)mask, format, argptr); } -#endif // WXWIN_COMPATIBILITY_2_8 - void wxVLogTrace(const char *mask, const wxString& format, va_list argptr) - { wxVLogTrace(wxString(mask), format, argptr); } - void wxVLogTrace(const wchar_t *mask, const wxString& format, va_list argptr) - { wxVLogTrace(wxString(mask), format, argptr); } -#endif // __WATCOMC__ -#endif // wxUSE_LOG_TRACE - - -// wxLogSysError: one uses the last error code, for other you must give it -// explicitly - -// return the system error message description -static inline wxString wxLogSysErrorHelper(long err) +wxString +wxLogFormatter::Format(wxLogLevel level, + const wxString& msg, + const wxLogRecordInfo& info) const { - return wxString::Format(_(" (error %ld: %s)"), err, wxSysErrorMsg(err)); -} + wxString prefix; -void WXDLLIMPEXP_BASE wxVLogSysError(const wxString& format, va_list argptr) -{ - wxVLogSysError(wxSysErrorCode(), format, argptr); -} + // don't time stamp debug messages under MSW as debug viewers usually + // already have an option to do it +#ifdef __WINDOWS__ + if ( level != wxLOG_Debug && level != wxLOG_Trace ) +#endif // __WINDOWS__ + prefix = FormatTime(info.timestamp); -#if !wxUSE_UTF8_LOCALE_ONLY -void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogSysError(format, argptr); - va_end(argptr); -} -#endif // !wxUSE_UTF8_LOCALE_ONLY + switch ( level ) + { + case wxLOG_Error: + prefix += _("Error: "); + break; -#if wxUSE_UNICODE_UTF8 -void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(const char *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogSysError(format, argptr); - va_end(argptr); -} -#endif // wxUSE_UNICODE_UTF8 + case wxLOG_Warning: + prefix += _("Warning: "); + break; -void WXDLLIMPEXP_BASE wxVLogSysError(long err, const wxString& format, va_list argptr) -{ - if ( wxLog::IsEnabled() ) - { - wxLog::OnLog(wxLOG_Error, - wxString::FormatV(format, argptr) + wxLogSysErrorHelper(err)); + // don't prepend "debug/trace" prefix under MSW as it goes to the debug + // window anyhow and so can't be confused with something else +#ifndef __WINDOWS__ + case wxLOG_Debug: + // this prefix (as well as the one below) is intentionally not + // translated as nobody translates debug messages anyhow + prefix += "Debug: "; + break; + + case wxLOG_Trace: + prefix += "Trace: "; + break; +#endif // !__WINDOWS__ } -} -#if !wxUSE_UTF8_LOCALE_ONLY -void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogSysError(lErrCode, format, argptr); - va_end(argptr); + return prefix + msg; } -#endif // !wxUSE_UTF8_LOCALE_ONLY -#if wxUSE_UNICODE_UTF8 -void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...) +wxString +wxLogFormatter::FormatTime(time_t t) const { - va_list argptr; - va_start(argptr, format); - wxVLogSysError(lErrCode, format, argptr); - va_end(argptr); -} -#endif // wxUSE_UNICODE_UTF8 + wxString str; + wxLog::TimeStamp(&str, t); -#ifdef __WATCOMC__ -// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351 -void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...) -{ - va_list argptr; - va_start(argptr, format); - wxVLogSysError(lErrCode, format, argptr); - va_end(argptr); + return str; } -void WXDLLIMPEXP_BASE wxVLogSysError(unsigned long err, const wxString& format, va_list argptr) - { wxVLogSysError((long)err, format, argptr); } -#endif // __WATCOMC__ // ---------------------------------------------------------------------------- // wxLog class implementation // ---------------------------------------------------------------------------- unsigned wxLog::LogLastRepeatIfNeeded() -{ - wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS()); - - return LogLastRepeatIfNeededUnlocked(); -} - -unsigned wxLog::LogLastRepeatIfNeededUnlocked() { const unsigned count = gs_prevLog.numRepeated; @@ -527,12 +270,24 @@ unsigned wxLog::LogLastRepeatIfNeededUnlocked() { wxString msg; #if wxUSE_INTL - msg.Printf(wxPLURAL("The previous message repeated once.", - "The previous message repeated %lu times.", - gs_prevLog.numRepeated), - gs_prevLog.numRepeated); + if ( gs_prevLog.numRepeated == 1 ) + { + // We use a separate message for this case as "repeated 1 time" + // looks somewhat strange. + msg = _("The previous message repeated once."); + } + else + { + // Notice that we still use wxPLURAL() to ensure that multiple + // numbers of times are correctly formatted, even though we never + // actually use the singular string. + msg.Printf(wxPLURAL("The previous message repeated %lu time.", + "The previous message repeated %lu times.", + gs_prevLog.numRepeated), + gs_prevLog.numRepeated); + } #else - msg.Printf(wxS("The previous message was repeated %lu times."), + msg.Printf(wxS("The previous message was repeated %lu time(s)."), gs_prevLog.numRepeated); #endif gs_prevLog.numRepeated = 0; @@ -551,11 +306,22 @@ wxLog::~wxLog() { wxMessageOutputDebug().Printf ( - wxS("Last repeated message (\"%s\", %lu times) wasn't output"), +#if wxUSE_INTL + wxPLURAL + ( + "Last repeated message (\"%s\", %lu time) wasn't output", + "Last repeated message (\"%s\", %lu times) wasn't output", + gs_prevLog.numRepeated + ), +#else + wxS("Last repeated message (\"%s\", %lu time(s)) wasn't output"), +#endif gs_prevLog.msg, gs_prevLog.numRepeated ); } + + delete m_formatter; } // ---------------------------------------------------------------------------- @@ -581,35 +347,96 @@ wxLog::OnLog(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info) { - if ( IsEnabled() && ms_logLevel >= level ) + // fatal errors can't be suppressed nor handled by the custom log target + // and always terminate the program + if ( level == wxLOG_FatalError ) + { + wxSafeShowMessage(wxS("Fatal Error"), msg); + + wxAbort(); + } + + wxLog *logger; + +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) { - wxLog *pLogger = GetActiveTarget(); - if ( pLogger ) + logger = wxThreadInfo.logger; + if ( !logger ) { - if ( GetRepetitionCounting() ) + if ( ms_pLogger ) { - wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS()); + // buffer the messages until they can be shown from the main + // thread + wxCriticalSectionLocker lock(GetBackgroundLogCS()); - if ( msg == gs_prevLog.msg ) - { - gs_prevLog.numRepeated++; + gs_bufferedLogRecords.push_back(wxLogRecord(level, msg, info)); - // nothing else to do, in particular, don't log the - // repeated message - return; - } + // 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 - pLogger->LogLastRepeatIfNeededUnlocked(); + return; + } + //else: we have a thread-specific logger, we can send messages to it + // directly + } + else +#endif // wxUSE_THREADS + { + logger = GetMainThreadActiveTarget(); + if ( !logger ) + return; + } - // reset repetition counter for a new message - gs_prevLog.msg = msg; - gs_prevLog.level = level; - gs_prevLog.info = info; - } + logger->CallDoLogNow(level, msg, info); +} + +void +wxLog::CallDoLogNow(wxLogLevel level, + const wxString& msg, + const wxLogRecordInfo& info) +{ + if ( GetRepetitionCounting() ) + { + if ( msg == gs_prevLog.msg ) + { + gs_prevLog.numRepeated++; - pLogger->DoLogRecord(level, msg, info); + // nothing else to do, in particular, don't log the + // repeated message + return; } + + LogLastRepeatIfNeeded(); + + // reset repetition counter for a new message + gs_prevLog.msg = msg; + gs_prevLog.level = level; + gs_prevLog.info = info; } + + // handle extra data which may be passed to us by wxLogXXX() + wxString prefix, suffix; + wxUIntPtr num = 0; + if ( info.GetNumValue(wxLOG_KEY_SYS_ERROR_CODE, &num) ) + { + const long err = static_cast(num); + + suffix.Printf(_(" (error %ld: %s)"), err, wxSysErrorMsg(err)); + } + +#if wxUSE_LOG_TRACE + wxString str; + if ( level == wxLOG_Trace && info.GetStrValue(wxLOG_KEY_TRACE_MASK, &str) ) + { + prefix = "(" + str + ") "; + } +#endif // wxUSE_LOG_TRACE + + DoLogRecord(level, prefix + msg + suffix, info); } void wxLog::DoLogRecord(wxLogLevel level, @@ -625,49 +452,12 @@ 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); -#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 - // wxLogFormatter class but for now we hard code formatting here - - wxString prefix; - - // don't time stamp debug messages under MSW as debug viewers usually - // already have an option to do it -#ifdef __WXMSW__ - if ( level != wxLOG_Debug && level != wxLOG_Trace ) -#endif // __WXMSW__ - TimeStamp(&prefix); - - // TODO: use the other wxLogRecordInfo fields - - switch ( level ) - { - case wxLOG_Error: - prefix += _("Error: "); - break; - - case wxLOG_Warning: - prefix += _("Warning: "); - break; - - // don't prepend "debug/trace" prefix under MSW as it goes to the debug - // window anyhow and so can't be confused with something else -#ifndef __WXMSW__ - case wxLOG_Debug: - // this prefix (as well as the one below) is intentionally not - // translated as nobody translates debug messages anyhow - prefix += "Debug: "; - break; - - case wxLOG_Trace: - prefix += "Trace: "; - break; -#endif // !__WXMSW__ - } - - DoLogTextAtLevel(level, prefix + msg); + // Use wxLogFormatter to format the message + DoLogTextAtLevel(level, m_formatter->Format (level, msg, info)); } void wxLog::DoLogTextAtLevel(wxLogLevel level, const wxString& msg) @@ -713,6 +503,25 @@ void wxLog::DoLog(wxLogLevel WXUNUSED(level), const wchar_t *wzString, time_t t) // ---------------------------------------------------------------------------- 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 @@ -725,7 +534,7 @@ wxLog *wxLog::GetActiveTarget() if ( wxTheApp != NULL ) ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget(); else - ms_pLogger = new wxLogStderr; + ms_pLogger = new wxLogOutputBest; s_bInGetActiveTarget = false; @@ -750,6 +559,22 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger) 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; @@ -765,46 +590,201 @@ void wxLog::DoCreateOnDemand() ms_bAutoCreate = true; } +// ---------------------------------------------------------------------------- +// wxLog components levels +// ---------------------------------------------------------------------------- + +/* static */ +void wxLog::SetComponentLevel(const wxString& component, wxLogLevel level) +{ + if ( component.empty() ) + { + SetLogLevel(level); + } + else + { + wxCRIT_SECT_LOCKER(lock, GetLevelsCS()); + + GetComponentLevels()[component] = level; + } +} + +/* static */ +wxLogLevel wxLog::GetComponentLevel(wxString component) +{ + wxCRIT_SECT_LOCKER(lock, GetLevelsCS()); + + const wxStringToNumHashMap& componentLevels = GetComponentLevels(); + while ( !component.empty() ) + { + wxStringToNumHashMap::const_iterator + it = componentLevels.find(component); + if ( it != componentLevels.end() ) + return static_cast(it->second); + + component = component.BeforeLast('/'); + } + + return GetLogLevel(); +} + +// ---------------------------------------------------------------------------- +// wxLog trace masks +// ---------------------------------------------------------------------------- + +namespace +{ + +// because IsAllowedTraceMask() may be called during static initialization +// (this is not recommended but it may still happen, see #11592) we can't use a +// simple static variable which might be not initialized itself just yet to +// store the trace masks, but need this accessor function which will ensure +// that the variable is always correctly initialized before being accessed +// +// notice that this doesn't make accessing it MT-safe, of course, you need to +// serialize accesses to it using GetTraceMaskCS() for this +wxArrayString& TraceMasks() +{ + static wxArrayString s_traceMasks; + + return s_traceMasks; +} + +} // anonymous namespace + +/* static */ const wxArrayString& wxLog::GetTraceMasks() +{ + // because of this function signature (it returns a reference, not the + // object), it is inherently MT-unsafe so there is no need to acquire the + // lock here anyhow + + return TraceMasks(); +} + void wxLog::AddTraceMask(const wxString& str) { wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - ms_aTraceMasks.push_back(str); + TraceMasks().push_back(str); } void wxLog::RemoveTraceMask(const wxString& str) { wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - int index = ms_aTraceMasks.Index(str); + int index = TraceMasks().Index(str); if ( index != wxNOT_FOUND ) - ms_aTraceMasks.RemoveAt((size_t)index); + TraceMasks().RemoveAt((size_t)index); } void wxLog::ClearTraceMasks() { wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); - ms_aTraceMasks.Clear(); + TraceMasks().Clear(); } -void wxLog::TimeStamp(wxString *str) +/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask) { + wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); + + const wxArrayString& masks = GetTraceMasks(); + for ( wxArrayString::const_iterator it = masks.begin(), + en = masks.end(); + it != en; + ++it ) + { + if ( *it == mask) + return true; + } + + return false; +} + +// ---------------------------------------------------------------------------- +// wxLog miscellaneous other methods +// ---------------------------------------------------------------------------- + #if wxUSE_DATETIME + +void wxLog::TimeStamp(wxString *str) +{ + if ( !ms_timestamp.empty() ) + { + *str = wxDateTime::UNow().Format(ms_timestamp); + *str += wxS(": "); + } +} + +void wxLog::TimeStamp(wxString *str, time_t t) +{ if ( !ms_timestamp.empty() ) { - wxChar buf[256]; - time_t timeNow; - (void)time(&timeNow); + *str = wxDateTime(t).Format(ms_timestamp); + *str += wxS(": "); + } +} - struct tm tm; - wxStrftime(buf, WXSIZEOF(buf), - ms_timestamp, wxLocaltime_r(&timeNow, &tm)); +#else // !wxUSE_DATETIME + +void wxLog::TimeStamp(wxString*) +{ +} + +void wxLog::TimeStamp(wxString*, time_t) +{ +} + +#endif // wxUSE_DATETIME/!wxUSE_DATETIME + +#if wxUSE_THREADS - str->Empty(); - *str << buf << wxS(": "); +void wxLog::FlushThreadMessages() +{ + // check if we have queued messages from other threads + wxLogRecords bufferedLogRecords; + + { + wxCriticalSectionLocker lock(GetBackgroundLogCS()); + bufferedLogRecords.swap(gs_bufferedLogRecords); + + // release the lock now to not keep it while we are logging the + // messages below, allowing background threads to run + } + + if ( !bufferedLogRecords.empty() ) + { + for ( wxLogRecords::const_iterator it = bufferedLogRecords.begin(); + it != bufferedLogRecords.end(); + ++it ) + { + CallDoLogNow(it->level, it->msg, it->info); + } } -#endif // wxUSE_DATETIME +} + +/* 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 + +wxLogFormatter *wxLog::SetFormatter(wxLogFormatter* formatter) +{ + wxLogFormatter* formatterOld = m_formatter; + m_formatter = formatter ? formatter : new wxLogFormatter; + + return formatterOld; } void wxLog::Flush() @@ -812,19 +792,22 @@ void wxLog::Flush() LogLastRepeatIfNeeded(); } -/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask) +/* static */ +void wxLog::FlushActive() { - wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS()); + if ( ms_suspendCount ) + return; - for ( wxArrayString::iterator it = ms_aTraceMasks.begin(), - en = ms_aTraceMasks.end(); - it != en; ++it ) + wxLog * const log = GetActiveTarget(); + if ( log ) { - if ( *it == mask) - return true; - } +#if wxUSE_THREADS + if ( wxThread::IsMain() ) + log->FlushThreadMessages(); +#endif // wxUSE_THREADS - return false; + log->Flush(); + } } // ---------------------------------------------------------------------------- @@ -833,6 +816,8 @@ void wxLog::Flush() void wxLogBuffer::Flush() { + wxLog::Flush(); + if ( !m_str.empty() ) { wxMessageOutputBest out; @@ -922,7 +907,7 @@ wxLogChain::wxLogChain(wxLog *logger) wxLogChain::~wxLogChain() { - delete m_logOld; + wxLog::SetActiveTarget(m_logOld); if ( m_logNew != this ) delete m_logNew; @@ -955,8 +940,15 @@ void wxLogChain::DoLogRecord(wxLogLevel level, m_logOld->LogRecord(level, msg, info); // and also send it to the new one - if ( m_logNew && m_logNew != this ) - m_logNew->LogRecord(level, msg, info); + if ( m_logNew ) + { + // don't call m_logNew->LogRecord() to avoid infinite recursion when + // m_logNew is this object itself + if ( m_logNew != this ) + m_logNew->LogRecord(level, msg, info); + else + wxLog::DoLogRecord(level, msg, info); + } } #ifdef __VISUALC__ @@ -1012,8 +1004,6 @@ wxString wxLog::ms_timestamp(wxS("%X")); // time only, no date wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; #endif // wxDEBUG_LEVEL -wxArrayString wxLog::ms_aTraceMasks; - // ---------------------------------------------------------------------------- // stdout error logging helper // ---------------------------------------------------------------------------- @@ -1058,7 +1048,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) // get error code from syste unsigned long wxSysErrorCode() { -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) return ::GetLastError(); #else //Unix return errno; @@ -1071,7 +1061,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) if ( nErrCode == 0 ) nErrCode = wxSysErrorCode(); -#if defined(__WXMSW__) && !defined(__WXMICROWIN__) +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) static wxChar s_szBuf[1024]; // get error message from system @@ -1119,7 +1109,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) } return s_szBuf; -#else // !__WXMSW__ +#else // !__WINDOWS__ #if wxUSE_UNICODE static wchar_t s_wzBuf[1024]; wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode), @@ -1128,7 +1118,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode) #else return strerror((int)nErrCode); #endif -#endif // __WXMSW__/!__WXMSW__ +#endif // __WINDOWS__/!__WINDOWS__ } #endif // wxUSE_LOG