Changeset 2648

Timestamp:

10/12/07 16:54:18 (1 year ago)

Author:

sean

Message:

Added gc_query(p) to obtain aggregate info about the block containing p. Related to ticket #557.

Files:

• trunk/lib/common/tango/core/Memory.d (modified) (3 diffs)
• trunk/lib/gc/basic/gc.d (modified) (1 diff)
• trunk/lib/gc/basic/gcx.d (modified) (3 diffs)
• trunk/lib/gc/stub/gc.d (modified) (2 diffs)

trunk/lib/common/tango/core/Memory.d

@@ -29 +29 @@
-    extern (C) void   gc_free( void* p );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    extern (C) void gc_addRoot( void* p );
@@ -93 +102 @@
-        NO_MOVE  = 0b0000_0100  /// Do not move this memory block on collect.
-    }
+
+
+    /**
+     * Contains aggregate information about a block of managed memory.  The
+     * purpose of this struct is to support a more efficient query style in
+     * instances where detailed information is needed.
+     *
+     * base = A pointer to the base of the block in question.
+     * size = The size of the block, calculated from base.
+     * attr = Attribute bits set on the memory block.
+     */
+    alias BlkInfo_ BlkInfo;
-
-
@@ -318 +339 @@
-
-    /**
+     * Returns aggregate information about the memory block containing p.  If p
+     * references memory not originally allocated by this garbage collector, if
+     * p is null, or if the garbage collector does not support this operation,
+     * BlkInfo.init will be returned.  Typically, support for this operation
+     * is dependent on support for addrOf.
+     *
+     * Params:
+     *  p = A pointer to the root or the interior of a valid memory block or to
+     *      null.
+     *
+     * Returns:
+     *  Information regarding the memory block referenced by p or BlkInfo.init
+     *  on error.
+     */
+    static BlkInfo query( void* p )
+    {
+        return gc_query( p );
+    }
+
+
+    /**
-     * Adds the memory address referenced by p to an internal list of roots to
-     * be scanned during a collection.  If p is null, no operation is

trunk/lib/gc/basic/gc.d

@@ -137 +137 @@
-}
-
+extern (C) BlkInfo gc_query( void* p )
+{
+    return _gc.query( p );
+}
+
-extern (C) void gc_addRoot( void* p )
-{

trunk/lib/gc/basic/gcx.d

@@ -75 +75 @@
-        NO_MOVE  = 0b0000_0100,
-        ALL_BITS = 0b1111_1111
+    }
+
+    struct BlkInfo
+    {
+        void*  base;
+        size_t size;
+        uint   attr;
-    }
-
@@ -971 +978 @@
-
-    /**
+     * Determine the base address of the block containing p.  If p is not a gc
+     * allocated pointer, return null.
+     */
+    BlkInfo query(void *p)
+    {
+        if (!p)
+        {
+            BlkInfo i;
+            return  i;
+        }
+
+        if (!thread_needLock())
+        {
+            return queryNoSync(p);
+        }
+        else synchronized (gcLock)
+        {
+            return queryNoSync(p);
+        }
+    }
+
+
+    //
+    //
+    //
+    BlkInfo queryNoSync(void *p)
+    {
+        if (!p)
+        {
+            BlkInfo i;
+            return  i;
+        }
+
+        return gcx.getInfo(p);
+    }
+
+
+    /**
-     * Verify that pointer p:
-     *  1) belongs to this memory pool
@@ -1640 +1685 @@
-        }
-        return size;
+    }
+
+
+    /**
+     *
+     */
+    BlkInfo getInfo(void* p)
+    {
+        Pool *pool;
+        BlkInfo info;
+
+        pool = findPool(p);
+        if (pool)
+        {
+            size_t offset = cast(size_t)(p - pool.baseAddr);
+            uint pn = offset / PAGESIZE;
+            Bins bin = cast(Bins)pool.pagetable[pn];
+
+            ////////////////////////////////////////////////////////////////////
+            // findAddr
+            ////////////////////////////////////////////////////////////////////
+
+            if (bin <= B_PAGE)
+            {
+                info.base = pool.baseAddr + (offset & notbinsize[bin]);
+            }
+            else if (bin == B_PAGEPLUS)
+            {
+                do
+                {   --pn, offset -= PAGESIZE;
+                } while (cast(Bins)pool.pagetable[pn] == B_PAGEPLUS);
+
+                info.base = pool.baseAddr + (offset & (offset.max ^ (PAGESIZE-1)));
+
+                // fix bin for use by size calc below
+                bin = cast(Bins)pool.pagetable[pn];
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            // findSize
+            ////////////////////////////////////////////////////////////////////
+
+            info.size = binsize[bin];
+            if (bin == B_PAGE)
+            {   uint npages = pool.ncommitted;
+                ubyte* pt;
+                uint i;
+
+                pt = &pool.pagetable[0];
+                for (i = pn + 1; i < npages; i++)
+                {
+                    if (pt[i] != B_PAGEPLUS)
+                        break;
+                }
+                info.size = (i - pn) * PAGESIZE;
+            }
+
+            ////////////////////////////////////////////////////////////////////
+            // getBits
+            ////////////////////////////////////////////////////////////////////
+
+            info.attr = getBits(pool, offset / 16);
+        }
+        return info;
-    }
-

trunk/lib/gc/stub/gc.d

@@ -30 +30 @@
-    }
-
+    struct BlkInfo
+    {
+        void*  base;
+        size_t size;
+        uint   attr;
+    }
-
-    extern (C) void thread_init();
@@ -124 +130 @@
-}
-
+extern (C) BlkInfo gc_query( void* p )
+{
+    return BlkInfo.init
+}
+
-extern (C) void gc_addRoot( void* p )
-{