Show Clock Time rather than time since start for mining and Test Mode

Signed-off-by: Pttn <28868425+Pttn@users.noreply.github.com>

Author: Pttn

Miner.cpp

@@ -336,7 +336,10 @@ void Miner::startThreads() {
 		for (uint16_t i(0) ; i < _parameters.threads ; i++)
 			_workerThreads.push_back(std::thread(&Miner::_doTasks, this, i));
 		std::cout << "-----------------------------------------------------------" << std::endl;
-		std::cout << Stats::formattedTime(_statManager.timeSinceStart()) << " Started mining at block " << _client->currentHeight() << ", difficulty " << FIXED(3) << _client->currentDifficulty() << std::endl;
+		if (_mode == "Benchmark" || _mode == "Search")
+			std::cout << Stats::formattedTime(_statManager.timeSinceStart()) << " Started " << _mode << ", difficulty " << FIXED(3) << _client->currentDifficulty() << std::endl;
+		else
+			std::cout << Stats::formattedClockTimeNow() << " Started mining at block " << _client->currentHeight() << ", difficulty " << FIXED(3) << _client->currentDifficulty() << std::endl;
 	}
 }
 
@@ -787,7 +790,10 @@ void Miner::_doCheckTask(Task task) {
 		// If tuple long enough or share, submit
 		if (primeCount >= _works[workIndex].job.primeCountMin || (_mode == "Search" && primeCount >= _parameters.tupleLengthMin)) {
 			const mpz_class basePrime(candidate - offsetSum);
-			std::cout << Stats::formattedTime(_statManager.timeSinceStart()) << " " << primeCount;
+			if (_mode == "Benchmark" || _mode == "Search")
+				std::cout << Stats::formattedTime(_statManager.timeSinceStart()) << " " << primeCount;
+			else
+				std::cout << Stats::formattedClockTimeNow() << " " << primeCount;
 			if (_mode == "Pool")
 				std::cout << "-share found by worker thread " << threadId << std::endl;
 			else {
@@ -867,7 +873,11 @@ void Miner::_manageTasks() {
 		// Notify when the network found a block
 		if (isNewHeight && oldHeight != 0) {
 			_statManager.newBlock();
-			std::cout << Stats::formattedTime(_statManager.timeSinceStart()) << " Block " << job.height << ", average " << FIXED(1) << _statManager.averageBlockTime() << " s, difficulty " << FIXED(3) << job.difficulty << std::endl;
+			if (_mode == "Benchmark" || _mode == "Search")
+				std::cout << Stats::formattedTime(_statManager.timeSinceStart());
+			else
+				std::cout << Stats::formattedClockTimeNow();
+			std::cout << " Block " << job.height << ", average " << FIXED(1) << _statManager.averageBlockTime() << " s, difficulty " << FIXED(3) << job.difficulty << std::endl;
 		}
 		_works[_currentWorkIndex].primorialMultipleStart = _works[_currentWorkIndex].job.target + _primorial - (_works[_currentWorkIndex].job.target % _primorial);
 		// Reset Counts and create Presieve Tasks
@@ -997,9 +1007,13 @@ bool Miner::hasAcceptedPatterns(const std::vector<std::vector<uint64_t>> &accept
 
 void Miner::printStats() const {
 	Stats statsRecent(_statManager.stats(false)), statsSinceStart(_statManager.stats(true));
-	if (_mode == "Benchmark" || _mode == "Search")
+	if (_mode == "Benchmark" || _mode == "Search") {
 		statsRecent = statsSinceStart;
-	std::cout << Stats::formattedTime(_statManager.timeSinceStart()) << " " << FIXED(2) << statsRecent.cps() << " c/s, r " << statsRecent.r();
+		std::cout << Stats::formattedTime(_statManager.timeSinceStart());
+	}
+	else
+		std::cout << Stats::formattedClockTimeNow();
+	std::cout << " " << FIXED(2) << statsRecent.cps() << " c/s, r " << statsRecent.r();
 	if (_mode != "Pool") {
 		std::cout << " ; (1-" << _parameters.pattern.size() << "t) = " << statsSinceStart.formattedCounts(1);
 		if (statsRecent.count(1) >= 10)

Stats.cpp

@@ -40,6 +40,16 @@ std::string Stats::formattedTime(const double &time) {
 	oss << "[" << timeInt/86400000 << ":" << leading0s(2) << (timeInt/3600000) % 24 << ":" << leading0s(2) << (timeInt/60000) % 60 << ":" << leading0s(2) << (timeInt/1000) % 60 << "." << (timeInt/100) % 10 << "]";
 	return oss.str();
 }
+std::string Stats::formattedClockTimeNow() {
+	const std::chrono::time_point now(std::chrono::system_clock::now());
+	const std::chrono::time_point seconds(std::chrono::time_point_cast<std::chrono::seconds>(now));
+	const std::chrono::duration milliseconds(std::chrono::duration_cast<std::chrono::milliseconds>(now - seconds));
+	const std::time_t timeT(std::chrono::system_clock::to_time_t(now));
+	const std::tm *timeTm(std::localtime(&timeT));
+	std::ostringstream oss;
+	oss << "[" << std::put_time(timeTm, "%H:%M:%S") << "." << static_cast<uint32_t>(std::floor(milliseconds.count()))/100 << "]";
+	return oss.str();
+}
 std::string Stats::formattedDuration(const double &duration) {
 	std::ostringstream oss;
 	if (duration < 0.001) oss << std::round(1000000.*duration) << " us";

Stats.hpp

@@ -21,6 +21,7 @@ class Stats {
 	std::string formattedRates(const uint64_t = 0) const;
 	std::string formattedRatios() const;
 	static std::string formattedTime(const double &time);
+	static std::string formattedClockTimeNow();
 	static std::string formattedDuration(const double &duration);
 };