Ignore:
Timestamp:
Mar 18, 2010, 3:42:18 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

corelib: QProcess: Simplified debug output.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/corelib/io/qprocess_os2.cpp

    r690 r699  
    4343
    4444//#define QPROCESS_DEBUG
    45 #include "qdebug.h"
    4645
    4746#if defined(__INNOTEK_LIBC__)
    … …  
    5251
    5352#if defined QPROCESS_DEBUG
     53
    5454#include "qstring.h"
    5555#include <ctype.h>
    … …  
    8686    return out;
    8787}
     88
     89
     90
     91
     92
     93
     94
     95
     96
     97
     98
     99
     100
     101
     102
    88103QT_END_NAMESPACE
     104
     105
     106
     107
    89108#endif
    90109
    … …  
    246265USHORT QProcessManager::addProcess(QProcess *process)
    247266{
    248 #if defined (QPROCESS_DEBUG)
    249     qDebug("QProcessManager::addProcess(%p)", process);
    250 #endif
     267    DEBUG(("QProcessManager::addProcess(%p)", process));
    251268
    252269    QMutexLocker locker(&mutex);
    … …  
    317334    QProcess *process = instance->processes[procKey];
    318335
    319 #if defined (QPROCESS_DEBUG)
    320     qDebug("QProcessManager::removeProcess(%p)", process);
    321 #endif
     336    DEBUG(("QProcessManager::removeProcess(%p)", process));
    322337
    323338    // to guarantee that the given procKey may be reused, we must close all
    … …  
    339354    : refcnt(0), finish(false), eventSem(NULLHANDLE), sa_old_sigchld_handler(0)
    340355{
    341 #if defined (QPROCESS_DEBUG)
    342     qDebug() << "QProcessManager::QProcessManager()";
    343 #endif
     356    DEBUG(() << "QProcessManager::QProcessManager()");
    344357
    345358    APIRET rc = DosCreateEventSem(NULL, &eventSem,
    … …  
    354367QProcessManager::~QProcessManager()
    355368{
    356 #if defined (QPROCESS_DEBUG)
    357     qDebug() << "QProcessManager::~QProcessManager()";
    358 #endif
     369    DEBUG(() << "QProcessManager::~QProcessManager()");
    359370
    360371    Q_ASSERT(!refcnt);
    … …  
    393404void QProcessManager::run()
    394405{
    395 #if defined (QPROCESS_DEBUG)
    396     qDebug() << "QProcessManager::run() BEGIN";
    397 #endif
     406    DEBUG(() << "QProcessManager::run() BEGIN");
    398407
    399408    // Note: the rationale behind using a worker thread so far is that
    … …  
    419428
    420429        if (instance->deathFlag.testAndSetRelaxed(1, 0)) {
    421 #if defined (QPROCESS_DEBUG)
    422             qDebug() << "QProcessManager::run(): child death signaled";
    423 #endif
     430            DEBUG(() << "QProcessManager::run(): child death signaled");
    424431            foreach (QProcess *proc, processes) {
    425432                QProcessPrivate::WaitMode mode = (QProcessPrivate::WaitMode)
    … …  
    442449            continue;
    443450
    444 #if defined (QPROCESS_DEBUG)
    445         qDebug() << "QProcessManager::run(): checking pipes";
    446 #endif
     451        DEBUG(() << "QProcessManager::run(): checking pipes");
    447452
    448453        // make sure the state array is big enough. The best size for sz pipes
    … …  
    477482            if (pass == 1 && status != NPSS_CLOSE)
    478483                continue;
    479 #if defined(QPROCESS_DEBUG)
    480             qDebug(" %d/%d: fStatus %u fFlag f%02X usKey %04hX usAvail %hu",
     484            DEBUG((" %d/%d: fStatus %u fFlag f%02X usKey %04hX usAvail %hu",
    481485                   pass, i, (uint) pipeStates[i].fStatus,
    482486                   (uint) pipeStates[i].fFlag, pipeStates[i].usKey,
    483                    pipeStates[i].usAvail);
    484 #endif
     487                   pipeStates[i].usAvail));
    485488            int procKey = toProcKey(pipeStates[i].usKey);
    486489            QProcessPrivate::PipeType type = toPipeType(pipeStates[i].usKey);
    … …  
    488491            QProcess *proc = processes[procKey];
    489492            Q_ASSERT(proc);
    490 #if defined(QPROCESS_DEBUG)
    491             qDebug("  process %p", proc);
    492 #endif
     493            DEBUG(("  process %p", proc));
    493494            QProcessPrivate *d = proc->d_func();
    494495
    … …  
    538539    ::free(pipeStates);
    539540
    540 #if defined (QPROCESS_DEBUG)
    541     qDebug() << "QProcessManager::run() END";
    542 #endif
     541    DEBUG(() << "QProcessManager::run() END");
    543542}
    544543
    … …  
    830829    }
    831830
    832 #if defined(QPROCESS_DEBUG)
    833     qDebug("qt_startProcess: workdir is \"%s\"", qPrintable(QDir::currentPath()));
    834 #endif
     831    DEBUG(("qt_startProcess: workdir is \"%s\"", qPrintable(QDir::currentPath())));
    835832
    836833    // try to find the executable
    … …  
    883880    }
    884881
    885 #if defined(QPROCESS_DEBUG)
    886     qDebug("qt_startProcess: found \"%s\" for \"%s\"",
     882    DEBUG(("qt_startProcess: found \"%s\" for \"%s\"",
    887883           qPrintable(QFile::decodeName(fullProgramName)),
    888            qPrintable(QFile::decodeName(programName)));
    889 #endif
     884           qPrintable(QFile::decodeName(programName))));
    890885
    891886    int pid = -1;
    … …  
    910905            paths = path.split(QLatin1Char(';'), QString::SkipEmptyParts);
    911906            if (paths.contains(fullPath, Qt::CaseInsensitive)) {
    912 #if defined(QPROCESS_DEBUG)
    913                 qDebug("qt_startProcess: \"%s\" is already in BEGINLIBPATH",
    914                        qPrintable(fullPath));
    915 #endif
     907                DEBUG(("qt_startProcess: \"%s\" is already in BEGINLIBPATH",
     908                       qPrintable(fullPath)));
    916909            } else {
    917 #if defined(QPROCESS_DEBUG)
    918                 qDebug("qt_startProcess: prepending \"%s\" to BEGINLIBPATH",
    919                        qPrintable(fullPath));
    920 #endif
     910                DEBUG(("qt_startProcess: prepending \"%s\" to BEGINLIBPATH",
     911                       qPrintable(fullPath)));
    921912                prependedLibPath = true;
    922913                QByteArray newLibPath = libPathBuf;
    … …  
    961952
    962953#if defined(QPROCESS_DEBUG)
    963         qDebug("qt_startProcess: executable \"%s\"",
    964                qPrintable(QFile::decodeName(programReal)));
     954        ("qt_startProcess: executable \"%s\"",
     955               qPrintable(QFile::decodeName(programReal)));
    965956        for (int i = 0; argvReal[i]; ++i) {
    966             qDebug("qt_startProcess:  arg[%d] \"%s\"",
    967                    i, qPrintable(QFile::decodeName(argvReal[i])));
     957            ("qt_startProcess:  arg[%d] \"%s\"",
     958                   i, qPrintable(QFile::decodeName(argvReal[i])));
    968959        }
    969960#endif
    … …  
    10421033            ULONG ulSid, ulPidDummy;
    10431034            arc = DosStartSession(&data, &ulSid, &ulPidDummy);
    1044 #if defined(QPROCESS_DEBUG)
    1045             qDebug("qt_startProcess: DosStartSession() returned %ld", arc);
    1046 #endif
     1035            DEBUG(("qt_startProcess: DosStartSession() returned %ld", arc));
    10471036            // Note: for SSF_RELATED_INDEPENDENT, PID of the started process is
    10481037            // unknown, return 0 to indicate this
    … …  
    10621051        }
    10631052
    1064 #if defined(QPROCESS_DEBUG)
    1065         qDebug("qt_startProcess: pid %d", pid);
    1066 #endif
     1053        DEBUG(("qt_startProcess: pid %d", pid));
    10671054
    10681055        if (prependedLibPath) {
    … …  
    10921079    Q_Q(QProcess);
    10931080
    1094 #if defined (QPROCESS_DEBUG)
    1095     qDebug("QProcessPrivate::startProcess");
    1096 #endif
     1081    DEBUG(("QProcessPrivate::startProcess"));
    10971082
    10981083    // Initialize pipes
    … …  
    11431128        }
    11441129        if (arc != NO_ERROR) {
    1145 #if defined (QPROCESS_DEBUG)
    1146             qDebug("QProcessPrivate::startProcess: DosDupHandle for STDIN "
    1147                    "returned %lu", arc);
    1148 #endif
     1130            DEBUG(("QProcessPrivate::startProcess: DosDupHandle for STDIN "
     1131                   "returned %lu", arc));
    11491132            break;
    11501133        }
    … …  
    11681151            }
    11691152            if (arc != NO_ERROR) {
    1170 #if defined (QPROCESS_DEBUG)
    1171                 qDebug("QProcessPrivate::startProcess: DosDupHandle for STDOUT "
    1172                        "returned %lu", arc);
    1173 #endif
     1153                DEBUG(("QProcessPrivate::startProcess: DosDupHandle for STDOUT "
     1154                       "returned %lu", arc));
    11741155                break;
    11751156            }
    … …  
    11791160                    arc = DosDupHandle(realStdout, &realStderr);
    11801161                } else {
    1181                     // qDebug() uses STDERR so only redirect if !QPROCESS_DEBUG
    1182 #if !defined (QPROCESS_DEBUG)
    11831162                    arc = DosDupHandle(stderrChannel.pipe.client, &realStderr);
    1184 #endif
    11851163                }
    11861164            }
    … …  
    12211199                                                .arg(arc)));
    12221200        } else {
    1223 #if defined (QPROCESS_DEBUG)
    1224             qDebug("spawnvpe failed: %s", qPrintable(qt_error_string(errno)));
    1225 #endif
     1201            DEBUG(("spawnvpe failed: %s", qPrintable(qt_error_string(errno))));
    12261202            q->setErrorString(QProcess::tr("Process failed to start: %1")
    12271203                                           .arg(qt_error_string(errno)));
    … …  
    13171293        that->pipeData[OutPipe].bytesLeft = newBytes;
    13181294
    1319 #if defined (QPROCESS_DEBUG)
    1320     qDebug("QProcessPrivate::bytesAvailableFromStdout() == %lld",
    1321            that->pipeData[OutPipe].bytesLeft);
    1322 #endif
     1295    DEBUG(("QProcessPrivate::bytesAvailableFromStdout() == %lld",
     1296           that->pipeData[OutPipe].bytesLeft));
    13231297    return that->pipeData[OutPipe].bytesLeft;
    13241298}
    … …  
    13521326        that->pipeData[ErrPipe].bytesLeft = newBytes;
    13531327
    1354 #if defined (QPROCESS_DEBUG)
    1355     qDebug("QProcessPrivate::bytesAvailableFromStderr() == %lld",
    1356            that->pipeData[ErrPipe].bytesLeft);
    1357 #endif
     1328    DEBUG(("QProcessPrivate::bytesAvailableFromStderr() == %lld",
     1329           that->pipeData[ErrPipe].bytesLeft));
    13581330    return that->pipeData[ErrPipe].bytesLeft;
    13591331}
    … …  
    13721344    }
    13731345
    1374 #if defined QPROCESS_DEBUG
    1375     qDebug("QProcessPrivate::readFromStdout(%p \"%s\", %lld) == %lld",
    1376            data, qt_prettyDebug(data, bytesRead, 16).constData(), maxlen, bytesRead);
    1377 #endif
     1346    DEBUG(("QProcessPrivate::readFromStdout(%p \"%s\", %lld) == %lld",
     1347           data, qt_prettyDebug(data, bytesRead, 16).constData(), maxlen, bytesRead));
    13781348    return bytesRead;
    13791349}
    … …  
    13921362    }
    13931363
    1394 #if defined QPROCESS_DEBUG
    1395     qDebug("QProcessPrivate::readFromStderr(%p \"%s\", %lld) == %lld",
    1396            data, qt_prettyDebug(data, bytesRead, 16).constData(), maxlen, bytesRead);
    1397 #endif
     1364    DEBUG(("QProcessPrivate::readFromStderr(%p \"%s\", %lld) == %lld",
     1365           data, qt_prettyDebug(data, bytesRead, 16).constData(), maxlen, bytesRead));
    13981366    return bytesRead;
    13991367}
    … …  
    14081376        that->pipeData[InPipe].bytesLeft = newBytes;
    14091377
    1410 #if defined (QPROCESS_DEBUG)
    1411     qDebug("QProcessPrivate::writeToStdin(): %lld free bytes in pipe",
    1412            that->pipeData[InPipe].bytesLeft);
    1413 #endif
     1378    DEBUG(("QProcessPrivate::writeToStdin(): %lld free bytes in pipe",
     1379           that->pipeData[InPipe].bytesLeft));
    14141380    if (!that->pipeData[InPipe].bytesLeft)
    14151381        return 0;
    … …  
    14261392    }
    14271393
    1428 #if defined QPROCESS_DEBUG
    1429     qDebug("QProcessPrivate::writeToStdin(%p \"%s\", %lld) == %lld",
    1430            data, qt_prettyDebug(data, maxlen, 16).constData(), maxlen, written);
    1431 #endif
     1394    DEBUG(("QProcessPrivate::writeToStdin(%p \"%s\", %lld) == %lld",
     1395           data, qt_prettyDebug(data, maxlen, 16).constData(), maxlen, written));
    14321396    return written;
    14331397}
    … …  
    14351399void QProcessPrivate::terminateProcess()
    14361400{
    1437 #if defined (QPROCESS_DEBUG)
    1438     qDebug("QProcessPrivate::terminateProcess()");
    1439 #endif
     1401    DEBUG(("QProcessPrivate::terminateProcess()"));
    14401402    if (pid) {
    14411403        HSWITCH hswitch = WinQuerySwitchHandle(NULL, pid);
    … …  
    14661428void QProcessPrivate::killProcess()
    14671429{
    1468 #if defined (QPROCESS_DEBUG)
    1469     qDebug("QProcessPrivate::killProcess()");
    1470 #endif
     1430    DEBUG(("QProcessPrivate::killProcess()"));
    14711431    if (pid)
    14721432        DosKillProcess(DKP_PROCESS, pid);
    … …  
    15041464{
    15051465    Q_Q(QProcess);
    1506 #if defined (QPROCESS_DEBUG)
    1507     qDebug("QProcessPrivate::waitForReadyRead(%d)", msecs);
    1508 #endif
     1466    DEBUG(("QProcessPrivate::waitForReadyRead(%d)", msecs));
    15091467
    15101468    QTime stopWatch;
    … …  
    15701528{
    15711529    Q_Q(QProcess);
    1572 #if defined (QPROCESS_DEBUG)
    1573     qDebug("QProcessPrivate::waitForBytesWritten(%d)", msecs);
    1574 #endif
     1530    DEBUG(("QProcessPrivate::waitForBytesWritten(%d)", msecs));
    15751531
    15761532    QTime stopWatch;
    … …  
    16291585{
    16301586    Q_Q(QProcess);
    1631 #if defined (QPROCESS_DEBUG)
    1632     qDebug("QProcessPrivate::waitForFinished(%d)", msecs);
    1633 #endif
     1587    DEBUG(("QProcessPrivate::waitForFinished(%d)", msecs));
    16341588
    16351589    QTime stopWatch;
    … …  
    17241678        crashed = !WIFEXITED(exitStatus);
    17251679        exitCode = WEXITSTATUS(exitStatus);
     1680
     1681
     1682
     1683
    17261684#if defined QPROCESS_DEBUG
    1727         qDebug() << "QProcessPrivate::waitForDeadChild() dead with exitCode"
    1728                  << exitCode << ", crashed?" << crashed;
    1729 #endif
    1730         return true;
    1731     }
    1732 #if defined QPROCESS_DEBUG
    1733     qDebug() << "QProcessPrivate::waitForDeadChild() not dead!";
     1685    DEBUG(() << "QProcessPrivate::waitForDeadChild() not dead!");
    17341686    if (waitResult == -1)
    1735         qDebug() << "QProcessPrivate::waitForDeadChild()" << strerror(errno);
     1687        );
    17361688#endif
    17371689    return false;
Note: See TracChangeset for help on using the changeset viewer.