API: miner_getstatdetail(). Several changes.

Change times to seconds.
Add 'lastupdate' to global miner share info.
Set lastupdate initially to time when farm got launched.

This commit addresses a little bit of issue #1603.

Author: StefanOberhumer

docs/API_DOCUMENTATION.md

@@ -198,11 +198,12 @@ and expect back a response like this:
     "epoch_changes": 1,                 // Ethminer starts with epoch 0. First connection to pool increments this counter
     "hashrate": 46709128,               // Overall HashRate in H/s
     "hostname": "<omitted-hostname>",
-    "runtime": 4,                       // Total running time in minutes
+    "runtime": 240,                     // Total running time in seconds
     "shares": {                         // Summarized info about shares
       "accepted": 5,
       "acceptedstale": 1,
       "invalid": 1,
+      "lastupdate": 58,                 // Latest update of any share info of is X seconds ago
       "rejected": 0
     },
     "tstart": 63,
@@ -221,7 +222,7 @@ and expect back a response like this:
          "accepted": 3,
          "acceptedstale": 0,
          "invalid": 0,
-         "lastupdate": 1,               // Share info from this GPU updated X minutes ago
+         "lastupdate": 58,              // Share info from this GPU updated X seconds ago
          "rejected": 0
        },
        "temp": 53                       // Temperature in °C
@@ -238,7 +239,7 @@ and expect back a response like this:
          "accepted": 2,
          "acceptedstale": 1,
          "invalid": 1,
-         "lastupdate": 2,
+         "lastupdate": 134,
          "rejected": 0
        },
        "temp": 56

libapicore/ApiServer.cpp

@@ -675,7 +675,6 @@ void ApiConnection::processRequest(Json::Value& jRequest, Json::Value& jResponse
         {
             jResponse["result"] = false;
         }
-
     }
 
     else if (_method == "miner_setverbosity")
@@ -922,8 +921,8 @@ Json::Value ApiConnection::getMinerStatHR()
 }
 
 
-Json::Value ApiConnection::getMinerStatDetailPerMiner(
-    const WorkingProgress& p, const SolutionStats& s, size_t index)
+Json::Value ApiConnection::getMinerStatDetailPerMiner(const WorkingProgress& p,
+    const SolutionStats& s, size_t index, const std::chrono::steady_clock::time_point& now)
 {
     Json::Value jRes;
     auto const& miner = Farm::f().getMiner(index);
@@ -941,9 +940,10 @@ Json::Value ApiConnection::getMinerStatDetailPerMiner(
     jshares["rejected"] = s.getRejects(index);
     jshares["invalid"] = s.getFailures(index);
     jshares["acceptedstale"] = s.getAcceptedStales(index);
-    auto solution_lastupdated = std::chrono::duration_cast<std::chrono::minutes>(
-        std::chrono::steady_clock::now() - s.getLastUpdated(index));
-    jshares["lastupdate"] = uint64_t(solution_lastupdated.count()); // last update of this gpu stat was x minutes ago
+    auto solution_lastupdated =
+        std::chrono::duration_cast<std::chrono::seconds>(now - s.getLastUpdated(index));
+    jshares["lastupdate"] =
+        uint64_t(solution_lastupdated.count());  // last update of this gpu stat was x seconds ago
     jRes["shares"] = jshares;
 
 
@@ -995,8 +995,9 @@ Json::Value ApiConnection::getMinerStatDetailPerMiner(
  */
 Json::Value ApiConnection::getMinerStatDetail()
 {
-    auto runningTime = std::chrono::duration_cast<std::chrono::minutes>(
-        std::chrono::steady_clock::now() - Farm::f().farmLaunched());
+    const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+    auto runningTime =
+        std::chrono::duration_cast<std::chrono::seconds>(now - Farm::f().farmLaunched());
 
     SolutionStats s = Farm::f().getSolutionStats();
     WorkingProgress p = Farm::f().miningProgress();
@@ -1007,7 +1008,7 @@ Json::Value ApiConnection::getMinerStatDetail()
     Json::Value jRes;
 
     jRes["version"] = ethminer_get_buildinfo()->project_name_with_version;  // miner version.
-    jRes["runtime"] = uint64_t(runningTime.count());  // running time, in minutes.
+    jRes["runtime"] = uint64_t(runningTime.count());  // running time, in seconds.
 
     {
         // Even the client should know which host was queried
@@ -1052,7 +1053,7 @@ Json::Value ApiConnection::getMinerStatDetail()
     {
         for (size_t i = 0; i < Farm::f().getMiners().size(); i++)
         {
-            jRes["gpus"].append(getMinerStatDetailPerMiner(p, s, i));
+            jRes["gpus"].append(getMinerStatDetailPerMiner(p, s, i, now));
         }
     }
     else
@@ -1069,6 +1070,10 @@ Json::Value ApiConnection::getMinerStatDetail()
     jshares["rejected"] = s.getRejects();
     jshares["invalid"] = s.getFailures();
     jshares["acceptedstale"] = s.getAcceptedStales();
+    auto solution_lastupdated =
+        std::chrono::duration_cast<std::chrono::seconds>(now - s.getLastUpdated());
+    jshares["lastupdate"] =
+        uint64_t(solution_lastupdated.count());  // last update of this gpu stat was x seconds ago
     jRes["shares"] = jshares;
 
     return jRes;

libapicore/ApiServer.h

@@ -54,8 +54,8 @@ class ApiConnection
     void onSendSocketDataCompleted(const boost::system::error_code& ec);
 
     Json::Value getMinerStatDetail();
-    Json::Value getMinerStatDetailPerMiner(
-        const WorkingProgress& p, const SolutionStats& s, size_t index);
+    Json::Value getMinerStatDetailPerMiner(const WorkingProgress& p, const SolutionStats& s,
+        size_t index, const std::chrono::steady_clock::time_point& now);
 
     Disconnected m_onDisconnected;
 

libethcore/Farm.h

@@ -120,10 +120,7 @@ class Farm : public FarmFace
      * @brief Get information on the progress of mining this work package.
      * @return The progress with mining so far.
      */
-    WorkingProgress const& miningProgress() const
-    {
-        return m_progress;
-    }
+    WorkingProgress const& miningProgress() const { return m_progress; }
 
     std::vector<std::shared_ptr<Miner>> getMiners() { return m_miners; }
 
@@ -134,7 +131,7 @@ class Farm : public FarmFace
         return m_miners[index];
     }
 
-    SolutionStats getSolutionStats() { return m_solutionStats; } // returns a copy
+    SolutionStats getSolutionStats() { return m_solutionStats; }  // returns a copy
 
     void failedSolution(unsigned _miner_index) override { m_solutionStats.failed(_miner_index); }
 
@@ -233,8 +230,8 @@ class Farm : public FarmFace
     boost::asio::deadline_timer m_collectTimer;
     static const int m_collectInterval = 5000;
 
-    mutable SolutionStats m_solutionStats;
     std::chrono::steady_clock::time_point m_farm_launched = std::chrono::steady_clock::now();
+    mutable SolutionStats m_solutionStats;
 
     string m_pool_addresses;
 
@@ -262,4 +259,3 @@ class Farm : public FarmFace
 
 }  // namespace eth
 }  // namespace dev
-

libethcore/Miner.h

@@ -18,9 +18,9 @@
 #pragma once
 
 #include <list>
+#include <numeric>
 #include <string>
 #include <thread>
-#include <numeric>
 
 #include <boost/circular_buffer.hpp>
 #include <boost/timer.hpp>
@@ -89,7 +89,8 @@ class FormattedMemSize
 std::ostream& operator<<(std::ostream& os, const FormattedMemSize& s);
 
 /// Pause mining
-typedef enum {
+typedef enum
+{
     MINING_NOT_PAUSED = 0x00000000,
     MINING_PAUSED_WAIT_FOR_T_START = 0x00000001,
     MINING_PAUSED_API = 0x00000002
@@ -121,10 +122,7 @@ struct MiningPause
         return (pause_reason != MinigPauseReason::MINING_NOT_PAUSED);
     }
 
-    bool is_mining_paused()
-    {
-        return is_mining_paused(get_mining_paused());
-    }
+    bool is_mining_paused() { return is_mining_paused(get_mining_paused()); }
 
     std::string get_mining_paused_string(const MinigPauseReason& pause_reason)
     {
@@ -139,10 +137,7 @@ struct MiningPause
         return r;
     }
 
-    std::string get_mining_paused_string()
-    {
-        return get_mining_paused_string(get_mining_paused());
-    }
+    std::string get_mining_paused_string() { return get_mining_paused_string(get_mining_paused()); }
 };
 
 
@@ -174,40 +169,36 @@ class SolutionStats  // Only updated by Poolmanager thread!
         if (m_accepts.size() <= miner_index)
             m_accepts.resize(miner_index + 1);
         m_accepts[miner_index]++;
-        auto now = std::chrono::steady_clock::now();
         if (m_lastUpdated.size() <= miner_index)
-            m_lastUpdated.resize(miner_index + 1, now);
-        m_lastUpdated[miner_index] = now;
+            m_lastUpdated.resize(miner_index + 1, m_tpInitalized);
+        m_lastUpdated[miner_index] = std::chrono::steady_clock::now();
     }
     void rejected(unsigned miner_index)
     {
         if (m_rejects.size() <= miner_index)
             m_rejects.resize(miner_index + 1);
         m_rejects[miner_index]++;
-        auto now = std::chrono::steady_clock::now();
         if (m_lastUpdated.size() <= miner_index)
-            m_lastUpdated.resize(miner_index + 1, now);
-        m_lastUpdated[miner_index] = now;
+            m_lastUpdated.resize(miner_index + 1, m_tpInitalized);
+        m_lastUpdated[miner_index] = std::chrono::steady_clock::now();
     }
     void failed(unsigned miner_index)
     {
         if (m_failures.size() <= miner_index)
             m_failures.resize(miner_index + 1);
         m_failures[miner_index]++;
-        auto now = std::chrono::steady_clock::now();
         if (m_lastUpdated.size() <= miner_index)
-            m_lastUpdated.resize(miner_index + 1, now);
-        m_lastUpdated[miner_index] = now;
+            m_lastUpdated.resize(miner_index + 1, m_tpInitalized);
+        m_lastUpdated[miner_index] = std::chrono::steady_clock::now();
     }
     void acceptedStale(unsigned miner_index)
     {
         if (m_acceptedStales.size() <= miner_index)
             m_acceptedStales.resize(miner_index + 1);
         m_acceptedStales[miner_index]++;
-        auto now = std::chrono::steady_clock::now();
         if (m_lastUpdated.size() <= miner_index)
-            m_lastUpdated.resize(miner_index + 1, now);
-        m_lastUpdated[miner_index] = now;
+            m_lastUpdated.resize(miner_index + 1, m_tpInitalized);
+        m_lastUpdated[miner_index] = std::chrono::steady_clock::now();
     }
 
     unsigned getAccepts() const { return accumulate(m_accepts.begin(), m_accepts.end(), 0); }
@@ -245,9 +236,18 @@ class SolutionStats  // Only updated by Poolmanager thread!
     std::chrono::steady_clock::time_point getLastUpdated(unsigned miner_index) const
     {
         if (m_lastUpdated.size() <= miner_index)
-            return std::chrono::steady_clock::now();
+            return m_tpInitalized;
         return m_lastUpdated[miner_index];
     }
+    std::chrono::steady_clock::time_point getLastUpdated() const
+    {
+        /* return the newest update time of all GPUs */
+        if (!m_lastUpdated.size())
+            return m_tpInitalized;
+
+        auto max_index = std::max_element(m_lastUpdated.begin(), m_lastUpdated.end());
+        return m_lastUpdated[std::distance(m_lastUpdated.begin(), max_index)];
+    }
 
     std::string getString(unsigned miner_index)
     {
@@ -267,12 +267,12 @@ class SolutionStats  // Only updated by Poolmanager thread!
     }
 
 private:
-
     std::vector<unsigned> m_accepts = {};
     std::vector<unsigned> m_rejects = {};
     std::vector<unsigned> m_failures = {};
     std::vector<unsigned> m_acceptedStales = {};
     std::vector<std::chrono::steady_clock::time_point> m_lastUpdated = {};
+    const std::chrono::steady_clock::time_point m_tpInitalized = std::chrono::steady_clock::now();
 };
 
 std::ostream& operator<<(std::ostream& os, const SolutionStats& s);
@@ -320,8 +320,7 @@ class Miner : public Worker
 public:
     Miner(std::string const& _name, size_t _index)
       : Worker(_name + std::to_string(_index)), m_index(_index)
-    {
-    }
+    {}
 
     virtual ~Miner() = default;