X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fdllmain.cpp;h=2802bdb533692b6dd4e59351e742d3ab5f102e04;hb=e91c4dc71f4ecd0a6a35a2d5afc594a42df3e809;hp=bde940acc0150ac099564728a24625857f14cbb1;hpb=cd515d6402be81b84e2eb0c9d4cf0a1ca9e4d95a;p=libcds.git

diff --git a/src/dllmain.cpp b/src/dllmain.cpp
index bde940ac..2802bdb5 100644
--- a/src/dllmain.cpp
+++ b/src/dllmain.cpp
@@ -1,11 +1,11 @@
 /*
     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/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     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.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <cds/details/defs.h>
@@ -53,6 +53,14 @@ static HINSTANCE            s_DllInstance = nullptr;
 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
@@ -78,7 +86,7 @@ static void discover_topology()
     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;
     }
@@ -92,7 +100,7 @@ static void discover_topology()
                 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
@@ -149,7 +157,7 @@ static void discover_topology()
     // 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)
@@ -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 ) {
-                if ( ptr->ProcessorMask & (1 << i) ) {
+                if ( ptr->ProcessorMask & (1 << i)) {
                     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()
     {
-        s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) GetProcAddress( GetModuleHandle("kernel32"), "GetCurrentProcessorNumber" );
+        s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) get_proc_addr( "kernel32", "GetCurrentProcessorNumber" );
         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 {