Fixes stub build break and maybe also arm (#31)

CMakeLists.txt

@@ -53,6 +53,7 @@ set(SOURCES_COMMON
     src/log/FileLog.cpp
     src/log/Log.cpp
     src/Platform.cpp
+    src/Cpu.cpp
    )
 
 if (WIN32)
@@ -110,7 +111,7 @@ if (WITH_LIBCPUID)
 
     include_directories(src/3rdparty/libcpuid)
     set(CPUID_LIB cpuid)
-    set(SOURCES_CPUID src/Cpu.cpp)
+    set(SOURCES_CPUID src/Cpu_cpuid.cpp)
 else()
     add_definitions(/DXMRIG_NO_LIBCPUID)
 
@@ -190,7 +191,7 @@ endif (WITH_CC_SERVER OR WITH_CC_CLIENT)
 
 add_executable(xmrigMiner ${SOURCES} ${SOURCES_CRYPTO} ${HTTPD_SOURCES} ${SOURCES_CC_CLIENT} res/app.rc)
 
-target_link_libraries(xmrigMiner xmrig_common xmrig_cpuid xmrig_os_dependencies
+target_link_libraries(xmrigMiner xmrig_common xmrig_os_dependencies xmrig_cpuid
         ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
 
 if (WITH_CC_CLIENT)
@@ -202,7 +203,7 @@ add_executable(xmrigDaemon src/cc/XMRigd.cpp res/app.rc)
 if (WITH_CC_SERVER AND MHD_FOUND)
     add_executable(xmrigCCServer ${SOURCES_CC_SERVER} res/app.rc)
     target_link_libraries(xmrigCCServer
-            xmrig_common xmrig_cpuid xmrig_os_dependencies xmrig_cc_common
+            xmrig_common xmrig_os_dependencies xmrig_cpuid xmrig_cc_common
             ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
     set_target_properties(xmrigCCServer PROPERTIES COMPILE_FLAGS "-DXMRIG_CC_SERVER ${SHARED_FLAGS}")
 endif()

src/Cpu.cpp

@@ -28,7 +28,6 @@
 #include <algorithm>
 #include <memory>
 
-#include <libcpuid.h>
 #include <iostream>
 
 #include "Cpu.h"
@@ -132,48 +131,6 @@ size_t CpuImpl::availableCache()
     return cache;
 }
 
-void CpuImpl::initCommon()
-{
-    struct cpu_raw_data_t raw = { 0 };
-    struct cpu_id_t data = { 0 };
-
-    cpuid_get_raw_data(&raw);
-    cpu_identify(&raw, &data);
-
-    strncpy(m_brand, data.brand_str, sizeof(m_brand) - 1);
-
-    m_totalThreads = data.total_logical_cpus;
-    m_sockets      = m_totalThreads / data.num_logical_cpus;
-
-    if (m_sockets == 0) {
-        m_sockets = 1;
-    }
-
-    m_totalCores = data.num_cores * m_sockets;
-    m_l3_cache = data.l3_cache > 0 ? data.l3_cache * m_sockets : 0;
-
-    // Workaround for AMD CPUs https://github.com/anrieff/libcpuid/issues/97
-    if (data.vendor == VENDOR_AMD && data.ext_family >= 0x15 && data.ext_family < 0x17) {
-        m_l2_cache = data.l2_cache * (m_totalCores / 2) * m_sockets;
-        m_l2_exclusive = true;
-    }
-    else {
-        m_l2_cache = data.l2_cache > 0 ? data.l2_cache * m_totalCores * m_sockets : 0;
-    }
-
-#   if defined(__x86_64__) || defined(_M_AMD64)
-    m_flags |= Cpu::X86_64;
-#   endif
-
-    if (data.flags[CPU_FEATURE_AES]) {
-        m_flags |= Cpu::AES;
-    }
-
-    if (data.flags[CPU_FEATURE_BMI2]) {
-        m_flags |= Cpu::BMI2;
-    }
-}
-
 void Cpu::init()
 {
     CpuImpl::instance().init();

src/Cpu_arm.cpp

@@ -27,17 +27,6 @@
 
 #include "Cpu.h"
 
-void CpuImpl::init()
-{
-    m_brand = {0};
-    m_flags = 0;
-    m_l2_cache = 0;
-    m_l3_cache = 0;
-    m_sockets = 1;
-    m_totalCores = 0;
-    m_totalThreads = 0;
-}
-
 void CpuImpl::initCommon()
 {
     memcpy(m_brand, "Unknown", 7);

src/Cpu_cpuid.cpp

@@ -0,0 +1,77 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <[email protected]>
+ * Copyright 2012-2014 pooler      <[email protected]>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <[email protected]>
+ * Copyright 2016-2017 XMRig       <[email protected]>
+ * Copyright 2018      Sebastian Stolzenberg <https://github.com/sebastianstolzenberg>
+ *
+ *
+ *   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 <cmath>
+#include <cstring>
+#include <algorithm>
+#include <memory>
+
+#include <libcpuid.h>
+#include <iostream>
+
+#include "Cpu.h"
+#include "CpuImpl.h"
+
+void CpuImpl::initCommon()
+{
+    struct cpu_raw_data_t raw = { 0 };
+    struct cpu_id_t data = { 0 };
+
+    cpuid_get_raw_data(&raw);
+    cpu_identify(&raw, &data);
+
+    strncpy(m_brand, data.brand_str, sizeof(m_brand) - 1);
+
+    m_totalThreads = data.total_logical_cpus;
+    m_sockets      = m_totalThreads / data.num_logical_cpus;
+
+    if (m_sockets == 0) {
+        m_sockets = 1;
+    }
+
+    m_totalCores = data.num_cores * m_sockets;
+    m_l3_cache = data.l3_cache > 0 ? data.l3_cache * m_sockets : 0;
+
+    // Workaround for AMD CPUs https://github.com/anrieff/libcpuid/issues/97
+    if (data.vendor == VENDOR_AMD && data.ext_family >= 0x15 && data.ext_family < 0x17) {
+        m_l2_cache = data.l2_cache * (m_totalCores / 2) * m_sockets;
+        m_l2_exclusive = true;
+    }
+    else {
+        m_l2_cache = data.l2_cache > 0 ? data.l2_cache * m_totalCores * m_sockets : 0;
+    }
+
+#   if defined(__x86_64__) || defined(_M_AMD64)
+    m_flags |= Cpu::X86_64;
+#   endif
+
+    if (data.flags[CPU_FEATURE_AES]) {
+        m_flags |= Cpu::AES;
+    }
+
+    if (data.flags[CPU_FEATURE_BMI2]) {
+        m_flags |= Cpu::BMI2;
+    }
+}

src/Cpu_stub.cpp

@@ -35,6 +35,7 @@
 
 
 #include "Cpu.h"
+#include "CpuImpl.h"
 
 
 #define VENDOR_ID                  (0)
@@ -99,28 +100,19 @@ static inline bool has_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;
-
-
-void Cpu::initCommon()
+void CpuImpl::initCommon()
 {
     cpu_brand_string(m_brand);
 
 #   if defined(__x86_64__) || defined(_M_AMD64)
-    m_flags |= X86_64;
+    m_flags |= Cpu::X86_64;
 #   endif
 
     if (has_aes_ni()) {
-        m_flags |= AES;
+        m_flags |= Cpu::AES;
     }
 
     if (has_bmi2()) {
-        m_flags |= BMI2;
+        m_flags |= Cpu::BMI2;
     }
 }