Merge pull request #807 from Safety0ff/gciterlock

Fix locking in GC.rootIter and GC.rangeIter
dlang · May 24, 2014 · 2bec03c · 2bec03c
2 parents f16c71d + 426b7a0
commit 2bec03c
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/gc/gc.d b/src/gc/gc.d
@@ -1097,10 +1097,14 @@ class GC
      */
     @property auto rootIter()
     {
-        gcLock.lock();
-        auto rc = &gcx.roots.opApply;
-        gcLock.unlock();
-        return rc;
+        auto iter(scope int delegate(ref Root) nothrow dg)
+        {
+            gcLock.lock();
+            auto res = gcx.roots.opApply(dg);
+            gcLock.unlock();
+            return res;
+        }
+        return &iter;
     }
 
 
@@ -1154,10 +1158,14 @@ class GC
      */
     @property auto rangeIter()
     {
-        gcLock.lock();
-        auto rc = &gcx.ranges.opApply;
-        gcLock.unlock();
-        return rc;
+        auto iter(scope int delegate(ref Range) nothrow dg)
+        {
+            gcLock.lock();
+            auto res = gcx.ranges.opApply(dg);
+            gcLock.unlock();
+            return res;
+        }
+        return &iter;
     }