X-Git-Url: https://git.llucax.com/software/dgc/cdgc.git/blobdiff_plain/2ede6aa954704e0e386f99a6d88364f60dcf5107..3f609656ee57bc578da59dc7fb4d27cdaea2ad18:/rt/gc/cdgc/bits.d

diff --git a/rt/gc/cdgc/bits.d b/rt/gc/cdgc/bits.d
index 02300ce..17b71f3 100644
--- a/rt/gc/cdgc/bits.d
+++ b/rt/gc/cdgc/bits.d
@@ -26,7 +26,8 @@
 
 module rt.gc.cdgc.bits;
 
-import cstdlib = tango.stdc.stdlib;
+import os = rt.gc.cdgc.os;
+
 import cstring = tango.stdc.string;
 
 private extern (C) void onOutOfMemoryError();
@@ -60,11 +61,21 @@ struct GCBits
     size_t nwords = 0;    // allocated words in data[] excluding sentinals
     size_t nbits = 0;     // number of bits in data[] excluding sentinals
 
-    void Dtor()
+    /// Get the number of bytes needed to store nbits bits
+    size_t data_size()
+    {
+        return (nwords + 2) * uint.sizeof; // +2 for sentinels
+    }
+
+    void Dtor(os.Vis vis = os.Vis.PRIV)
     {
+        // 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)
         {
-            cstdlib.free(data);
+            os.dealloc(data, data_size, vis);
             data = null;
         }
     }
@@ -72,16 +83,15 @@ struct GCBits
     invariant
     {
         if (data)
-        {
-            assert(nwords * data[0].sizeof * 8 >= nbits);
-        }
+            assert (nwords ==
+                    ((nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT));
     }
 
-    void alloc(size_t nbits)
+    void alloc(size_t nbits, os.Vis vis = os.Vis.PRIV)
     {
         this.nbits = nbits;
-        nwords = (nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT;
-        data = cast(uint*)cstdlib.calloc(nwords + 2, uint.sizeof);
+        this.nwords = (nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT;
+        this.data = cast(uint*) os.alloc(data_size, vis);
         if (!data)
             onOutOfMemoryError();
     }