Add Cpu class.

src/App.cpp

@@ -27,26 +27,19 @@
 
 #include "App.h"
 #include "Console.h"
+#include "Cpu.h"
 #include "net/Client.h"
 #include "net/Network.h"
 #include "Options.h"
 #include "version.h"
 
 
-Client *client;
-uv_timer_t timer_req;
-
-
-void timer_cb(uv_timer_t* handle) {
-    LOG_DEBUG("TIMER");
-
-    client->disconnect();
-}
-
 
 App::App(int argc, char **argv)
 {
     Console::init();
+    Cpu::init();
+
     m_options = Options::parse(argc, argv);
     m_network = new Network(m_options);
 }
@@ -69,13 +62,6 @@ App::exec()
 
     m_network->connect();
 
-//    uv_timer_init(uv_default_loop(), &timer_req);
-//    uv_timer_start(&timer_req, timer_cb, 5000, 5000);
-
-
-//    client = new Client();
-//    client->connect("192.168.2.34", 3333);
-
     const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
     uv_loop_close(uv_default_loop());
 

src/Cpu.cpp

@@ -0,0 +1,24 @@
+/* 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/>.
+ */
+
+

src/Cpu.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 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 __CPU_H__
+#define __CPU_H__
+
+
+class Cpu
+{
+public:
+    enum Flags {
+        X86_64 = 1,
+        AES    = 2,
+        BMI2   = 4
+    };
+
+    static int optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage);
+    static void init();
+    static void setAffinity(int id, unsigned long mask);
+
+    static inline bool hasAES()       { return m_flags & AES; }
+    static inline const char *brand() { return m_brand; }
+    static inline int cores()         { return m_totalCores; }
+    static inline int l2()            { return m_l2_cache; }
+    static inline int l3()            { return m_l3_cache; }
+    static inline int sockets()       { return m_sockets; }
+    static inline int threads()       { return m_totalThreads; }
+
+private:
+    static void initCommon();
+
+    static char m_brand[64];
+    static int m_flags;
+    static int m_l2_cache;
+    static int m_l3_cache;
+    static int m_sockets;
+    static int m_totalCores;
+    static int m_totalThreads;
+};
+
+
+#endif /* __CPU_H__ */

src/Cpu_stub.cpp

@@ -0,0 +1,119 @@
+/* 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 <cpuid.h>
+#include <string.h>
+
+
+#include "Cpu.h"
+
+
+#define VENDOR_ID                  (0)
+#define PROCESSOR_INFO             (1)
+#define CACHE_TLB_DESCRIPTOR       (2)
+#define EXTENDED_FEATURES          (7)
+#define PROCESSOR_BRAND_STRING_1   (0x80000002)
+#define PROCESSOR_BRAND_STRING_2   (0x80000003)
+#define PROCESSOR_BRAND_STRING_3   (0x80000004)
+
+#define EAX_Reg  (0)
+#define EBX_Reg  (1)
+#define ECX_Reg  (2)
+#define EDX_Reg  (3)
+
+
+static inline void cpuid(int level, int output[4]) {
+    int a, b, c, d;
+    __cpuid_count(level, 0, a, b, c, d);
+
+    output[0] = a;
+    output[1] = b;
+    output[2] = c;
+    output[3] = d;
+}
+
+
+static inline void cpu_brand_string(char* s) {
+    int cpu_info[4] = { 0 };
+    cpuid(VENDOR_ID, cpu_info);
+
+    if (cpu_info[EAX_Reg] >= 4) {
+        for (int i = 0; i < 4; i++) {
+            cpuid(0x80000002 + i, cpu_info);
+            memcpy(s, cpu_info, sizeof(cpu_info));
+            s += 16;
+        }
+    }
+}
+
+
+static inline bool has_aes_ni()
+{
+    int cpu_info[4] = { 0 };
+    cpuid(PROCESSOR_INFO, cpu_info);
+
+    return cpu_info[ECX_Reg] & bit_AES;
+}
+
+
+static inline bool has_bmi2() {
+    int cpu_info[4] = { 0 };
+    cpuid(EXTENDED_FEATURES, cpu_info);
+
+    return cpu_info[EBX_Reg] & bit_BMI2;
+}
+
+
+char Cpu::m_brand[64]   = { 0 };
+int Cpu::m_flags        = 0;
+int Cpu::m_l2_cache     = 0;
+int Cpu::m_l3_cache     = 0;
+int Cpu::m_sockets      = 1;
+int Cpu::m_totalCores   = 0;
+int Cpu::m_totalThreads = 0;
+
+
+int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
+{
+    int count = m_totalThreads / 2;
+    return count < 1 ? 1 : count;
+}
+
+
+void Cpu::initCommon()
+{
+    cpu_brand_string(m_brand);
+
+#   ifdef __x86_64__
+    m_flags |= X86_64;
+#   endif
+
+    if (has_aes_ni()) {
+        m_flags |= AES;
+    }
+
+    if (has_bmi2()) {
+        m_flags |= BMI2;
+    }
+}

src/Cpu_unix.cpp

@@ -0,0 +1,24 @@
+/* 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/>.
+ */
+
+

src/Cpu_win.cpp

@@ -0,0 +1,52 @@
+/* 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 <windows.h>
+
+
+#include "Cpu.h"
+
+
+void Cpu::init()
+{
+#   ifdef XMRIG_NO_LIBCPUID
+    SYSTEM_INFO sysinfo;
+    GetSystemInfo(&sysinfo);
+
+    m_totalThreads = sysinfo.dwNumberOfProcessors;
+#   endif
+
+    initCommon();
+}
+
+
+void Cpu::setAffinity(int id, unsigned long mask)
+{
+    if (id == -1) {
+        SetProcessAffinityMask(GetCurrentProcess(), mask);
+    }
+    else {
+        SetThreadAffinityMask(GetCurrentThread(), mask);
+    }
+}