Changeset 699

Timestamp:

Mar 18, 2010, 3:42:18 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Simplified debug output.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (36 diffs)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -43 +43 @@
 
 //#define QPROCESS_DEBUG
-#include "qdebug.h"
 
 #if defined(__INNOTEK_LIBC__)
@@ -52 +51 @@
 
 #if defined QPROCESS_DEBUG
+
 #include "qstring.h"
 #include <ctype.h>
@@ -86 +86 @@
     return out;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE
+
+
+
+
 #endif
 
@@ -246 +265 @@
 USHORT QProcessManager::addProcess(QProcess *process)
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug("QProcessManager::addProcess(%p)", process);
-#endif
+    DEBUG(("QProcessManager::addProcess(%p)", process));
 
     QMutexLocker locker(&mutex);
@@ -317 +334 @@
     QProcess *process = instance->processes[procKey];
 
-#if defined (QPROCESS_DEBUG)
-    qDebug("QProcessManager::removeProcess(%p)", process);
-#endif
+    DEBUG(("QProcessManager::removeProcess(%p)", process));
 
     // to guarantee that the given procKey may be reused, we must close all
@@ -339 +354 @@
     : refcnt(0), finish(false), eventSem(NULLHANDLE), sa_old_sigchld_handler(0)
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::QProcessManager()";
-#endif
+    DEBUG(() << "QProcessManager::QProcessManager()");
 
     APIRET rc = DosCreateEventSem(NULL, &eventSem,
@@ -354 +367 @@
 QProcessManager::~QProcessManager()
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::~QProcessManager()";
-#endif
+    DEBUG(() << "QProcessManager::~QProcessManager()");
 
     Q_ASSERT(!refcnt);
@@ -393 +404 @@
 void QProcessManager::run()
 {
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::run() BEGIN";
-#endif
+    DEBUG(() << "QProcessManager::run() BEGIN");
 
     // Note: the rationale behind using a worker thread so far is that
@@ -419 +428 @@
 
         if (instance->deathFlag.testAndSetRelaxed(1, 0)) {
-#if defined (QPROCESS_DEBUG)
-            qDebug() << "QProcessManager::run(): child death signaled";
-#endif
+            DEBUG(() << "QProcessManager::run(): child death signaled");
             foreach (QProcess *proc, processes) {
                 QProcessPrivate::WaitMode mode = (QProcessPrivate::WaitMode)
@@ -442 +449 @@
             continue;
 
-#if defined (QPROCESS_DEBUG)
-        qDebug() << "QProcessManager::run(): checking pipes";
-#endif
+        DEBUG(() << "QProcessManager::run(): checking pipes");
 
         // make sure the state array is big enough. The best size for sz pipes
@@ -477 +482 @@
             if (pass == 1 && status != NPSS_CLOSE)
                 continue;
-#if defined(QPROCESS_DEBUG)
-            qDebug(" %d/%d: fStatus %u fFlag f%02X usKey %04hX usAvail %hu",
+            DEBUG((" %d/%d: fStatus %u fFlag f%02X usKey %04hX usAvail %hu",
                    pass, i, (uint) pipeStates[i].fStatus,
                    (uint) pipeStates[i].fFlag, pipeStates[i].usKey,
-                   pipeStates[i].usAvail);
-#endif
+                   pipeStates[i].usAvail));
             int procKey = toProcKey(pipeStates[i].usKey);
             QProcessPrivate::PipeType type = toPipeType(pipeStates[i].usKey);
@@ -488 +491 @@
             QProcess *proc = processes[procKey];
             Q_ASSERT(proc);
-#if defined(QPROCESS_DEBUG)
-            qDebug("  process %p", proc);
-#endif
+            DEBUG(("  process %p", proc));
             QProcessPrivate *d = proc->d_func();
 
@@ -538 +539 @@
     ::free(pipeStates);
 
-#if defined (QPROCESS_DEBUG)
-    qDebug() << "QProcessManager::run() END";
-#endif
+    DEBUG(() << "QProcessManager::run() END");
 }
 
@@ -830 +829 @@
     }
 
-#if defined(QPROCESS_DEBUG)
-    qDebug("qt_startProcess: workdir is \"%s\"", qPrintable(QDir::currentPath()));
-#endif
+    DEBUG(("qt_startProcess: workdir is \"%s\"", qPrintable(QDir::currentPath())));
 
     // try to find the executable
@@ -883 +880 @@
     }
 
-#if defined(QPROCESS_DEBUG)
-    qDebug("qt_startProcess: found \"%s\" for \"%s\"",
+    DEBUG(("qt_startProcess: found \"%s\" for \"%s\"",
            qPrintable(QFile::decodeName(fullProgramName)),
-           qPrintable(QFile::decodeName(programName)));
-#endif
+           qPrintable(QFile::decodeName(programName))));
 
     int pid = -1;
@@ -910 +905 @@
             paths = path.split(QLatin1Char(';'), QString::SkipEmptyParts);
             if (paths.contains(fullPath, Qt::CaseInsensitive)) {
-#if defined(QPROCESS_DEBUG)
-                qDebug("qt_startProcess: \"%s\" is already in BEGINLIBPATH",
-                       qPrintable(fullPath));
-#endif
+                DEBUG(("qt_startProcess: \"%s\" is already in BEGINLIBPATH",
+                       qPrintable(fullPath)));
             } else {
-#if defined(QPROCESS_DEBUG)
-                qDebug("qt_startProcess: prepending \"%s\" to BEGINLIBPATH",
-                       qPrintable(fullPath));
-#endif
+                DEBUG(("qt_startProcess: prepending \"%s\" to BEGINLIBPATH",
+                       qPrintable(fullPath)));
                 prependedLibPath = true;
                 QByteArray newLibPath = libPathBuf;