X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Ftopology_linux.cpp;h=8ff1cfaa6940a926986b4a755e7d00f81e437a83;hb=c73d5d683cad794df89c7743afd6793c39a5a6f3;hp=6da24a3388e8b520b21e18b3f1cbc9178dbeda3e;hpb=2402fb1beb25ec532cea91c8dfbb9425eb5bdf48;p=libcds.git diff --git a/src/topology_linux.cpp b/src/topology_linux.cpp index 6da24a33..8ff1cfaa 100644 --- a/src/topology_linux.cpp +++ b/src/topology_linux.cpp @@ -1,7 +1,7 @@ /* This file is a part of libcds - Concurrent Data Structures library - (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017 Source code repo: http://github.com/khizmax/libcds/ Download: http://sourceforge.net/projects/libcds/files/ @@ -32,8 +32,11 @@ #if CDS_OS_TYPE == CDS_OS_LINUX +#include +/* #include #include +*/ 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() { + s_nProcessorCount = std::thread::hardware_concurrency(); +/* long n = ::sysconf( _SC_NPROCESSORS_ONLN ); if ( n > 0 ) - s_nProcessorCount = n; + s_nProcessorCount = static_cast( n ); else { try { std::ifstream cpuinfo("/proc/cpuinfo"); @@ -64,6 +69,7 @@ namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Linux { s_nProcessorCount = 1; } } +*/ } void topology::fini()