From 880fbb84acf853be8ac0c5a23ff0475e8ce6dff0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 22 Jun 2022 16:44:30 +0200
Subject: Add --console mode, to be used remotely

---
 src/copythread.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/copythread.cpp')

diff --git a/src/copythread.cpp b/src/copythread.cpp
index 21aadbb..7fda016 100644
--- a/src/copythread.cpp
+++ b/src/copythread.cpp
@@ -38,22 +38,22 @@ void CopyThread::run()
 	qint64 seqSum = 0, rndSum = 0;
 	qint64 seqTime, rndTime = -1;
 
-	const qint64 size = _file->size() - BUFFER_SIZE;
+	const qint64 size = _file->size();
 
 	// Sequential read
-	emit logMessage(tr("Starting sequential read test"));
+	emit logMessage(CopyThread::TestSequentialStart, tr("Starting sequential read test"));
 	timer.start();
 	do {
 		ret = _file->read(buffer, BUFFER_SIZE);
 		seqSum += ret;
 		if (ret == 0)
 			break; // EOF
-	} while (!_doStop && ret >= 0 && timer.elapsed() < TEST_LENGTH);
+	} while (!_doStop && ret > 0 && timer.elapsed() < TEST_LENGTH);
 	seqTime = timer.elapsed();
 
 	// Random read
 	if (size > 0) {
-		emit logMessage(tr("Starting random read test"));
+		emit logMessage(CopyThread::TestRandomStart, tr("Starting random read test"));
 		timer.restart();
 		do {
 			_file->seek(BIGRAND % size);
@@ -66,7 +66,7 @@ void CopyThread::run()
 	// All done
 	const qint64 seqSpeed = seqSum / (seqTime * 1024 + 1);
 	const qint64 rndSpeed = rndSum / (rndTime * 1024 + 1);
-	emit logMessage(tr("Seq: %1MiB/s, Random: %2MiB/s - [%3s / %4s]")
+	emit logMessage(CopyThread::TestFinished, tr("Seq: %1MiB/s, Random: %2MiB/s - [%3s / %4s]")
 			.arg(QString::number(seqSpeed), QString::number(rndSpeed),
 					QString::number(seqTime / 1000), QString::number(rndTime / 1000)));
 	delete[] buffer;
-- 
cgit v1.2.3-55-g7522