Add Workers class.

CMakeLists.txt

@@ -20,6 +20,7 @@ set(HEADERS
     src/workers/Handle.h
     src/workers/SingleWorker.h
     src/workers/Worker.h
+    src/workers/Workers.h
     src/version.h
    )
 
@@ -50,6 +51,7 @@ set(SOURCES
     src/workers/Handle.cpp
     src/workers/SingleWorker.cpp
     src/workers/Worker.cpp
+    src/workers/Workers.cpp
     src/xmrig.cpp
    )
 
@@ -95,7 +97,7 @@ endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall -fno-exceptions")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
 #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -gdwarf-2")
 #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fprofile-generate")

src/App.cpp

@@ -35,8 +35,7 @@
 #include "Options.h"
 #include "Summary.h"
 #include "version.h"
-#include "workers/Handle.h"
+#include "workers/Workers.h"
-#include "workers/SingleWorker.h"
 
 
 
@@ -75,7 +74,7 @@ App::exec()
     Mem::allocate(m_options->algo(), m_options->threads(), m_options->doubleHash());
     Summary::print();
 
-    startWorders();
+    Workers::start(m_options->threads());
 
     m_network->connect();
 
@@ -84,23 +83,3 @@ App::exec()
 
     return r;
 }
-
-
-void App::startWorders()
-{
-    for (int i = 0; i < m_options->threads(); ++i) {
-        Handle *handle = new Handle(i);
-        m_workers.push_back(handle);
-        handle->start(App::onWorkerStarted);
-    }
-}
-
-
-void *App::onWorkerStarted(void *arg)
-{
-    auto handle = static_cast<Handle*>(arg);
-    IWorker *worker = new SingleWorker(handle);
-    worker->start();
-
-    return nullptr;
-}

src/App.h

@@ -25,10 +25,6 @@
 #define __APP_H__
 
 
-#include <vector>
-
-
-class Handle;
 class Network;
 class Options;
 
@@ -42,13 +38,8 @@ public:
   int exec();
 
 private:
-  void startWorders();
-
-  static void* onWorkerStarted(void *arg);
-
   Network *m_network;
   Options *m_options;
-  std::vector<Handle*> m_workers;
 };
 
 

src/workers/Handle.cpp

@@ -35,5 +35,4 @@ Handle::Handle(int id) :
 void Handle::start(void *(*callback) (void *))
 {
     pthread_create(&m_thread, nullptr, callback, this);
-//    m_thread = std::thread([]() {});
 }

src/workers/SingleWorker.cpp

@@ -22,10 +22,13 @@
  */
 
 
+#include <thread>
 #include <pthread.h>
 
+
 #include "Console.h"
 #include "workers/SingleWorker.h"
+#include "workers/Workers.h"
 
 
 SingleWorker::SingleWorker(Handle *handle)
@@ -33,3 +36,9 @@ SingleWorker::SingleWorker(Handle *handle)
 {
     LOG_WARN("SingleWorker %d", pthread_self());
 }
+
+
+void SingleWorker::start()
+{
+//    Workers::submit();
+}

src/workers/SingleWorker.h

@@ -35,6 +35,8 @@ class SingleWorker : public Worker
 {
 public:
     SingleWorker(Handle *handle);
+
+    void start() override;
 };
 
 

src/workers/Worker.cpp

@@ -40,9 +40,3 @@ Worker::Worker(Handle *handle) :
 Worker::~Worker()
 {
 }
-
-
-void Worker::start()
-{
-
-}

src/workers/Worker.h

@@ -38,8 +38,6 @@ public:
     Worker(Handle *handle);
     ~Worker();
 
-    void start() override;
-
 protected:
     cryptonight_ctx *m_ctx;
     Handle *m_handle;

src/workers/Workers.cpp

@@ -0,0 +1,72 @@
+/* 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 <pthread.h>
+
+
+#include "Console.h"
+#include "workers/Handle.h"
+#include "workers/SingleWorker.h"
+#include "workers/Workers.h"
+
+
+std::vector<Handle*> Workers::m_workers;
+uv_async_t Workers::m_async;
+
+
+void Workers::start(int threads)
+{
+    LOG_NOTICE("start %d", pthread_self());
+
+    uv_async_init(uv_default_loop(), &m_async, Workers::onResult);
+
+    for (int i = 0; i < threads; ++i) {
+        Handle *handle = new Handle(i);
+        m_workers.push_back(handle);
+        handle->start(Workers::onReady);
+    }
+}
+
+
+void Workers::submit()
+{
+    uv_async_send(&m_async);
+}
+
+
+
+void *Workers::onReady(void *arg)
+{
+    auto handle = static_cast<Handle*>(arg);
+    IWorker *worker = new SingleWorker(handle);
+    worker->start();
+
+    return nullptr;
+}
+
+
+
+void Workers::onResult(uv_async_t *handle)
+{
+}

src/workers/Workers.h

@@ -0,0 +1,50 @@
+/* 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/>.
+ */
+
+#ifndef __WORKERS_H__
+#define __WORKERS_H__
+
+
+#include <vector>
+#include <uv.h>
+
+
+class Handle;
+
+
+class Workers
+{
+public:
+    static void start(int threads);
+    static void submit();
+
+private:
+    static void *onReady(void *arg);
+    static void onResult(uv_async_t *handle);
+
+    static std::vector<Handle*> m_workers;
+    static uv_async_t m_async;
+};
+
+
+#endif /* __WORKERS_H__ */