projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reformatting
[libcds.git]
/
src
/
dllmain.cpp
diff --git
a/src/dllmain.cpp
b/src/dllmain.cpp
index 8456767155e5677d3399cac6feaa76b26d6e4f24..2802bdb533692b6dd4e59351e742d3ab5f102e04 100644
(file)
--- a/
src/dllmain.cpp
+++ b/
src/dllmain.cpp
@@
-1,7
+1,7
@@
/*
This file is a part of libcds - Concurrent Data Structures library
/*
This file is a part of libcds - Concurrent Data Structures library
- (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-201
6
+ (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-201
7
Source code repo: http://github.com/khizmax/libcds/
Download: http://sourceforge.net/projects/libcds/files/
Source code repo: http://github.com/khizmax/libcds/
Download: http://sourceforge.net/projects/libcds/files/
@@
-53,6
+53,14
@@
static HINSTANCE s_DllInstance = nullptr;
static unsigned int s_nProcessorCount = 1;
static unsigned int s_nProcessorGroupCount = 1;
static unsigned int s_nProcessorCount = 1;
static unsigned int s_nProcessorGroupCount = 1;
+static inline void* get_proc_addr( char const* module, char const* func )
+{
+ HMODULE h = GetModuleHandle( module );
+ if ( !h )
+ return nullptr;
+ return GetProcAddress( h, func );
+}
+
// Array of processor - cell relationship
// Array size is s_nProcessorCount
// s_arrProcessorCellRelationship[i] is the cell (the processor group) number for i-th processor
// Array of processor - cell relationship
// Array size is s_nProcessorCount
// s_arrProcessorCellRelationship[i] is the cell (the processor group) number for i-th processor
@@
-78,7
+86,7
@@
static void discover_topology()
s_nProcessorCount = 1;
s_nProcessorGroupCount = 1;
s_nProcessorCount = 1;
s_nProcessorGroupCount = 1;
- glpi = (LPFN_GLPI)
GetProcAddress( GetModuleHandle("kernel32")
, "GetLogicalProcessorInformation" );
+ glpi = (LPFN_GLPI)
get_proc_addr( "kernel32"
, "GetLogicalProcessorInformation" );
if ( glpi == nullptr ) {
return;
}
if ( glpi == nullptr ) {
return;
}
@@
-92,7
+100,7
@@
static void discover_topology()
if (buffer)
free(buffer);
if (buffer)
free(buffer);
- buffer = reinterpret_cast<PSYSTEM_LOGICAL_PROCESSOR_INFORMATION>( ::malloc( returnLength )
);
+ buffer = reinterpret_cast<PSYSTEM_LOGICAL_PROCESSOR_INFORMATION>( ::malloc( returnLength ));
if ( buffer == nullptr ) {
// allocation failed
if ( buffer == nullptr ) {
// allocation failed
@@
-149,7
+157,7
@@
static void discover_topology()
// Build relationship processor -> cell
/*
s_arrProcessorCellRelationship = new unsigned int[s_nProcessorCount];
// Build relationship processor -> cell
/*
s_arrProcessorCellRelationship = new unsigned int[s_nProcessorCount];
- memset( s_arrProcessorCellRelationship, 0, s_nProcessorCount * sizeof(s_arrProcessorCellRelationship[0])
);
+ memset( s_arrProcessorCellRelationship, 0, s_nProcessorCount * sizeof(s_arrProcessorCellRelationship[0]));
byteOffset = 0;
ptr = buffer;
while (byteOffset + sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION) <= returnLength)
byteOffset = 0;
ptr = buffer;
while (byteOffset + sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION) <= returnLength)
@@
-159,7
+167,7
@@
static void discover_topology()
case RelationNumaNode:
// Non-NUMA systems report a single record of this type.
for ( unsigned int i = 0; i < sizeof(ptr->ProcessorMask) * 8; ++i ) {
case RelationNumaNode:
// Non-NUMA systems report a single record of this type.
for ( unsigned int i = 0; i < sizeof(ptr->ProcessorMask) * 8; ++i ) {
- if ( ptr->ProcessorMask & (1 << i)
) {
+ if ( ptr->ProcessorMask & (1 << i)) {
assert( i < s_nProcessorCount );
assert( ptr->NumaNode.NodeNumber < s_nProcessorGroupCount );
if ( i < s_nProcessorCount )
assert( i < s_nProcessorCount );
assert( ptr->NumaNode.NodeNumber < s_nProcessorGroupCount );
if ( i < s_nProcessorCount )
@@
-194,9
+202,9
@@
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 {
static void prepare_current_processor_call()
{
static void prepare_current_processor_call()
{
- s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber)
GetProcAddress( GetModuleHandle("kernel32")
, "GetCurrentProcessorNumber" );
+ s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber)
get_proc_addr( "kernel32"
, "GetCurrentProcessorNumber" );
if ( s_fnGetCurrentProcessorNumber == nullptr )
if ( s_fnGetCurrentProcessorNumber == nullptr )
- s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber)
GetProcAddress( GetModuleHandle("ntdll")
, "NtGetCurrentProcessorNumber" );
+ s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber)
get_proc_addr( "ntdll"
, "NtGetCurrentProcessorNumber" );
}
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 {
}
namespace cds { namespace OS { CDS_CXX11_INLINE_NAMESPACE namespace Win32 {