Don't leak weak pointers

[software/dgc/cdgc.git] / rt / gc / cdgc / bits.d

diff --git a/rt/gc/cdgc/bits.d b/rt/gc/cdgc/bits.d
index 9a8d1b48a7bdec9ad7fe50ee525defec2090bf2f..7c06c83f4834751bcc39d28845a02367406299ec 100644 (file)
--- a/rt/gc/cdgc/bits.d
+++ b/rt/gc/cdgc/bits.d
@@ -26,7 +26,7 @@
 
 module rt.gc.cdgc.bits;
 
 
 module rt.gc.cdgc.bits;
 

-import rt.gc.cdgc.alloc: os_mem_map, os_mem_unmap, Vis;
+import os = rt.gc.cdgc.os;

 
 import cstring = tango.stdc.string;
 
 
 import cstring = tango.stdc.string;
 


@@ -67,15 +67,15 @@ struct GCBits
         return (nwords + 2) * uint.sizeof; // +2 for sentinels
     }
 
         return (nwords + 2) * uint.sizeof; // +2 for sentinels
     }
 

-    void Dtor(Vis vis = Vis.PRIV)
+    void Dtor(os.Vis vis = os.Vis.PRIV)

     {
     {

-        // Even when os_mem_unmap() can be called with a null pointer, the
-        // extra call might be significant. On hard GC benchmarks making the
-        // test for null here (i.e. not making the call) can reduce the GC time
-        // by almost ~5%.
+        // Even when os.dealloc() can be called with a null pointer, the extra
+        // call might be significant. On hard GC benchmarks making the test for
+        // null here (i.e. not making the call) can reduce the GC time by
+        // almost ~5%.

         if (data)
         {
         if (data)
         {

-            os_mem_unmap(data, data_size, vis);
+            os.dealloc(data, data_size, vis);

             data = null;
         }
     }
             data = null;
         }
     }


@@ -83,16 +83,15 @@ struct GCBits
     invariant
     {
         if (data)
     invariant
     {
         if (data)

-        {
-            assert(nwords * data[0].sizeof * 8 >= nbits);
-        }
+            assert (nwords ==
+                    ((nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT));

     }
 
     }
 

-    void alloc(size_t nbits, Vis vis = Vis.PRIV)
+    void alloc(size_t nbits, os.Vis vis = os.Vis.PRIV)

     {
         this.nbits = nbits;
         this.nwords = (nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT;
     {
         this.nbits = nbits;
         this.nwords = (nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT;

-        this.data = cast(uint*) os_mem_map(data_size, vis);
+        this.data = cast(uint*) os.alloc(data_size, vis);

         if (!data)
             onOutOfMemoryError();
     }
         if (!data)
             onOutOfMemoryError();
     }


@@ -163,13 +162,24 @@ struct GCBits
 
     void zero()
     {
 
     void zero()
     {

-        version(MEMCPY_NON_SIG_SAFE) {
-            uint * d1=data+1,dEnd=d1+nwords;
-            for (;d1!=dEnd;++d1)
-                *d1=0u;
-        } else {
-            cstring.memset(data + 1, 0, nwords * uint.sizeof);
-        }
+        cstring.memset(data + 1, 0, nwords * uint.sizeof);
+    }
+
+    void set_all()
+    {
+        cstring.memset(data + 1, 0xff, nwords * uint.sizeof);
+    }
+
+    void set_group(size_t base, size_t nbits)
+    in
+    {
+    }
+    body
+    {
+        assert ((base % 8) == 0);
+        assert ((nbits % 8) == 0);
+        size_t nbytes = nbits / 8;
+        cstring.memset(data + 1 + (base >> BITS_SHIFT), 0xff, nbytes);

     }
 
     void copy(GCBits *f)
     }
 
     void copy(GCBits *f)


@@ -179,13 +189,7 @@ struct GCBits
     }
     body
     {
     }
     body
     {

-        version(MEMCPY_NON_SIG_SAFE) {
-            uint * d1=data+1,d2=f.data+1,dEnd=d1+nwords;
-            for (;d1!=dEnd;++d1,++d2)
-                *d1=*d2;
-        } else {
-            cstring.memcpy(data + 1, f.data + 1, nwords * uint.sizeof);
-        }
+        cstring.memcpy(data + 1, f.data + 1, nwords * uint.sizeof);

     }
 
     uint* base()
     }
 
     uint* base()