-//$$CDS-header$$
+/*
+ This file is a part of libcds - Concurrent Data Structures library
+
+ (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+ Source code repo: http://github.com/khizmax/libcds/
+ Download: http://sourceforge.net/projects/libcds/files/
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
#include <cds/details/defs.h>
#endif
static cds::OS::ThreadId s_MainThreadId = 0;
-static HINSTANCE s_DllInstance = NULL;
+static HINSTANCE s_DllInstance = nullptr;
#if _WIN32_WINNT < 0x0601
// For Windows below Windows 7
#include <cds/os/topology.h>
-#include <cds/bitop.h>
+#include <cds/algo/bitop.h>
static unsigned int s_nProcessorCount = 1;
static unsigned int s_nProcessorGroupCount = 1;
// Array of processor - cell relationship
// Array size is s_nProcessorCount
// s_arrProcessorCellRelationship[i] is the cell (the processor group) number for i-th processor
-// static unsigned int * s_arrProcessorCellRelationship = NULL;
+// static unsigned int * s_arrProcessorCellRelationship = nullptr;
static void discover_topology()
{
LPFN_GLPI glpi;
bool bDone = false;
- PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buffer = NULL;
- PSYSTEM_LOGICAL_PROCESSOR_INFORMATION ptr = NULL;
+ PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buffer = nullptr;
+ PSYSTEM_LOGICAL_PROCESSOR_INFORMATION ptr = nullptr;
DWORD returnLength = 0;
DWORD logicalProcessorCount = 0;
DWORD numaNodeCount = 0;
s_nProcessorGroupCount = 1;
glpi = (LPFN_GLPI) GetProcAddress( GetModuleHandle("kernel32"), "GetLogicalProcessorInformation" );
- if (NULL == glpi) {
+ if ( glpi == nullptr ) {
return;
}
buffer = reinterpret_cast<PSYSTEM_LOGICAL_PROCESSOR_INFORMATION>( ::malloc( returnLength ) );
- if (NULL == buffer) {
+ if ( buffer == nullptr ) {
// allocation failed
return;
}
return;
}
-namespace cds { namespace OS { namespace Win32 {
+namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 {
unsigned int topology::processor_count()
{
return s_nProcessorCount;
static void prepare_current_processor_call()
{
s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) GetProcAddress( GetModuleHandle("kernel32"), "GetCurrentProcessorNumber" );
- if ( s_fnGetCurrentProcessorNumber == NULL )
+ if ( s_fnGetCurrentProcessorNumber == nullptr )
s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) GetProcAddress( GetModuleHandle("ntdll"), "NtGetCurrentProcessorNumber" );
}
- namespace cds { namespace OS { namespace Win32 {
+ namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 {
unsigned int topology::current_processor()
{
- if ( s_fnGetCurrentProcessorNumber != NULL )
+ if ( s_fnGetCurrentProcessorNumber != nullptr )
return s_fnGetCurrentProcessorNumber();
return 0;
}
switch ( fdwReason ) {
case DLL_PROCESS_ATTACH:
s_DllInstance = hinstDLL;
- s_MainThreadId = cds::OS::getCurrentThreadId();
+ s_MainThreadId = cds::OS::get_current_thread_id();
#if _WIN32_WINNT < 0x0601
discover_topology();
#endif
case DLL_PROCESS_DETACH:
/*
#if _WIN32_WINNT < 0x0601
- if ( s_arrProcessorCellRelationship != NULL ) {
+ if ( s_arrProcessorCellRelationship != nullptr ) {
delete [] s_arrProcessorCellRelationship;
- s_arrProcessorCellRelationship = NULL;
+ s_arrProcessorCellRelationship = nullptr;
}
#endif
*/