X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Finit.cpp;h=7e324eaf5ad90168cb4464dccac69ad3f4b6bcad;hb=759ffa51fb865adbebbfdb44273f9b83ec7cc8f3;hp=7168e6c52d624967c3f09af2c843ea335991f3fc;hpb=2e8a58841ca3d7cc736cc9483b691cf70c3ecdb3;p=libcds.git

diff --git a/src/init.cpp b/src/init.cpp
index 7168e6c5..7e324eaf 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1,9 +1,37 @@
-//$$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/init.h>
-#include <cds/cxx11_atomic.h>
+#include <cds/algo/atomic.h>
 
-#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS
+#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS && CDS_OS_TYPE != CDS_OS_MINGW
 #   if CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL
 #       include <cds/threading/details/msvc_manager.h>
 #   endif
@@ -21,15 +49,12 @@
 
 namespace cds {
 
-    CDS_EXPORT_API CDS_ATOMIC::atomic<size_t> threading::ThreadData::s_nLastUsedProcNo(0);
-    CDS_EXPORT_API size_t threading::ThreadData::s_nProcCount = 1;
-
 #if CDS_OS_INTERFACE == CDS_OSI_WINDOWS
     CDS_EXPORT_API DWORD cds::threading::wintls::Manager::Holder::m_key = TLS_OUT_OF_INDEXES;
-
-    __declspec( thread ) threading::msvc_internal::ThreadDataPlaceholder threading::msvc_internal::s_threadData;
-    __declspec(thread) threading::ThreadData * threading::msvc_internal::s_pThreadData = nullptr;
-
+#   if CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL
+        __declspec( thread ) threading::msvc_internal::ThreadDataPlaceholder threading::msvc_internal::s_threadData;
+        __declspec(thread) threading::ThreadData * threading::msvc_internal::s_pThreadData = nullptr;
+#   endif
 #else
     pthread_key_t threading::pthread::Manager::Holder::m_key;
 
@@ -45,17 +70,17 @@ namespace cds {
 #endif
 
     namespace details {
-        static CDS_ATOMIC::atomic<size_t> s_nInitCallCount(0);
+        static atomics::atomic<size_t> s_nInitCallCount(0);
 
         bool CDS_EXPORT_API init_first_call()
         {
-            return s_nInitCallCount.fetch_add(1, CDS_ATOMIC::memory_order_relaxed) == 0;
+            return s_nInitCallCount.fetch_add(1, atomics::memory_order_relaxed) == 0;
         }
 
         bool CDS_EXPORT_API fini_last_call()
         {
-            if ( s_nInitCallCount.fetch_sub( 1, CDS_ATOMIC::memory_order_relaxed ) == 1 ) {
-                CDS_ATOMIC::atomic_thread_fence( CDS_ATOMIC::memory_order_release );
+            if ( s_nInitCallCount.fetch_sub( 1, atomics::memory_order_relaxed ) == 1 ) {
+                atomics::atomic_thread_fence( atomics::memory_order_release );
                 return true;
             }
             return false;