Use std:thread:hardware_concurrency, instead of Boost, to determine

random-zebra · random-zebra · commit 51aedbc40fdb · 2020-05-28T02:13:10.000+02:00
available cores - backports bitcoin/bitcoin@937bf43
diff --git a/src/util.cpp b/src/util.cpp
@@ -19,6 +19,7 @@
 #include "utiltime.h"
 
 #include <stdarg.h>
+#include <thread>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
@@ -657,9 +658,5 @@ void SetThreadPriority(int nPriority)
 
 int GetNumCores()
 {
-#if BOOST_VERSION >= 105600
-    return boost::thread::physical_concurrency();
-#else // Must fall back to hardware_concurrency, which unfortunately counts virtual cores
-    return boost::thread::hardware_concurrency();
-#endif
+    return std::thread::hardware_concurrency();
 }
diff --git a/src/util.h b/src/util.h
@@ -162,9 +162,8 @@ std::string HelpMessageGroup(const std::string& message);
 std::string HelpMessageOpt(const std::string& option, const std::string& message);
 
 /**
- * Return the number of physical cores available on the current system.
- * @note This does not count virtual cores, such as those provided by HyperThreading
- * when boost is newer than 1.56.
+ * Return the number of cores available on the current system.
+ * @note This does count virtual cores, such as those provided by HyperThreading.
  */
 int GetNumCores();
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "utiltime.h"`
`20`	`20`
`21`	`21`	`#include <stdarg.h>`
	`22`	`+#include <thread>`
`22`	`23`
`23`	`24`	`#include <boost/date_time/posix_time/posix_time.hpp>`
`24`	`25`
`@@ -657,9 +658,5 @@ void SetThreadPriority(int nPriority)`
`657`	`658`
`658`	`659`	`int GetNumCores()`
`659`	`660`	`{`
`660`		`-#if BOOST_VERSION >= 105600`
`661`		`- return boost::thread::physical_concurrency();`
`662`		`-#else // Must fall back to hardware_concurrency, which unfortunately counts virtual cores`
`663`		`- return boost::thread::hardware_concurrency();`
`664`		`-#endif`
	`661`	`+ return std::thread::hardware_concurrency();`
`665`	`662`	`}`