Changeset 783

Timestamp:

07/04/08 22:23:48 (2 months ago)

Author:

Bartosz

Message:

encapsulated lock escalation

Files:

• trunk/phobos/internal/monitor.d (modified) (2 diffs)
• trunk/phobos/internal/object.d (modified) (1 diff)

trunk/phobos/internal/monitor.d

@@ -176 +176 @@
-}
-
+void escalateLock(Object obj)
+{
+    __monitor_mutex.lock;
+    if (GetFatLock(obj) is null)
+         SetFatLock(obj, conStruct!(FatLock));
+    __monitor_mutex.unlock;
+}
+
-/** Called only once by a single thread during startup */
-extern(C) void _STI_monitor_staticctor()
@@ -198 +206 @@
-    // Warning: data race
-    if (GetFatLock(obj) is null)
-
-
-
-
-
-
-
-
+
+
-    GetFatLock(obj).lock;
-}

trunk/phobos/internal/object.d

@@ -141 +141 @@
-    {
-        //printf("notifyRegister(dg = %llx, o = %p)\n", dg, this);
+        if (!GetFatLock(this))
+            escalateLock(this); // Fat lock stores delegates
-        synchronized (this)
-        {
-            // Important: Monitor is guaranteed to be initialized
-            // as the side-effect of the synchronized clause above
-            FatLock * fatLock = GetFatLock(this);
-            assert(fatLock);