Changeset 173 for trunk

Timestamp:

Nov 6, 2007, 11:00:00 PM (18 years ago)

Author:

dmik

Message:

Tools: Added the new printing procedure for qDebug(), qWarning() etc. that is capable of redirecting output to a file (set by the QT_PM_DEBUG_FILE=<file_name> environment variable), to the PmPrintf queue (set by the QT_PM_DEBUG_QUEUE environment variable), or to the standard error stream as usual (by default).

File:

• trunk/src/tools/qglobal.cpp (modified) (10 diffs)

trunk/src/tools/qglobal.cpp

@@ -51 +51 @@
 #if defined(Q_OS_OS2)
 #include "qt_os2.h"
+#include <time.h>
 #endif
 
@@ -448 +449 @@
 
 
-#ifdef Q_CC_MWERKS
+#if defined(Q_CC_MWERKS)
 
 #include "qt_mac.h"
@@ -464 +465 @@
 }
 
-#endif
-
+#elif defined(Q_OS_OS2)
+
+// OS/2 PmPrintf debug output function
+
+static
+void qPmPrint( const char *buf )
+{
+    // recognized environment variables:
+    // QT_PM_DEBUG_FILE=<filename>   output to file
+    // QT_PM_DEBUG_QUEUE             output to queue \QUEUES\PRINTF32
+    //                               that can be read e.g. by PmPrintf
+    // <nothing>                     output to stderr
+
+    char const *queue_env = ::getenv( "QT_PM_DEBUG_QUEUE" ),
+               *file_env = ::getenv( "QT_PM_DEBUG_FILE" );
+
+    if ( queue_env != 0 ) {
+        PID srvPid;
+        HQUEUE queue;
+        if ( ::DosOpenQueue( &srvPid, &queue, "\\QUEUES\\PRINTF32" ) == NO_ERROR ) {
+            char* shrBuf; 
+            unsigned long bufSize = ::strlen(buf) + 1;
+            if ( ::DosAllocSharedMem( (PPVOID) &shrBuf, NULL, bufSize,
+                                      OBJ_GIVEABLE | PAG_WRITE |
+                                      PAG_COMMIT ) != NO_ERROR ) {
+                ::DosSleep( 200 ); // give it a second chance...
+                if ( ::DosAllocSharedMem( (PPVOID) &shrBuf, NULL, bufSize,
+                                          OBJ_GIVEABLE | PAG_WRITE |
+                                          PAG_COMMIT ) != NO_ERROR ) {
+                    ::DosCloseQueue( queue );
+                    return; // give up...
+                }
+            }
+            ::strcpy( shrBuf, buf );
+
+            if ( ::DosGiveSharedMem( shrBuf, srvPid, PAG_READ ) == NO_ERROR ) {
+                time_t tt;
+                ::time(&tt);
+                ::DosWriteQueue( queue, (ULONG)tt, bufSize, shrBuf, 0 );
+            }
+
+            ::DosFreeMem( shrBuf );
+            ::DosCloseQueue( queue );
+
+            return;
+        }
+    } else if ( file_env != 0 ) {
+        FILE* f = ::fopen( file_env, "a" );
+        if( f != 0 )
+        {
+            ::fprintf( f, "%s\n", buf );
+            ::fclose( f );
+            return;
+        }
+    } else {
+        ::fprintf( stderr, "%s\n", buf );
+    }
+}
+
+#endif
 
 void qDebug( const char *msg, ... )
@@ -488 +547 @@
         QString fstr( buf );
         OutputDebugString( (fstr + "\n").ucs2() );
+#elif defined(Q_OS_OS2)
+        qPmPrint( buf );
 #else
         fprintf( stderr, "%s\n", buf );         // add newline
@@ -516 +577 @@
         QString fstr( buf );
         OutputDebugString( (fstr + "\n").ucs2() );
+#elif defined(Q_OS_OS2)
+        qPmPrint( buf );
 #else
         fprintf( stderr, "%s\n", buf );         // add newline
@@ -543 +606 @@
         QString fstr( buf );
         OutputDebugString( (fstr + "\n").ucs2() );
+#elif defined(Q_OS_OS2)
+        qPmPrint( buf );
 #else
         fprintf( stderr, "%s\n", buf );         // add newline
@@ -572 +637 @@
         QString fstr( buf );
         OutputDebugString( (fstr + "\n").ucs2() );
+#elif defined(Q_OS_OS2)
+        qPmPrint( buf );
 #else
         fprintf( stderr, "%s\n", buf );         // add newline
@@ -596 +663 @@
 #if defined(Q_CC_MWERKS)
         mac_default_handler(buf);
+#elif defined(Q_OS_OS2)
+        qPmPrint( buf );
 #else
         fprintf( stderr, "%s\n", buf );         // add newline
@@ -632 +701 @@
 #if defined(Q_CC_MWERKS)
         mac_default_handler(buf);
+#elif defined(Q_OS_OS2)
+        qPmPrint( buf );
 #else
         fprintf( stderr, "%s\n", buf );         // add newline
@@ -656 +727 @@
   error code will be used if possible. Use this method to handle
   failures in platform specific API calls.
-  
+
   Under OS/2, the value -1 for \a code should only be used after Presentation
   Manager calls.