Added wxOutputStream::PutC()

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index c512ffc3f2a54eb8c91061cf78e9fe990b3a1250..4f855381f419e918e10f0e1925bef62072e8da8a 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -48,6 +48,7 @@
 #include  "wx/utils.h"
 #include  "wx/wxchar.h"
 #include  "wx/log.h"
 #include  "wx/utils.h"
 #include  "wx/wxchar.h"
 #include  "wx/log.h"

+#include  "wx/thread.h"

 
 // other standard headers
 #include  <errno.h>
 
 // other standard headers
 #include  <errno.h>


@@ -55,9 +56,7 @@
 #include  <time.h>
 
 #ifdef  __WXMSW__
 #include  <time.h>
 
 #ifdef  __WXMSW__

-  #include  <windows.h>
-  // Redefines OutputDebugString if necessary
-  #include  "wx/msw/private.h"
+  #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString

 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix
 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix


@@ -78,26 +77,39 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// 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.
+// globals

 // ----------------------------------------------------------------------------
 
 // log functions can't allocate memory (LogError("out of memory...") should
 // work!), so we use a static buffer for all log messages
 #define LOG_BUFFER_SIZE   (4096)
 
 // ----------------------------------------------------------------------------
 
 // log functions can't allocate memory (LogError("out of memory...") should
 // work!), so we use a static buffer for all log messages
 #define LOG_BUFFER_SIZE   (4096)
 

-// static buffer for error messages (FIXME MT-unsafe)
+// static buffer for error messages

 static wxChar s_szBuf[LOG_BUFFER_SIZE];
 
 static wxChar s_szBuf[LOG_BUFFER_SIZE];
 

+#if wxUSE_THREADS
+
+// the critical section protecting the static buffer
+static wxCriticalSection gs_csLogBuf;
+
+#endif // wxUSE_THREADS
+
+// ----------------------------------------------------------------------------
+// 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.
+// ----------------------------------------------------------------------------
+

 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {
   if ( wxLog::GetActiveTarget() != NULL ) {
 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {
   if ( wxLog::GetActiveTarget() != NULL ) {

+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

     va_end(argptr);
 
     wxLog::OnLog(level, s_szBuf, time(NULL));
     va_end(argptr);
 
     wxLog::OnLog(level, s_szBuf, time(NULL));


@@ -108,9 +120,11 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
   void wxLog##level(const wxChar *szFormat, ...)                  \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
   void wxLog##level(const wxChar *szFormat, ...)                  \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                    \
+                                                                  \

       va_list argptr;                                             \
       va_start(argptr, szFormat);                                 \
       va_list argptr;                                             \
       va_start(argptr, szFormat);                                 \

-      wxVsprintf(s_szBuf, szFormat, argptr);                      \
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);  \

       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \
       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \


@@ -129,9 +143,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
 {
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL && pLog->GetVerbose() ) {
 {
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL && pLog->GetVerbose() ) {

+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

     va_end(argptr);
 
     wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
     va_end(argptr);
 
     wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));


@@ -144,9 +160,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
   void wxLog##level(const wxChar *szFormat, ...)                  \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
   void wxLog##level(const wxChar *szFormat, ...)                  \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                    \
+                                                                  \

       va_list argptr;                                             \
       va_start(argptr, szFormat);                                 \
       va_list argptr;                                             \
       va_start(argptr, szFormat);                                 \

-      wxVsprintf(s_szBuf, szFormat, argptr);                      \
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);  \

       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \
       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \


@@ -158,9 +176,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     wxLog *pLog = wxLog::GetActiveTarget();
 
     if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
     wxLog *pLog = wxLog::GetActiveTarget();
 
     if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

       va_list argptr;
       va_start(argptr, szFormat);
       va_list argptr;
       va_start(argptr, szFormat);

-      wxVsprintf(s_szBuf, szFormat, argptr);
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));


@@ -175,9 +195,11 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

       va_list argptr;
       va_start(argptr, szFormat);
       va_list argptr;
       va_start(argptr, szFormat);

-      wxVsprintf(s_szBuf, szFormat, argptr);
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));


@@ -198,7 +220,8 @@ IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
 void wxLogSysErrorHelper(long lErrCode)
 {
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
 void wxLogSysErrorHelper(long lErrCode)
 {
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];

-    wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
+    wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
+               _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));

     wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
     wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));


@@ -206,9 +229,11 @@ void wxLogSysErrorHelper(long lErrCode)
 
 void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 {
 
 void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 {

+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

     va_end(argptr);
 
     wxLogSysErrorHelper(wxSysErrorCode());
     va_end(argptr);
 
     wxLogSysErrorHelper(wxSysErrorCode());


@@ -216,9 +241,11 @@ void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 
 void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 {
 
 void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 {

+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

     va_end(argptr);
 
     wxLogSysErrorHelper(lErrCode);
     va_end(argptr);
 
     wxLogSysErrorHelper(lErrCode);


@@ -360,15 +387,16 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
 {
     wxString str;
     TimeStamp(&str);

-    str << szString << wxT('\n');
+    str << szString;

 
     fputs(str.mb_str(), m_fp);
 
     fputs(str.mb_str(), m_fp);

+    fputc(_T('\n'), m_fp);

     fflush(m_fp);
 
     fflush(m_fp);
 

-    // under Windows, programs usually don't have stderr at all, so make show the
-    // messages also under debugger
-#ifdef __WXMSW__
-    OutputDebugString(str + wxT('\r'));
+    // under Windows, programs usually don't have stderr at all, so show the
+    // messages also under debugger - unless it's a console program
+#if defined(__WXMSW__) && wxUSE_GUI
+    OutputDebugString(str + wxT("\r\n"));

 #endif // MSW
 }
 
 #endif // MSW
 }
 


@@ -558,12 +586,14 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed assert
 
     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed assert

+    wxSnprintf(szBuf, WXSIZEOF(szBuf),

 #ifdef __VISUALC__
 #ifdef __VISUALC__

-    wxSprintf(szBuf, wxT("%s(%d): assert failed"), szFile, nLine);
+               wxT("%s(%d): assert failed"),

 #else  // !VC++
     // make the error message more clear for all the others
 #else  // !VC++
     // make the error message more clear for all the others

-    wxSprintf(szBuf, wxT("Assert failed in file %s at line %d"), szFile, nLine);
+               wxT("Assert failed in file %s at line %d"),

 #endif // VC/!VC
 #endif // VC/!VC

+               szFile, nLine);

 
     if ( szMsg != NULL ) {
         wxStrcat(szBuf, wxT(": "));
 
     if ( szMsg != NULL ) {
         wxStrcat(szBuf, wxT(": "));


@@ -577,15 +607,16 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         // send it to the normal log destination
         wxLogDebug(szBuf);
 
         // send it to the normal log destination
         wxLogDebug(szBuf);
 

-#if wxUSE_GUI
+#if wxUSE_GUI || defined(__WXMSW__)

         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?"
         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?"

-                "\nYou can also choose [Cancel] to suppress "
-                "further warnings."));
+                            "\nYou can also choose [Cancel] to suppress "
+                            "further warnings."));

 
 

-        switch ( wxMessageBox(szBuf, _("Debug"),
-                    wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+#if wxUSE_GUI
+        switch ( wxMessageBox(szBuf, "Debug",
+                              wxYES_NO | wxCANCEL | wxICON_STOP ) ) {

             case wxYES:
                 Trap();
                 break;
             case wxYES:
                 Trap();
                 break;


@@ -594,8 +625,23 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
                 s_bNoAsserts = TRUE;
                 break;
 
                 s_bNoAsserts = TRUE;
                 break;
 

-                //case wxNO: nothing to do
+            //case wxNO: nothing to do

         }
         }

+#else // !GUI, but MSW
+        switch ( ::MessageBox(NULL, szBuf, "Debug",
+                              MB_YESNOCANCEL | MB_ICONSTOP ) ) {
+            case IDYES:
+                Trap();
+                break;
+
+            case IDCANCEL:
+                s_bNoAsserts = TRUE;
+                break;
+
+            //case IDNO: nothing to do
+        }
+#endif // GUI or MSW
+

 #else // !GUI
         Trap();
 #endif // GUI/!GUI
 #else // !GUI
         Trap();
 #endif // GUI/!GUI