Use FarmFace singleton

Author: jean-m-cyr

libethash-cl/CLMiner.cpp

@@ -261,7 +261,7 @@ unsigned CLMiner::s_numInstances = 0;
 vector<int> CLMiner::s_devices(MAX_MINERS, -1);
 bool CLMiner::s_noBinary = false;
 
-CLMiner::CLMiner(unsigned _index) : Miner("cl-", Farm::f(), _index) {}
+CLMiner::CLMiner(unsigned _index) : Miner("cl-", _index) {}
 
 CLMiner::~CLMiner()
 {

libethash-cuda/CUDAMiner.cpp

@@ -35,8 +35,7 @@ struct CUDAChannel : public LogChannel
 };
 #define cudalog clog(CUDAChannel)
 
-CUDAMiner::CUDAMiner(unsigned _index) : Miner("cuda-", Farm::f(), _index), m_light(getNumDevices())
-{}
+CUDAMiner::CUDAMiner(unsigned _index) : Miner("cuda-", _index), m_light(getNumDevices()) {}
 
 CUDAMiner::~CUDAMiner()
 {

libethcore/Miner.cpp

@@ -29,6 +29,8 @@ unsigned Miner::s_dagCreateDevice = 0;
 
 uint8_t* Miner::s_dagInHostMemory = nullptr;
 
+FarmFace* FarmFace::m_this = nullptr;
+
 bool Miner::s_exit = false;
 
 bool Miner::s_noeval = false;

libethcore/Miner.h

@@ -288,6 +288,9 @@ class Miner;
 class FarmFace
 {
 public:
+    FarmFace() { m_this = this; }
+    static FarmFace& f() { return *m_this; };
+
     virtual ~FarmFace() = default;
     virtual unsigned get_tstart() = 0;
     virtual unsigned get_tstop() = 0;
@@ -300,6 +303,9 @@ class FarmFace
     virtual void failedSolution(unsigned _miner_index) = 0;
     virtual uint64_t get_nonce_scrambler() = 0;
     virtual unsigned get_segment_width() = 0;
+
+private:
+    static FarmFace* m_this;
 };
 
 /**
@@ -312,8 +318,8 @@ class FarmFace
 class Miner : public Worker
 {
 public:
-    Miner(std::string const& _name, FarmFace& _farm, size_t _index)
-      : Worker(_name + std::to_string(_index)), m_index(_index), m_farmFace(_farm)
+    Miner(std::string const& _name, size_t _index)
+      : Worker(_name + std::to_string(_index)), m_index(_index)
     {
     }
 
@@ -337,8 +343,8 @@ class Miner : public Worker
                 // return farm.get_nonce_scrambler() + ((uint64_t) m_index << 40);
 
                 // Now segment size is adjustable
-                m_work.startNonce = m_farmFace.get_nonce_scrambler() +
-                                    ((uint64_t)m_index << m_farmFace.get_segment_width());
+                m_work.startNonce = FarmFace::f().get_nonce_scrambler() +
+                                    ((uint64_t)m_index << FarmFace::f().get_segment_width());
             }
 
             if (g_logOptions & LOG_SWITCH_TIME)
@@ -355,14 +361,15 @@ class Miner : public Worker
     {
         /*
          cnote << "Setting temp" << temperature << " for gpu" << m_index <<
-                  " tstop=" << m_farmFace.get_tstop() << " tstart=" << m_farmFace.get_tstart();
+                  " tstop=" << FarmFace::f().get_tstop() << " tstart=" <<
+         FarmFace::f().get_tstart();
         */
         bool _wait_for_tstart_temp = (m_mining_paused.get_mining_paused() &
                                          MinigPauseReason::MINING_PAUSED_WAIT_FOR_T_START) ==
                                      MinigPauseReason::MINING_PAUSED_WAIT_FOR_T_START;
         if (!_wait_for_tstart_temp)
         {
-            unsigned tstop = m_farmFace.get_tstop();
+            unsigned tstop = FarmFace::f().get_tstop();
             if (tstop && temperature >= tstop)
             {
                 cwarn << "Pause mining on gpu" << m_index << " : temperature " << temperature
@@ -372,7 +379,7 @@ class Miner : public Worker
         }
         else
         {
-            unsigned tstart = m_farmFace.get_tstart();
+            unsigned tstart = FarmFace::f().get_tstart();
             if (tstart && temperature <= tstart)
             {
                 cnote << "(Re)starting mining on gpu" << m_index << " : temperature " << temperature
@@ -445,7 +452,6 @@ class Miner : public Worker
     static bool s_noeval;
 
     const size_t m_index = 0;
-    FarmFace& m_farmFace;
     std::chrono::steady_clock::time_point m_workSwitchStart;
     HwMonitorInfo m_hwmoninfo;