Added results statistics to API.

src/net/Client.cpp

@@ -194,7 +194,7 @@ int64_t Client::submit(const JobResult &result)
     snprintf(req, 345, "{\"id\":%" PRIu64 ",\"jsonrpc\":\"2.0\",\"method\":\"submit\",\"params\":{\"id\":\"%s\",\"job_id\":\"%s\",\"nonce\":\"%s\",\"result\":\"%s\"}}\n",
              m_sequence, m_rpcId, result.jobId, nonce, data);
 
-    m_results[m_sequence] = SubmitResult(m_sequence, result.diff);
+    m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff());
     return send(req);
 }
 
@@ -420,7 +420,8 @@ void Client::parseResponse(int64_t id, const json_t *result, const json_t *error
 
         auto it = m_results.find(id);
         if (it != m_results.end()) {
-            m_listener->onResultAccepted(this, it->second.seq, it->second.diff, it->second.elapsed(), message);
+            it->second.done();
+            m_listener->onResultAccepted(this, it->second, message);
             m_results.erase(it);
         }
         else if (!m_quiet) {
@@ -456,7 +457,8 @@ void Client::parseResponse(int64_t id, const json_t *result, const json_t *error
 
     auto it = m_results.find(id);
     if (it != m_results.end()) {
-        m_listener->onResultAccepted(this, it->second.seq, it->second.diff, it->second.elapsed(), nullptr);
+        it->second.done();
+        m_listener->onResultAccepted(this, it->second, nullptr);
         m_results.erase(it);
     }
 }

src/net/JobResult.h

@@ -61,6 +61,12 @@ public:
     }
 
 
+    inline uint64_t actualDiff() const
+    {
+        return Job::toDiff(reinterpret_cast<const uint64_t*>(result)[3]);
+    }
+
+
     char jobId[64];
     int poolId;
     uint32_t diff;

src/net/Network.cpp

@@ -30,12 +30,14 @@
 #include <time.h>
 
 
+#include "api/Api.h"
 #include "log/Log.h"
 #include "net/Client.h"
 #include "net/Network.h"
 #include "net/strategies/DonateStrategy.h"
 #include "net/strategies/FailoverStrategy.h"
 #include "net/strategies/SinglePoolStrategy.h"
+#include "net/SubmitResult.h"
 #include "net/Url.h"
 #include "Options.h"
 #include "Platform.h"
@@ -44,9 +46,7 @@
 
 Network::Network(const Options *options) :
     m_options(options),
-    m_donate(nullptr),
-    m_accepted(0),
-    m_rejected(0)
+    m_donate(nullptr)
 {
     srand(time(0) ^ (uintptr_t) this);
 
@@ -139,21 +139,19 @@ void Network::onPause(IStrategy *strategy)
 }
 
 
-void Network::onResultAccepted(Client *client, int64_t seq, uint32_t diff, uint64_t ms, const char *error)
+void Network::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
 {
-    if (error) {
-        m_rejected++;
+    m_results.add(result, error);
 
+    if (error) {
         LOG_INFO(m_options->colors() ? "\x1B[01;31mrejected\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[31m\"%s\"\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
                                      : "rejected (%" PRId64 "/%" PRId64 ") diff %u \"%s\" (%" PRIu64 " ms)",
-                 m_accepted, m_rejected, diff, error, ms);
+                 m_results.accepted, m_results.rejected, result.diff, error, result.elapsed);
     }
     else {
-        m_accepted++;
-
         LOG_INFO(m_options->colors() ? "\x1B[01;32maccepted\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
                                      : "accepted (%" PRId64 "/%" PRId64 ") diff %u (%" PRIu64 " ms)",
-                 m_accepted, m_rejected, diff, ms);
+                 m_results.accepted, m_results.rejected, result.diff, result.elapsed);
     }
 }
 
@@ -162,12 +160,12 @@ void Network::setJob(Client *client, const Job &job)
 {
     if (m_options->colors()) {
         LOG_INFO("\x1B[01;35mnew job\x1B[0m from \x1B[01;37m%s:%d\x1B[0m diff \x1B[01;37m%d", client->host(), client->port(), job.diff());
-
     }
     else {
         LOG_INFO("new job from %s:%d diff %d", client->host(), client->port(), job.diff());
     }
 
+    m_results.diff = job.diff();
     Workers::setJob(job);
 }
 
@@ -181,6 +179,8 @@ void Network::tick()
     if (m_donate) {
         m_donate->tick(now);
     }
+
+    Api::tick(m_results);
 }
 
 

src/net/Network.h

@@ -29,6 +29,7 @@
 #include <uv.h>
 
 
+#include "api/Results.h"
 #include "interfaces/IJobResultListener.h"
 #include "interfaces/IStrategyListener.h"
 
@@ -52,7 +53,7 @@ protected:
   void onJob(Client *client, const Job &job) override;
   void onJobResult(const JobResult &result) override;
   void onPause(IStrategy *strategy) override;
-  void onResultAccepted(Client *client, int64_t seq, uint32_t diff, uint64_t ms, const char *error) override;
+  void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;
 
 private:
   constexpr static int kTickInterval = 1 * 1000;
@@ -65,8 +66,7 @@ private:
   const Options *m_options;
   IStrategy *m_donate;
   IStrategy *m_strategy;
-  uint64_t m_accepted;
-  uint64_t m_rejected;
+  Results m_results;
   uv_timer_t m_timer;
 };
 

src/net/SubmitResult.cpp

@@ -0,0 +1,44 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2017 XMRig       <support@xmrig.com>
+ *
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+
+
+#include "net/SubmitResult.h"
+
+
+SubmitResult::SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff) :
+    seq(seq),
+    diff(diff),
+    actualDiff(actualDiff),
+    elapsed(0)
+{
+    start = uv_hrtime();
+}
+
+
+void SubmitResult::done()
+{
+    elapsed = (uv_hrtime() - start) / 1000000;
+}

src/net/SubmitResult.h

@@ -31,18 +31,15 @@
 class SubmitResult
 {
 public:
-    inline SubmitResult() : seq(0), diff(0), start(0) {}
-    inline SubmitResult(int64_t seq, uint32_t diff) :
-        seq(seq),
-        diff(diff)
-    {
-        start = uv_hrtime();
-    }
+    inline SubmitResult() : seq(0), diff(0), actualDiff(0), elapsed(0), start(0) {}
+    SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff);
 
-    inline uint64_t elapsed() const { return (uv_hrtime() - start) / 1000000; }
+    void done();
 
     int64_t seq;
     uint32_t diff;
+    uint64_t actualDiff;
+    uint64_t elapsed;
     uint64_t start;
 };
 

src/net/strategies/DonateStrategy.cpp

@@ -111,9 +111,9 @@ void DonateStrategy::onLoginSuccess(Client *client)
 }
 
 
-void DonateStrategy::onResultAccepted(Client *client, int64_t seq, uint32_t diff, uint64_t ms, const char *error)
+void DonateStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
 {
-    m_listener->onResultAccepted(client, seq, diff, ms, error);
+    m_listener->onResultAccepted(client, result, error);
 }
 
 

src/net/strategies/DonateStrategy.h

@@ -55,7 +55,7 @@ protected:
     void onClose(Client *client, int failures) override;
     void onJobReceived(Client *client, const Job &job) override;
     void onLoginSuccess(Client *client) override;
-    void onResultAccepted(Client *client, int64_t seq, uint32_t diff, uint64_t ms, const char *error) override;
+    void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;
 
 private:
     void idle();

src/net/strategies/FailoverStrategy.cpp

@@ -132,9 +132,9 @@ void FailoverStrategy::onLoginSuccess(Client *client)
 }
 
 
-void FailoverStrategy::onResultAccepted(Client *client, int64_t seq, uint32_t diff, uint64_t ms, const char *error)
+void FailoverStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
 {
-    m_listener->onResultAccepted(client, seq, diff, ms, error);
+    m_listener->onResultAccepted(client, result, error);
 }
 
 

src/net/strategies/FailoverStrategy.h

@@ -55,7 +55,7 @@ protected:
     void onClose(Client *client, int failures) override;
     void onJobReceived(Client *client, const Job &job) override;
     void onLoginSuccess(Client *client) override;
-    void onResultAccepted(Client *client, int64_t seq, uint32_t diff, uint64_t ms, const char *error) override;
+    void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;
 
 private:
     void add(const Url *url, const char *agent);

src/net/strategies/SinglePoolStrategy.cpp

@@ -96,7 +96,7 @@ void SinglePoolStrategy::onLoginSuccess(Client *client)
 }
 
 
-void SinglePoolStrategy::onResultAccepted(Client *client,  int64_t seq, uint32_t diff, uint64_t ms, const char *error)
+void SinglePoolStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
 {
-    m_listener->onResultAccepted(client, seq, diff, ms, error);
+    m_listener->onResultAccepted(client, result, error);
 }

src/net/strategies/SinglePoolStrategy.h

@@ -52,7 +52,7 @@ protected:
     void onClose(Client *client, int failures) override;
     void onJobReceived(Client *client, const Job &job) override;
     void onLoginSuccess(Client *client) override;
-    void onResultAccepted(Client *client,  int64_t seq, uint32_t diff, uint64_t ms, const char *error) override;
+    void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;
 
 private:
     bool m_active;