projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uses different pass count for different parallel queue test cases
[libcds.git]
/
src
/
topology_linux.cpp
diff --git
a/src/topology_linux.cpp
b/src/topology_linux.cpp
index a37e51e9776cf1b021ef177667a5ac84dcdca082..8ff1cfaa6940a926986b4a755e7d00f81e437a83 100644
(file)
--- a/
src/topology_linux.cpp
+++ b/
src/topology_linux.cpp
@@
-32,8
+32,11
@@
#if CDS_OS_TYPE == CDS_OS_LINUX
#if CDS_OS_TYPE == CDS_OS_LINUX
+#include <thread>
+/*
#include <unistd.h>
#include <fstream>
#include <unistd.h>
#include <fstream>
+*/
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Linux {
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Linux {
@@
-41,9
+44,11
@@
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Linux {
void topology::init()
{
void topology::init()
{
+ s_nProcessorCount = std::thread::hardware_concurrency();
+/*
long n = ::sysconf( _SC_NPROCESSORS_ONLN );
if ( n > 0 )
long n = ::sysconf( _SC_NPROCESSORS_ONLN );
if ( n > 0 )
- s_nProcessorCount =
n
;
+ s_nProcessorCount =
static_cast<unsigned>( n )
;
else {
try {
std::ifstream cpuinfo("/proc/cpuinfo");
else {
try {
std::ifstream cpuinfo("/proc/cpuinfo");
@@
-64,6
+69,7
@@
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Linux {
s_nProcessorCount = 1;
}
}
s_nProcessorCount = 1;
}
}
+*/
}
void topology::fini()
}
void topology::fini()