Merge pull request #589 from dawgfoto/threadTermLocks

add explicit thread_term call to replace atexit

Author: WalterBright

src/core/thread.d

@@ -1397,13 +1397,12 @@ private:
             lock[] = Mutex.classinfo.init[];
             (cast(Mutex)lock.ptr).__ctor();
         }
+    }
 
-        extern(C) void destroy()
-        {
-            foreach (ref lock; _locks)
-                (cast(Mutex)lock.ptr).__dtor();
-        }
-        atexit(&destroy);
+    static void termLocks()
+    {
+        foreach (ref lock; _locks)
+            (cast(Mutex)lock.ptr).__dtor();
     }
 
     __gshared Context*  sm_cbeg;
@@ -1730,6 +1729,16 @@ extern (C) void thread_init()
 }
 
 
+/**
+ * Terminates the thread module. No other thread routine may be called
+ * afterwards.
+ */
+extern (C) void thread_term()
+{
+    Thread.termLocks();
+}
+
+
 /**
  *
  */

src/core/thread.di

@@ -436,6 +436,13 @@ private:
 extern (C) void thread_init();
 
 
+/**
+ * Terminates the thread module. No other thread routine may be called
+ * afterwards.
+ */
+extern (C) void thread_term();
+
+
 /**
  *
  */

src/gc/proxy.d

@@ -29,6 +29,7 @@ private
     __gshared gc_t _gc;
 
     extern (C) void thread_init();
+    extern (C) void thread_term();
 
     struct Proxy
     {
@@ -136,8 +137,9 @@ extern (C)
         //       the problems mentioned above though, so I guess we'll see.
         _gc.fullCollectNoStack(); // not really a 'collect all' -- still scans
                                   // static data area, roots, and ranges.
-        _gc.Dtor();
+        thread_term();
 
+        _gc.Dtor();
         free(cast(void*)_gc);
         _gc = null;
     }