X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdllmain.cpp;h=2802bdb533692b6dd4e59351e742d3ab5f102e04;hb=acce29e6a0131f9d8a46fd8ffcdc7b469a4019c5;hp=113665ea07f80f78588d06ee77c860519875f68f;hpb=696ef88ac5b9503da2300246865ba1671d87aae3;p=libcds.git

diff --git a/src/dllmain.cpp b/src/dllmain.cpp
index 113665ea..2802bdb5 100644
--- a/src/dllmain.cpp
+++ b/src/dllmain.cpp
@@ -1,4 +1,32 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (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:
+
+    * 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>
 
@@ -13,8 +41,8 @@
 #   endif
 #endif
 
-static std::thread::id  s_MainThreadId = 0;
-static HINSTANCE        s_DllInstance = NULL;
+static cds::OS::ThreadId    s_MainThreadId = 0;
+static HINSTANCE            s_DllInstance = nullptr;
 
 #if _WIN32_WINNT < 0x0601
 // For Windows below Windows 7
@@ -25,10 +53,18 @@ static HINSTANCE        s_DllInstance = NULL;
 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
-// static unsigned int *   s_arrProcessorCellRelationship = NULL;
+// static unsigned int *   s_arrProcessorCellRelationship = nullptr;
 
 static void discover_topology()
 {
@@ -38,8 +74,8 @@ 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;
@@ -50,8 +86,8 @@ static void discover_topology()
     s_nProcessorCount = 1;
     s_nProcessorGroupCount = 1;
 
-    glpi = (LPFN_GLPI) GetProcAddress( GetModuleHandle("kernel32"), "GetLogicalProcessorInformation" );
-    if (NULL == glpi) {
+    glpi = (LPFN_GLPI) get_proc_addr( "kernel32", "GetLogicalProcessorInformation" );
+    if ( glpi == nullptr ) {
         return;
     }
 
@@ -64,9 +100,9 @@ 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 (NULL == buffer) {
+                if ( buffer == nullptr ) {
                     // allocation failed
                     return;
                 }
@@ -121,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)
@@ -131,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 )
@@ -150,7 +186,7 @@ static void discover_topology()
     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;
@@ -166,15 +202,15 @@ namespace cds { namespace OS { namespace Win32 {
 
     static void prepare_current_processor_call()
     {
-        s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) GetProcAddress( GetModuleHandle("kernel32"), "GetCurrentProcessorNumber" );
-        if ( s_fnGetCurrentProcessorNumber == NULL )
-            s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) GetProcAddress( GetModuleHandle("ntdll"), "NtGetCurrentProcessorNumber" );
+        s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) get_proc_addr( "kernel32", "GetCurrentProcessorNumber" );
+        if ( s_fnGetCurrentProcessorNumber == nullptr )
+            s_fnGetCurrentProcessorNumber = (fnGetCurrentProcessorNumber) get_proc_addr( "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;
         }
@@ -191,7 +227,7 @@ BOOL WINAPI DllMain(
     switch ( fdwReason ) {
         case DLL_PROCESS_ATTACH:
             s_DllInstance = hinstDLL;
-            s_MainThreadId = std::this_thread::get_id();
+            s_MainThreadId = cds::OS::get_current_thread_id();
 #if _WIN32_WINNT < 0x0601
             discover_topology();
 #endif
@@ -203,9 +239,9 @@ BOOL WINAPI DllMain(
         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
 */