Fix monitor_.d/critical_.d for Windows, remove C implementation.

dlang · Sep 12, 2012 · f2d0f68 · f2d0f68
1 parent d64555f
commit f2d0f68
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 415 deletions.
diff --git a/src/rt/critical.c b/src/rt/critical.c
diff --git a/src/rt/critical_.d b/src/rt/critical_.d
@@ -84,6 +84,11 @@ version( Windows )
 
     extern (C) void _d_criticalenter(D_CRITICAL_SECTION *dcs)
     {
+        if (!dcs_list)
+        {
+            _STI_critical_init();
+            atexit(&_STD_critical_term);
+        }
         debug(PRINTF) printf("_d_criticalenter(dcs = x%x)\n", dcs);
         if (!dcs.next)
         {

diff --git a/src/rt/dmain2.d b/src/rt/dmain2.d
@@ -272,11 +272,8 @@ extern (C) __gshared bool rt_trapExceptions = true;
 
 void _d_criticalInit()
 {
-    version (Posix)
-    {
-        _STI_monitor_staticctor();
-        _STI_critical_init();
-    }
+  _STI_monitor_staticctor();
+  _STI_critical_init();
 }
 
 alias void delegate(Throwable) ExceptionHandler;
@@ -309,11 +306,8 @@ extern (C) bool rt_init(ExceptionHandler dg = null)
 
 void _d_criticalTerm()
 {
-    version (Posix)
-    {
-        _STD_critical_term();
-        _STD_monitor_staticdtor();
-    }
+  _STD_critical_term();
+  _STD_monitor_staticdtor();
 }
 
 extern (C) bool rt_term(ExceptionHandler dg = null)
@@ -381,11 +375,8 @@ extern (C) int main(int argc, char** argv)
         }
     }
 
-    version (Posix)
-    {
-        _STI_monitor_staticctor();
-        _STI_critical_init();
-    }
+    _STI_monitor_staticctor();
+    _STI_critical_init();
 
     version (Windows)
     {
@@ -561,10 +552,8 @@ extern (C) int main(int argc, char** argv)
 
     tryExec(&runAll);
 
-    version (Posix)
-    {
-        _STD_critical_term();
-        _STD_monitor_staticdtor();
-    }
+    _STD_critical_term();
+    _STD_monitor_staticdtor();
+
     return result;
 }
diff --git a/src/rt/mars.h b/src/rt/mars.h