Added initial support for new style threads launch method.

src/backend/common/Thread.h

@@ -0,0 +1,62 @@
+/* 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 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/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 XMRIG_THREAD_H
+#define XMRIG_THREAD_H
+
+
+#include <uv.h>
+
+
+namespace xmrig {
+
+
+class IWorker;
+
+
+template<class T>
+class Thread
+{
+public:
+    inline Thread(size_t index, const T &config) : m_index(index), m_config(config) {}
+    inline ~Thread() { uv_thread_join(&m_thread); }
+
+    inline const T &config() const                  { return m_config; }
+    inline IWorker *worker() const                  { return m_worker; }
+    inline size_t index() const                     { return m_index; }
+    inline void setWorker(IWorker *worker)          { m_worker = worker; }
+    inline void start(void (*callback) (void *))    { uv_thread_create(&m_thread, callback, this); }
+
+private:
+    const size_t m_index    = 0;
+    const T m_config;
+    IWorker *m_worker       = nullptr;
+    uv_thread_t m_thread;
+};
+
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_THREAD_H */

src/backend/common/WorkerJob.h

@@ -26,7 +26,6 @@
 #define XMRIG_WORKERJOB_H
 
 
-#include <atomic>
 #include <string.h>
 
 

src/backend/common/Workers.cpp

@@ -0,0 +1,152 @@
+/* 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 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/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 "backend/common/Workers.h"
+#include "backend/cpu/CpuWorker.h"
+#include "base/io/log/Log.h"
+
+
+namespace xmrig {
+
+
+class WorkersPrivate
+{
+public:
+    inline WorkersPrivate()
+    {
+
+    }
+
+
+    inline ~WorkersPrivate()
+    {
+    }
+};
+
+
+} // namespace xmrig
+
+
+template<class T>
+xmrig::Workers<T>::Workers() :
+    d_ptr(new WorkersPrivate())
+{
+
+}
+
+
+template<class T>
+xmrig::Workers<T>::~Workers()
+{
+    delete d_ptr;
+}
+
+
+template<class T>
+void xmrig::Workers<T>::add(const T &data)
+{
+    m_workers.push_back(new Thread<T>(m_workers.size(), data));
+}
+
+
+template<class T>
+void xmrig::Workers<T>::start()
+{
+    for (Thread<T> *worker : m_workers) {
+        worker->start(Workers<T>::onReady);
+    }
+}
+
+
+template<class T>
+void xmrig::Workers<T>::stop()
+{
+    Nonce::stop(T::backend());
+
+    for (Thread<T> *worker : m_workers) {
+        delete worker;
+    }
+
+    m_workers.clear();
+    Nonce::touch(T::backend());
+}
+
+
+template<class T>
+void xmrig::Workers<T>::onReady(void *arg)
+{
+    printf("ON READY\n");
+}
+
+
+namespace xmrig {
+
+
+template<>
+void xmrig::Workers<CpuLaunchData>::onReady(void *arg)
+{
+    auto handle = static_cast<Thread<CpuLaunchData>* >(arg);
+
+    IWorker *worker = nullptr;
+
+    switch (handle->config().intensity) {
+    case 1:
+        worker = new CpuWorker<1>(handle->index(), handle->config());
+        break;
+
+    case 2:
+        worker = new CpuWorker<2>(handle->index(), handle->config());
+        break;
+
+    case 3:
+        worker = new CpuWorker<3>(handle->index(), handle->config());
+        break;
+
+    case 4:
+        worker = new CpuWorker<4>(handle->index(), handle->config());
+        break;
+
+    case 5:
+        worker = new CpuWorker<5>(handle->index(), handle->config());
+        break;
+    }
+
+    handle->setWorker(worker);
+
+    if (!worker->selfTest()) {
+        LOG_ERR("thread %zu error: \"hash self-test failed\".", handle->worker()->id());
+
+        return;
+    }
+
+    worker->start();
+}
+
+
+template class Workers<CpuLaunchData>;
+
+
+} // namespace xmrig

src/backend/common/Workers.h

@@ -0,0 +1,69 @@
+/* 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 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/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 XMRIG_WORKERS_H
+#define XMRIG_WORKERS_H
+
+
+#include "backend/common/Thread.h"
+#include "backend/cpu/CpuLaunchData.h"
+
+
+namespace xmrig {
+
+
+class WorkersPrivate;
+
+
+template<class T>
+class Workers
+{
+public:
+    Workers();
+    ~Workers();
+
+    void add(const T &data);
+    void start();
+    void stop();
+
+private:
+    static void onReady(void *arg);
+
+    std::vector<Thread<T> *> m_workers;
+    WorkersPrivate *d_ptr;
+};
+
+
+template<>
+void Workers<CpuLaunchData>::onReady(void *arg);
+
+
+extern template class Workers<CpuLaunchData>;
+
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_WORKERS_H */

src/backend/common/common.cmake

@@ -1,12 +1,16 @@
 set(HEADERS_BACKEND_COMMON
+    src/backend/common/interfaces/IBackend.h
     src/backend/common/interfaces/IThread.h
     src/backend/common/interfaces/IWorker.h
+    src/backend/common/Thread.h
     src/backend/common/Threads.h
     src/backend/common/Worker.h
+    src/backend/common/Workers.h
     src/backend/common/WorkerJob.h
    )
 
 set(SOURCES_BACKEND_COMMON
     src/backend/common/Threads.cpp
     src/backend/common/Worker.cpp
+    src/backend/common/Workers.cpp
    )

src/backend/common/interfaces/IBackend.h

@@ -0,0 +1,55 @@
+/* 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 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/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 XMRIG_IBACKEND_H
+#define XMRIG_IBACKEND_H
+
+
+#include <stdint.h>
+
+
+namespace xmrig {
+
+
+class Job;
+class String;
+
+
+class IBackend
+{
+public:
+    virtual ~IBackend() = default;
+
+    virtual const String &profileName() const   = 0;
+    virtual void printHashrate(bool details)    = 0;
+    virtual void setJob(const Job &job)         = 0;
+    virtual void stop()                         = 0;
+    virtual void tick(uint64_t ticks)           = 0;
+};
+
+
+} // namespace xmrig
+
+
+#endif // XMRIG_IBACKEND_H

src/backend/common/interfaces/IWorker.h

@@ -29,6 +29,9 @@
 #include <stdint.h>
 
 
+namespace xmrig {
+
+
 class IWorker
 {
 public:
@@ -42,4 +45,7 @@ public:
 };
 
 
+} // namespace xmrig
+
+
 #endif // XMRIG_IWORKER_H