Added uptime to cli

Author: smurfy

ethminer/MinerAux.h

@@ -798,7 +798,7 @@ class MinerCLI
 					f.resetMiningProgress();
 					if (current)
 					{
-						minelog << mp << f.getSolutionStats();
+						minelog << mp << f.getSolutionStats() << f.farmLaunchedFormatted();
 #if ETH_DBUS
 						dbusint.send(toString(mp).data());
 #endif
@@ -950,7 +950,7 @@ class MinerCLI
 				{
 					if (client.current())
 					{
-						minelog << mp << f.getSolutionStats();
+						minelog << mp << f.getSolutionStats() << f.farmLaunchedFormatted();
 #if ETH_DBUS
 						dbusint.send(toString(mp).data());
 #endif

libapicore/ApiServer.cpp

@@ -14,7 +14,7 @@ void ApiServer::getMinerStat1(const Json::Value& request, Json::Value& response)
 {
 	(void) request; // unused
 
-	auto runningTime = std::chrono::duration_cast<std::chrono::minutes>(steady_clock::now() - this->m_started);
+	auto runningTime = std::chrono::duration_cast<std::chrono::minutes>(steady_clock::now() - this->m_farm.farmLaunched());
 
 	SolutionStats s = this->m_farm.getSolutionStats();
 	WorkingProgress p = this->m_farm.miningProgress();

libapicore/ApiServer.h

@@ -15,7 +15,6 @@ class ApiServer : public AbstractServer<ApiServer>
 public:
 	ApiServer(AbstractServerConnector *conn, serverVersion_t type, Farm &farm, bool &readonly);
 private:
-	steady_clock::time_point m_started = steady_clock::now();
 	Farm &m_farm;
 	void getMinerStat1(const Json::Value& request, Json::Value& response);
 	void doMinerRestart(const Json::Value& request, Json::Value& response);

libethcore/Farm.h

@@ -217,6 +217,24 @@ class Farm: public FarmFace
 
 	WorkPackage work() const { Guard l(x_minerWork); return m_work; }
 
+	std::chrono::steady_clock::time_point farmLaunched() {
+		return m_farm_launched;
+	}
+
+	string farmLaunchedFormatted() {
+		auto d = std::chrono::steady_clock::now() - m_farm_launched;
+		int hsize = 3;
+		auto hhh = std::chrono::duration_cast<std::chrono::hours>(d);
+		if (hhh.count() < 100) {
+			hsize = 2;
+		}
+		d -= hhh;
+		auto mm = std::chrono::duration_cast<std::chrono::minutes>(d);
+		std::ostringstream stream;
+		stream << "Time: " << std::setfill('0') << std::setw(hsize) << hhh.count() << ':' << std::setfill('0') << std::setw(2) << mm.count();
+		return stream.str();
+	}
+
 private:
 	/**
 	 * @brief Called from a Miner to note a WorkPackage has a solution.
@@ -253,7 +271,7 @@ class Farm: public FarmFace
 	bool b_lastMixed = false;
 
 	mutable SolutionStats m_solutionStats;
-
+	std::chrono::steady_clock::time_point m_farm_launched = std::chrono::steady_clock::now();
 }; 
 
 }