From 670fd6bea5ce9d834e312795e0e39314202fede9 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 18 Jul 2019 16:40:20 +0000 Subject: [PATCH] remove redundant QProcess timers Signed-off-by: Ivailo Monev --- src/core/io/qprocess.cpp | 6 ------ src/core/io/qprocess_unix.cpp | 18 +++--------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/core/io/qprocess.cpp b/src/core/io/qprocess.cpp index 7cbf9d47b..d5bd788be 100644 --- a/src/core/io/qprocess.cpp +++ b/src/core/io/qprocess.cpp @@ -1553,12 +1553,9 @@ bool QProcess::waitForBytesWritten(int msecs) if (d->processState == QProcess::NotRunning) return false; if (d->processState == QProcess::Starting) { - QElapsedTimer stopWatch; - stopWatch.start(); bool started = waitForStarted(msecs); if (!started) return false; - msecs = qt_timeout_value(msecs, stopWatch.elapsed()); } return d->waitForBytesWritten(msecs); @@ -1589,12 +1586,9 @@ bool QProcess::waitForFinished(int msecs) if (d->processState == QProcess::NotRunning) return false; if (d->processState == QProcess::Starting) { - QElapsedTimer stopWatch; - stopWatch.start(); bool started = waitForStarted(msecs); if (!started) return false; - msecs = qt_timeout_value(msecs, stopWatch.elapsed()); } return d->waitForFinished(msecs); diff --git a/src/core/io/qprocess_unix.cpp b/src/core/io/qprocess_unix.cpp index 618a96cf9..66c30eb9c 100644 --- a/src/core/io/qprocess_unix.cpp +++ b/src/core/io/qprocess_unix.cpp @@ -888,9 +888,6 @@ bool QProcessPrivate::waitForReadyRead(int msecs) qDebug("QProcessPrivate::waitForReadyRead(%d)", msecs); #endif - QElapsedTimer stopWatch; - stopWatch.start(); - forever { fd_set fdread; fd_set fdwrite; @@ -912,8 +909,7 @@ bool QProcessPrivate::waitForReadyRead(int msecs) if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1) add_fd(nfds, stdinChannel.pipe[1], &fdwrite); - int timeout = qt_timeout_value(msecs, stopWatch.elapsed()); - int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout); + int ret = select_msecs(nfds + 1, &fdread, &fdwrite, msecs); if (ret < 0) { break; } @@ -960,9 +956,6 @@ bool QProcessPrivate::waitForBytesWritten(int msecs) qDebug("QProcessPrivate::waitForBytesWritten(%d)", msecs); #endif - QElapsedTimer stopWatch; - stopWatch.start(); - while (!writeBuffer.isEmpty()) { fd_set fdread; fd_set fdwrite; @@ -985,8 +978,7 @@ bool QProcessPrivate::waitForBytesWritten(int msecs) if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1) add_fd(nfds, stdinChannel.pipe[1], &fdwrite); - int timeout = qt_timeout_value(msecs, stopWatch.elapsed()); - int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout); + int ret = select_msecs(nfds + 1, &fdread, &fdwrite, msecs); if (ret < 0) { break; } @@ -1027,9 +1019,6 @@ bool QProcessPrivate::waitForFinished(int msecs) qDebug("QProcessPrivate::waitForFinished(%d)", msecs); #endif - QElapsedTimer stopWatch; - stopWatch.start(); - forever { fd_set fdread; fd_set fdwrite; @@ -1052,8 +1041,7 @@ bool QProcessPrivate::waitForFinished(int msecs) if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1) add_fd(nfds, stdinChannel.pipe[1], &fdwrite); - int timeout = qt_timeout_value(msecs, stopWatch.elapsed()); - int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout); + int ret = select_msecs(nfds + 1, &fdread, &fdwrite, msecs); if (ret < 0) { break; } -- 2.11.0