diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp index 59a0db0b8d..3068fe1d53 100644 --- a/src/testlib/qbenchmarkevent.cpp +++ b/src/testlib/qbenchmarkevent.cpp @@ -18,11 +18,6 @@ void QBenchmarkEvent::start() QAbstractEventDispatcher::instance()->installNativeEventFilter(this); } -qint64 QBenchmarkEvent::checkpoint() -{ - return eventCounter; -} - qint64 QBenchmarkEvent::stop() { QAbstractEventDispatcher::instance()->removeNativeEventFilter(this); diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h index cec06070af..b160dac828 100644 --- a/src/testlib/qbenchmarkevent_p.h +++ b/src/testlib/qbenchmarkevent_p.h @@ -28,7 +28,6 @@ public: QBenchmarkEvent(); ~QBenchmarkEvent(); void start() override; - qint64 checkpoint() override; qint64 stop() override; bool isMeasurementAccepted(qint64 measurement) override; int adjustIterationCount(int suggestion) override; diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp index 799eb06add..fab0a689bd 100644 --- a/src/testlib/qbenchmarkmeasurement.cpp +++ b/src/testlib/qbenchmarkmeasurement.cpp @@ -16,11 +16,6 @@ void QBenchmarkTimeMeasurer::start() time.start(); } -qint64 QBenchmarkTimeMeasurer::checkpoint() -{ - return time.elapsed(); -} - qint64 QBenchmarkTimeMeasurer::stop() { return time.elapsed(); @@ -58,12 +53,6 @@ void QBenchmarkTickMeasurer::start() startTicks = getticks(); } -qint64 QBenchmarkTickMeasurer::checkpoint() -{ - CycleCounterTicks now = getticks(); - return qRound64(elapsed(now, startTicks)); -} - qint64 QBenchmarkTickMeasurer::stop() { CycleCounterTicks now = getticks(); diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h index 9d9c9609c6..1e13a9be3d 100644 --- a/src/testlib/qbenchmarkmeasurement_p.h +++ b/src/testlib/qbenchmarkmeasurement_p.h @@ -26,7 +26,6 @@ public: virtual ~QBenchmarkMeasurerBase() = default; virtual void init() {} virtual void start() = 0; - virtual qint64 checkpoint() = 0; virtual qint64 stop() = 0; virtual bool isMeasurementAccepted(qint64 measurement) = 0; virtual int adjustIterationCount(int suggestion) = 0; diff --git a/src/testlib/qbenchmarkperfevents.cpp b/src/testlib/qbenchmarkperfevents.cpp index 8345c7a4be..df7f236aad 100644 --- a/src/testlib/qbenchmarkperfevents.cpp +++ b/src/testlib/qbenchmarkperfevents.cpp @@ -495,14 +495,6 @@ void QBenchmarkPerfEventsMeasurer::start() ::ioctl(fd, PERF_EVENT_IOC_ENABLE); } -qint64 QBenchmarkPerfEventsMeasurer::checkpoint() -{ - ::ioctl(fd, PERF_EVENT_IOC_DISABLE); - qint64 value = readValue(); - ::ioctl(fd, PERF_EVENT_IOC_ENABLE); - return value; -} - qint64 QBenchmarkPerfEventsMeasurer::stop() { // disable the counter diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h index db86afa9c1..cb757ffce9 100644 --- a/src/testlib/qbenchmarkperfevents_p.h +++ b/src/testlib/qbenchmarkperfevents_p.h @@ -26,7 +26,6 @@ public: ~QBenchmarkPerfEventsMeasurer(); void init() override; void start() override; - qint64 checkpoint() override; qint64 stop() override; bool isMeasurementAccepted(qint64 measurement) override; int adjustIterationCount(int suggestion) override; diff --git a/src/testlib/qbenchmarktimemeasurers_p.h b/src/testlib/qbenchmarktimemeasurers_p.h index d07af873cc..a27f02d0b5 100644 --- a/src/testlib/qbenchmarktimemeasurers_p.h +++ b/src/testlib/qbenchmarktimemeasurers_p.h @@ -25,7 +25,6 @@ class QBenchmarkTimeMeasurer : public QBenchmarkMeasurerBase { public: void start() override; - qint64 checkpoint() override; qint64 stop() override; bool isMeasurementAccepted(qint64 measurement) override; int adjustIterationCount(int sugestion) override; @@ -42,7 +41,6 @@ class QBenchmarkTickMeasurer : public QBenchmarkMeasurerBase { public: void start() override; - qint64 checkpoint() override; qint64 stop() override; bool isMeasurementAccepted(qint64 measurement) override; int adjustIterationCount(int) override; diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp index 43e444b211..130088ecb4 100644 --- a/src/testlib/qbenchmarkvalgrind.cpp +++ b/src/testlib/qbenchmarkvalgrind.cpp @@ -170,18 +170,13 @@ void QBenchmarkCallgrindMeasurer::start() CALLGRIND_ZERO_STATS; } -qint64 QBenchmarkCallgrindMeasurer::checkpoint() +qint64 QBenchmarkCallgrindMeasurer::stop() { CALLGRIND_DUMP_STATS; const qint64 result = QBenchmarkValgrindUtils::extractLastResult(); return result; } -qint64 QBenchmarkCallgrindMeasurer::stop() -{ - return checkpoint(); -} - bool QBenchmarkCallgrindMeasurer::isMeasurementAccepted(qint64 measurement) { Q_UNUSED(measurement); diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h index 7c0cfe570e..6092ca3cc6 100644 --- a/src/testlib/qbenchmarkvalgrind_p.h +++ b/src/testlib/qbenchmarkvalgrind_p.h @@ -41,7 +41,6 @@ class QBenchmarkCallgrindMeasurer : public QBenchmarkMeasurerBase { public: void start() override; - qint64 checkpoint() override; qint64 stop() override; bool isMeasurementAccepted(qint64 measurement) override; int adjustIterationCount(int) override;