Fix CPU metrics and fmt integration

Author: chronoxor

include/string/format.inl

@@ -17,7 +17,7 @@ inline std::string format(fmt::format_string<T...> pattern, T&&... args)
 template <typename... T>
 inline std::wstring format(fmt::wformat_string<T...> pattern, T&&... args)
 {
-    return fmt::vformat<wchar_t>(pattern, fmt::make_format_args<fmt::wformat_context>(args...));
+    return fmt::vformat(pattern, fmt::make_format_args<fmt::wformat_context>(args...));
 }
 
 template <typename... T>
@@ -29,7 +29,7 @@ inline void print(fmt::format_string<T...> pattern, T&&... args)
 template <typename... T>
 inline void print(fmt::wformat_string<T...> pattern, T&&... args)
 {
-    return fmt::vprint<wchar_t>(pattern, fmt::make_format_args<fmt::wformat_context>(args...));
+    return fmt::vprint(pattern, fmt::make_format_args<fmt::wformat_context>(args...));
 }
 
 template <typename TOutputStream, typename... T>
@@ -41,7 +41,7 @@ inline void print(TOutputStream& stream, fmt::format_string<T...> pattern, T&&..
 template <typename TOutputStream, typename... T>
 inline void print(TOutputStream& stream, fmt::wformat_string<T...> pattern, T&&... args)
 {
-    return fmt::vprint<wchar_t>(stream, pattern, fmt::make_format_args<fmt::wformat_context>(args...));
+    return fmt::vprint(stream, pattern, fmt::make_format_args<fmt::wformat_context>(args...));
 }
 
 } // namespace CppCommon

source/system/cpu.cpp

@@ -12,9 +12,11 @@
 #if defined(__APPLE__)
 #include <sys/sysctl.h>
 #elif defined(unix) || defined(__unix) || defined(__unix__)
+#include <sched.h>
 #include <unistd.h>
 #include <fstream>
 #include <regex>
+#include <set>
 #elif defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
 #endif
@@ -100,8 +102,12 @@ int CPU::Affinity()
 
     return logical;
 #elif defined(unix) || defined(__unix) || defined(__unix__)
-    long processors = sysconf(_SC_NPROCESSORS_ONLN);
-    return processors;
+    cpu_set_t cs;
+    CPU_ZERO(&cs);
+    if (sched_getaffinity(0, sizeof(cs), &cs) != 0)
+        return -1;
+
+    return CPU_COUNT(&cs);
 #elif defined(_WIN32) || defined(_WIN64)
     SYSTEM_INFO si;
     GetSystemInfo(&si);
@@ -136,8 +142,22 @@ std::pair<int, int> CPU::TotalCores()
 
     return std::make_pair(logical, physical);
 #elif defined(unix) || defined(__unix) || defined(__unix__)
-    long processors = sysconf(_SC_NPROCESSORS_ONLN);
-    return std::make_pair(processors, processors);
+    static std::regex pattern("core id(.*): (.*)");
+
+    std::set<int> cores;
+
+    std::string line;
+    std::ifstream stream("/proc/cpuinfo");
+    while (getline(stream, line))
+    {
+        std::smatch matches;
+        if (std::regex_match(line, matches, pattern))
+            cores.insert(atoi(matches[2].str().c_str()));
+    }
+
+    size_t logical = cores.size();
+    long physical = sysconf(_SC_NPROCESSORS_ONLN);
+    return std::make_pair(logical, physical);
 #elif defined(_WIN32) || defined(_WIN64)
     BOOL allocated = FALSE;
     PSYSTEM_LOGICAL_PROCESSOR_INFORMATION pBuffer = nullptr;
@@ -202,6 +222,12 @@ int64_t CPU::ClockSpeed()
     if (sysctlbyname("hw.cpufrequency", &frequency, &size, nullptr, 0) == 0)
         return frequency;
 
+    // On Apple Silicon fallback to hw.tbfrequency and kern.clockrate.hz
+    struct clockinfo clockrate;
+    size_t clockrate_size = sizeof(clockrate);
+    if ((sysctlbyname("hw.tbfrequency", &frequency, &frequency_size, NULL, 0) == 0) && (sysctlbyname("kern.clockrate", &clockrate, &clockrate_size, NULL, 0) == 0)) 
+        return frequency * clockrate.hz;
+
     return -1;
 #elif defined(unix) || defined(__unix) || defined(__unix__)
     static std::regex pattern("cpu MHz(.*): (.*)");