Merge pull request #107 from dawgfoto/RefactorModuleInfo

Refactor module info - Nice work!
dlang · Dec 19, 2011 · 3159f6f · 3159f6f
2 parents 09cde86 + e345258
commit 3159f6f
Show file tree

Hide file tree

Showing 8 changed files with 637 additions and 495 deletions.
diff --git a/import/object.di b/import/object.di
@@ -292,12 +292,6 @@ struct ModuleInfo
     static int opApply(scope int delegate(ref ModuleInfo*) dg);
 }
 
-ModuleInfo*[] _moduleinfo_tlsdtors;
-uint          _moduleinfo_tlsdtors_i;
-
-extern (C) void _moduleTlsCtor();
-extern (C) void _moduleTlsDtor();
-
 class Throwable : Object
 {
     interface TraceInfo

diff --git a/posix.mak b/posix.mak
@@ -188,6 +188,7 @@ MANIFEST= \
 	src/rt/memory.d \
 	src/rt/memory_osx.d \
 	src/rt/memset.d \
+	src/rt/minfo.d \
 	src/rt/minit.asm \
 	src/rt/monitor_.d \
 	src/rt/obj.d \
@@ -313,6 +314,7 @@ SRC_D_MODULES = \
 	rt/memory \
 	rt/memory_osx \
 	rt/memset \
+	rt/minfo \
 	rt/monitor_ \
 	rt/obj \
 	rt/qsort \

diff --git a/src/core/sys/windows/dll.d b/src/core/sys/windows/dll.d
@@ -33,6 +33,12 @@ version( Windows )
         extern __gshared void* _tls_callbacks_a;
     }
 
+    extern (C) // rt.minfo
+    {
+        void rt_moduleTlsCtor();
+        void rt_moduleTlsDtor();
+    }
+
 private:
     struct dll_aux
     {
@@ -424,7 +430,7 @@ public:
             if( attach_thread )
                 thread_attachThis();
             if( initTls && !tlsCtorRun ) // avoid duplicate calls
-                _moduleTlsCtor();
+                rt_moduleTlsCtor();
         }
         return true;
     }
@@ -438,7 +444,7 @@ public:
         if( thread_findByAddr( GetCurrentThreadId() ) )
         {
             if( exitTls && tlsCtorRun ) // avoid dtors to be run twice
-                _moduleTlsDtor();
+                rt_moduleTlsDtor();
             if( detach_thread )
                 thread_detachThis();
         }

diff --git a/src/core/sys/windows/threadaux.d b/src/core/sys/windows/threadaux.d
@@ -26,6 +26,12 @@ version( Windows )
 
     extern (C) extern __gshared int _tls_index;
 
+    extern (C) // rt.minfo
+    {
+        void rt_moduleTlsCtor();
+        void rt_moduleTlsDtor();
+    }
+
 private:
     ///////////////////////////////////////////////////////////////////
     struct thread_aux
@@ -246,17 +252,17 @@ public:
     }
 
     ///////////////////////////////////////////////////////////////////
-    // run _moduleTlsCtor in the context of the given thread
+    // run rt_moduleTlsCtor in the context of the given thread
     void thread_moduleTlsCtor( uint id )
     {
-        thread_aux.impersonate_thread(id, &_moduleTlsCtor);
+        thread_aux.impersonate_thread(id, &rt_moduleTlsCtor);
     }
 
     ///////////////////////////////////////////////////////////////////
-    // run _moduleTlsDtor in the context of the given thread
+    // run rt_moduleTlsDtor in the context of the given thread
     void thread_moduleTlsDtor( uint id )
     {
-        thread_aux.impersonate_thread(id, &_moduleTlsDtor);
+        thread_aux.impersonate_thread(id, &rt_moduleTlsDtor);
     }
 }