Move selfTest to threads, remove legacy CryptoNight.cpp.

src/workers/DoubleWorker.cpp

@@ -26,6 +26,7 @@
 #include <thread>
 
 
+#include "crypto/CryptoNight_test.h"
 #include "workers/CpuThread.h"
 #include "workers/DoubleWorker.h"
 #include "workers/Workers.h"
@@ -61,8 +62,12 @@ DoubleWorker::~DoubleWorker()
 }
 
 
-void DoubleWorker::start()
+bool DoubleWorker::start()
 {
+    if (!selfTest()) {
+        return false;
+    }
+
     while (Workers::sequence() > 0) {
         if (Workers::isPaused()) {
             do {
@@ -101,6 +106,8 @@ void DoubleWorker::start()
 
         consumeJob();
     }
+
+    return true;
 }
 
 
@@ -115,6 +122,32 @@ bool DoubleWorker::resume(const Job &job)
 }
 
 
+bool DoubleWorker::selfTest()
+{
+    if (m_thread->fn(xmrig::VARIANT_NONE) == nullptr) {
+        return false;
+    }
+
+    m_thread->fn(xmrig::VARIANT_NONE)(test_input, 76, m_hash, m_ctx);
+
+    if (m_thread->algorithm() == xmrig::CRYPTONIGHT && memcmp(m_hash, test_output_v0, 64) == 0) {
+        m_thread->fn(xmrig::VARIANT_V1)(test_input, 76, m_hash, m_ctx);
+
+        return memcmp(m_hash, test_output_v1, 64) == 0;
+    }
+
+#   ifndef XMRIG_NO_AEON
+    if (m_thread->algorithm() == xmrig::CRYPTONIGHT_LITE && memcmp(m_hash, test_output_v0_lite, 64) == 0) {
+        m_thread->fn(xmrig::VARIANT_V1)(test_input, 76, m_hash, m_ctx);
+
+        return memcmp(m_hash, test_output_v1_lite, 64) == 0;
+    }
+#   endif
+
+    return false;
+}
+
+
 void DoubleWorker::consumeJob()
 {
     Job job = Workers::job();

src/workers/DoubleWorker.h

@@ -40,10 +40,11 @@ public:
     DoubleWorker(Handle *handle);
     ~DoubleWorker();
 
-    void start() override;
+    bool start() override;
 
 private:
     bool resume(const Job &job);
+    bool selfTest();
     void consumeJob();
     void save(const Job &job);
 

src/workers/SingleWorker.cpp

@@ -26,6 +26,7 @@
 #include <thread>
 
 
+#include "crypto/CryptoNight_test.h"
 #include "workers/CpuThread.h"
 #include "workers/SingleWorker.h"
 #include "workers/Workers.h"
@@ -37,8 +38,12 @@ SingleWorker::SingleWorker(Handle *handle)
 }
 
 
-void SingleWorker::start()
+bool SingleWorker::start()
 {
+    if (!selfTest()) {
+        return false;
+    }
+
     while (Workers::sequence() > 0) {
         if (Workers::isPaused()) {
             do {
@@ -71,6 +76,8 @@ void SingleWorker::start()
 
         consumeJob();
     }
+
+    return true;
 }
 
 
@@ -87,6 +94,32 @@ bool SingleWorker::resume(const Job &job)
 }
 
 
+bool SingleWorker::selfTest()
+{
+    if (m_thread->fn(xmrig::VARIANT_NONE) == nullptr) {
+        return false;
+    }
+
+    m_thread->fn(xmrig::VARIANT_NONE)(test_input, 76, m_result.result, m_ctx);
+
+    if (m_thread->algorithm() == xmrig::CRYPTONIGHT && memcmp(m_result.result, test_output_v0, 32) == 0) {
+        m_thread->fn(xmrig::VARIANT_V1)(test_input, 76, m_result.result, m_ctx);
+
+        return memcmp(m_result.result, test_output_v1, 32) == 0;
+    }
+
+#   ifndef XMRIG_NO_AEON
+    if (m_thread->algorithm() == xmrig::CRYPTONIGHT_LITE && memcmp(m_result.result, test_output_v0_lite, 32) == 0) {
+        m_thread->fn(xmrig::VARIANT_V1)(test_input, 76, m_result.result, m_ctx);
+
+        return memcmp(m_result.result, test_output_v1_lite, 32) == 0;
+    }
+#   endif
+
+    return false;
+}
+
+
 void SingleWorker::consumeJob()
 {
     Job job = Workers::job();

src/workers/SingleWorker.h

@@ -39,10 +39,11 @@ class SingleWorker : public Worker
 public:
     SingleWorker(Handle *handle);
 
-    void start() override;
+    bool start() override;
 
 private:
     bool resume(const Job &job);
+    bool selfTest();
     void consumeJob();
     void save(const Job &job);
 

src/workers/Worker.h

@@ -47,6 +47,7 @@ public:
     Worker(Handle *handle);
     ~Worker();
 
+    inline size_t id() const override          { return m_id; }
     inline uint64_t hashCount() const override { return m_hashCount.load(std::memory_order_relaxed); }
     inline uint64_t timestamp() const override { return m_timestamp.load(std::memory_order_relaxed); }
 

src/workers/Workers.cpp

@@ -22,6 +22,7 @@
  */
 
 #include <cmath>
+#include <thread>
 
 
 #include "api/Api.h"
@@ -171,7 +172,13 @@ void Workers::onReady(void *arg)
         handle->setWorker(new SingleWorker(handle));
     }
 
-    handle->worker()->start();
+    const bool rc = handle->worker()->start();
+
+    if (!rc) {
+        uv_mutex_lock(&m_mutex);
+        LOG_ERR("thread %zu error: \"hash self-test failed\".", handle->worker()->id());
+        uv_mutex_unlock(&m_mutex);
+    }
 }