Merge branch 'evo' into feature-per-pool-algo

2019-07-06 10:49:31 +07:00
parent 7fa6ac5d38 e8a9b0013d
commit 2a3b27be06
79 changed files with 9889 additions and 40 deletions
--- a/src/workers/Workers.h
+++ b/src/workers/Workers.h
@@ -77,7 +77,7 @@ public:
 #   endif

 #   ifdef XMRIG_ALGO_RANDOMX
-    static void updateDataset(const uint8_t* seed_hash, uint32_t num_threads);
+    static void updateDataset(const uint8_t* seed_hash, uint32_t num_threads, const xmrig::Algorithm &algorithm);
    static randomx_dataset* getDataset();
 #   endif

@@ -128,6 +128,7 @@ private:
    static randomx_cache *m_rx_cache;
    static randomx_dataset *m_rx_dataset;
    static uint8_t m_rx_seed_hash[32];
+    static xmrig::Algorithm m_rx_algo;
    static std::atomic<uint32_t> m_rx_dataset_init_thread_counter;
 #   endif
 };