#include <stdlib.h>
-#ifndef __WXPALMOS5__
#ifndef __WXWINCE__
#include <time.h>
#else
#include "wx/msw/wince/time.h"
#endif
-#endif /* ! __WXPALMOS5__ */
#if defined(__WINDOWS__)
#include "wx/msw/private.h" // includes windows.h
#undef wxLOG_COMPONENT
const char *wxLOG_COMPONENT = "";
-#if wxUSE_THREADS
-
-wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
-
// 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
\
type *gs_##name##Ptr = &Get##name()
+#if wxUSE_THREADS
+
+wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
+
namespace
{
// than main, i.e. it protects all accesses to gs_bufferedLogRecords above
WX_DEFINE_LOG_CS(BackgroundLog);
-// this one is used for protecting ms_aTraceMasks from concurrent access
+// this one is used for protecting TraceMasks() from concurrent access
WX_DEFINE_LOG_CS(TraceMask);
-// and this one is used for GetComponentLevels()
+// and this one is used for GetComponentLevels()
WX_DEFINE_LOG_CS(Levels);
} // anonymous namespace
#endif
}
+// ----------------------------------------------------------------------------
+// wxLogFormatter class implementation
+// ----------------------------------------------------------------------------
+
+wxString
+wxLogFormatter::Format(wxLogLevel level,
+ const wxString& msg,
+ const wxLogRecordInfo& info) const
+{
+ wxString prefix;
+
+ // 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);
+
+ 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 __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__
+ }
+
+ return prefix + msg;
+}
+
+wxString
+wxLogFormatter::FormatTime(time_t t) const
+{
+ wxString str;
+ wxLog::TimeStamp(&str, t);
+
+ return str;
+}
+
+
// ----------------------------------------------------------------------------
// wxLog class implementation
// ----------------------------------------------------------------------------
{
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;
{
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;
}
// ----------------------------------------------------------------------------
{
wxSafeShowMessage(wxS("Fatal Error"), msg);
-#ifdef __WXWINCE__
- ExitThread(3);
-#else
- abort();
-#endif
+ wxAbort();
}
wxLog *logger;
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)
// 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();
}
/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
{
wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
- for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
- en = ms_aTraceMasks.end();
- it != en; ++it )
+ const wxArrayString& masks = GetTraceMasks();
+ for ( wxArrayString::const_iterator it = masks.begin(),
+ en = masks.end();
+ it != en;
+ ++it )
{
if ( *it == mask)
return true;
// wxLog miscellaneous other methods
// ----------------------------------------------------------------------------
+#if wxUSE_DATETIME
+
void wxLog::TimeStamp(wxString *str)
{
-#if wxUSE_DATETIME
if ( !ms_timestamp.empty() )
{
- wxChar buf[256];
- time_t timeNow;
- (void)time(&timeNow);
-
- struct tm tm;
- wxStrftime(buf, WXSIZEOF(buf),
- ms_timestamp, wxLocaltime_r(&timeNow, &tm));
+ *str = wxDateTime::UNow().Format(ms_timestamp);
+ *str += wxS(": ");
+ }
+}
- str->Empty();
- *str << buf << wxS(": ");
+void wxLog::TimeStamp(wxString *str, time_t t)
+{
+ if ( !ms_timestamp.empty() )
+ {
+ *str = wxDateTime(t).Format(ms_timestamp);
+ *str += wxS(": ");
}
-#endif // wxUSE_DATETIME
}
+#else // !wxUSE_DATETIME
+
+void wxLog::TimeStamp(wxString*)
+{
+}
+
+void wxLog::TimeStamp(wxString*, time_t)
+{
+}
+
+#endif // wxUSE_DATETIME/!wxUSE_DATETIME
+
#if wxUSE_THREADS
void wxLog::FlushThreadMessages()
#endif // wxUSE_THREADS
+wxLogFormatter *wxLog::SetFormatter(wxLogFormatter* formatter)
+{
+ wxLogFormatter* formatterOld = m_formatter;
+ m_formatter = formatter ? formatter : new wxLogFormatter;
+
+ return formatterOld;
+}
+
void wxLog::Flush()
{
LogLastRepeatIfNeeded();
wxLogChain::~wxLogChain()
{
- delete m_logOld;
+ wxLog::SetActiveTarget(m_logOld);
if ( m_logNew != this )
delete m_logNew;
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__
wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
#endif // wxDEBUG_LEVEL
-wxArrayString wxLog::ms_aTraceMasks;
-
// ----------------------------------------------------------------------------
// stdout error logging helper
// ----------------------------------------------------------------------------
// get error code from syste
unsigned long wxSysErrorCode()
{
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
return ::GetLastError();
#else //Unix
return errno;
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
}
return s_szBuf;
-#else // !__WXMSW__
+#else // !__WINDOWS__
#if wxUSE_UNICODE
static wchar_t s_wzBuf[1024];
wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode),
#else
return strerror((int)nErrCode);
#endif
-#endif // __WXMSW__/!__WXMSW__
+#endif // __WINDOWS__/!__WINDOWS__
}
#endif // wxUSE_LOG
projects / wxWidgets.git / blobdiff