Changeset 39

Timestamp:

10/28/08 20:15:37 (4 years ago)

Author:

sean

Message:

Added static data segment support to the new Runtime.loadLibrary() features. This also replaces static data segment scanning for all apps by dropping rt_scanStaticData() in favor of a new initialization step that calls gc_addRange() for each static data segment. The upshot of this is that all GCs must track add/remove Root and Range calls so the info can be passed to a proxy if gc_setProxy() is called. See src/gc/stub/gc.d for a simple implementation of this.

Files:

• branches/D1.0/src/gc/basic/gc.d (modified) (4 diffs)
• branches/D1.0/src/gc/basic/gcx.d (modified) (4 diffs)
• branches/D1.0/src/gc/stub/gc.d (modified) (8 diffs)
• trunk/src/gc/basic/gc.d (modified) (4 diffs)
• trunk/src/gc/basic/gcx.d (modified) (4 diffs)
• trunk/src/gc/stub/gc.d (modified) (8 diffs)

branches/D1.0/src/gc/basic/gc.d

@@ -27 +27 @@
-module gc.gc;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-extern (C) void gc_init()
@@ -60 +126 @@
-    //       before its first collection.
-    thread_init();
+    initProxy();
-}
-
@@ -235 +302 @@
-}
-
-struct Proxy
-{
-    extern (C) void function() gc_enable;
-    extern (C) void function() gc_disable;
-    extern (C) void function() gc_collect;
-    extern (C) void function() gc_minimize;
-
-    extern (C) uint function(void*) gc_getAttr;
-    extern (C) uint function(void*, uint) gc_setAttr;
-    extern (C) uint function(void*, uint) gc_clrAttr;
-
-    extern (C) void*  function(size_t, uint) gc_malloc;
-    extern (C) void*  function(size_t, uint) gc_calloc;
-    extern (C) void*  function(void*, size_t, uint ba) gc_realloc;
-    extern (C) size_t function(void*, size_t, size_t) gc_extend;
-    extern (C) size_t function(size_t) gc_reserve;
-    extern (C) void   function(void*) gc_free;
-
-    extern (C) void*   function(void*) gc_addrOf;
-    extern (C) size_t  function(void*) gc_sizeOf;
-
-    extern (C) BlkInfo function(void*) gc_query;
-
-    extern (C) void function(void*) gc_addRoot;
-    extern (C) void function(void*, size_t) gc_addRange;
-
-    extern (C) void function(void*) gc_removeRoot;
-    extern (C) void function(void*) gc_removeRange;
-}
-
-Proxy  pthis;
-Proxy* proxy;
-
-static this()
-{
-    pthis.gc_enable = &gc_enable;
-    pthis.gc_disable = &gc_disable;
-    pthis.gc_collect = &gc_collect;
-    pthis.gc_minimize = &gc_minimize;
-
-    pthis.gc_getAttr = &gc_getAttr;
-    pthis.gc_setAttr = &gc_setAttr;
-    pthis.gc_clrAttr = &gc_clrAttr;
-
-    pthis.gc_malloc = &gc_malloc;
-    pthis.gc_calloc = &gc_calloc;
-    pthis.gc_realloc = &gc_realloc;
-    pthis.gc_extend = &gc_extend;
-    pthis.gc_reserve = &gc_reserve;
-    pthis.gc_free = &gc_free;
-
-    pthis.gc_addrOf = &gc_addrOf;
-    pthis.gc_sizeOf = &gc_sizeOf;
-
-    pthis.gc_query = &gc_query;
-
-    pthis.gc_addRoot = &gc_addRoot;
-    pthis.gc_addRange = &gc_addRange;
-
-    pthis.gc_removeRoot = &gc_removeRoot;
-    pthis.gc_removeRange = &gc_removeRange;
-}
-
-extern (C) Proxy* gc_getProxy()
-{
-    return &pthis;
-}
-
+
-export extern (C) void gc_setProxy( Proxy* p )
-{
@@ -310 +314 @@
-    }
-    proxy = p;
-
+
+
+
+
-}
-
-export extern (C) void gc_clrProxy()
-{
-
+
+
+
+
-    proxy = null;
-}

branches/D1.0/src/gc/basic/gcx.d

@@ -1167 +1167 @@
-
-    /**
+     *
+     */
+    int delegate(int delegate(inout void*)) rootIter()
+    {
+        if (!thread_needLock())
+        {
+            return &gcx.rootIter;
+        }
+        else synchronized (gcLock)
+        {
+            return &gcx.rootIter;
+        }
+    }
+    /**
-     * add range to scan for roots
-     */
@@ -1210 +1224 @@
-
-
+    /**
+     *
+     */
+    int delegate(int delegate(inout Range)) rangeIter()
+    {
+        if (!thread_needLock())
+        {
+            return &gcx.rangeIter;
+        }
+        else synchronized (gcLock)
+        {
+            return &gcx.rangeIter;
+        }
+    }
-    /**
-     * do full garbage collection
@@ -1576 +1604 @@
-     *
-     */
+    int rootIter(int delegate(inout void*) dg)
+    {
+        int result = 0;
+        for( size_t i = 0; i < nroots; ++i )
+        {
+            result = dg(roots[i]);
+            if (result)
+                break;
+        }
+        return result;
+    }
+    /**
+     *
+     */
-    void addRange(void *pbot, void *ptop)
-    {
@@ -1626 +1668 @@
-
-
+    /**
+     *
+     */
+    int rangeIter(int delegate(inout Range) dg)
+    {
+        int result = 0;
+        for( size_t i = 0; i < nranges; ++i )
+        {
+            result = dg(ranges[i]);
+            if (result)
+                break;
+        }
+        return result;
+    }
-    /**
-     * Find Pool that pointer is in.

branches/D1.0/src/gc/stub/gc.d

@@ -21 +21 @@
-module gc.gc;
-
-private import core.stdc.stdlib;
-
-private
-{
+   import core.stdc.stdlib;
+
-   enum BlkAttr : uint
-    {
@@ -42 +42 @@
-    extern (C) void thread_init();
-    extern (C) void onOutOfMemoryError();
+
+    struct Proxy
+    {
+        extern (C) void function() gc_enable;
+        extern (C) void function() gc_disable;
+        extern (C) void function() gc_collect;
+        extern (C) void function() gc_minimize;
+
+        extern (C) uint function(void*) gc_getAttr;
+        extern (C) uint function(void*, uint) gc_setAttr;
+        extern (C) uint function(void*, uint) gc_clrAttr;
+
+        extern (C) void*  function(size_t, uint) gc_malloc;
+        extern (C) void*  function(size_t, uint) gc_calloc;
+        extern (C) void*  function(void*, size_t, uint ba) gc_realloc;
+        extern (C) size_t function(void*, size_t, size_t) gc_extend;
+        extern (C) size_t function(size_t) gc_reserve;
+        extern (C) void   function(void*) gc_free;
+
+        extern (C) void*   function(void*) gc_addrOf;
+        extern (C) size_t  function(void*) gc_sizeOf;
+
+        extern (C) BlkInfo function(void*) gc_query;
+
+        extern (C) void function(void*) gc_addRoot;
+        extern (C) void function(void*, size_t) gc_addRange;
+
+        extern (C) void function(void*) gc_removeRoot;
+        extern (C) void function(void*) gc_removeRange;
+    }
+
+    Proxy  pthis;
+    Proxy* proxy;
+
+    void initProxy()
+    {
+        pthis.gc_enable = &gc_enable;
+        pthis.gc_disable = &gc_disable;
+        pthis.gc_collect = &gc_collect;
+        pthis.gc_minimize = &gc_minimize;
+
+        pthis.gc_getAttr = &gc_getAttr;
+        pthis.gc_setAttr = &gc_setAttr;
+        pthis.gc_clrAttr = &gc_clrAttr;
+
+        pthis.gc_malloc = &gc_malloc;
+        pthis.gc_calloc = &gc_calloc;
+        pthis.gc_realloc = &gc_realloc;
+        pthis.gc_extend = &gc_extend;
+        pthis.gc_reserve = &gc_reserve;
+        pthis.gc_free = &gc_free;
+
+        pthis.gc_addrOf = &gc_addrOf;
+        pthis.gc_sizeOf = &gc_sizeOf;
+
+        pthis.gc_query = &gc_query;
+
+        pthis.gc_addRoot = &gc_addRoot;
+        pthis.gc_addRange = &gc_addRange;
+
+        pthis.gc_removeRoot = &gc_removeRoot;
+        pthis.gc_removeRange = &gc_removeRange;
+    }
+
+    void** roots  = null;
+    size_t nroots = 0;
+
+    struct Range
+    {
+        void*  pos;
+        size_t len;
+    }
+
+    Range* ranges  = null;
+    size_t nranges = 0;
-}
-
@@ -49 +124 @@
-    //       collection, and always before returning from gc_init().
-    thread_init();
+    initProxy();
-}
-
-extern (C) void gc_term()
-{
-
+
+
-}
-
@@ -186 +263 @@
-}
-
-// TODO: Implement range storage.
-// TODO: Implement root storage.
-
-extern (C) void gc_addRoot( void* p )
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
-    return proxy.gc_addRoot( p );
-}
@@ -199 +281 @@
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
+
-    return proxy.gc_addRange( p, sz );
-}
@@ -206 +297 @@
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
+
+
-    return proxy.gc_removeRoot( p );
-}
@@ -213 +314 @@
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
+
+
-    return proxy.gc_removeRange( p );
-}
-
-struct Proxy
-{
-    extern (C) void function() gc_enable;
-    extern (C) void function() gc_disable;
-    extern (C) void function() gc_collect;
-    extern (C) void function() gc_minimize;
-
-    extern (C) uint function(void*) gc_getAttr;
-    extern (C) uint function(void*, uint) gc_setAttr;
-    extern (C) uint function(void*, uint) gc_clrAttr;
-
-    extern (C) void*  function(size_t, uint) gc_malloc;
-    extern (C) void*  function(size_t, uint) gc_calloc;
-    extern (C) void*  function(void*, size_t, uint ba) gc_realloc;
-    extern (C) size_t function(void*, size_t, size_t) gc_extend;
-    extern (C) size_t function(size_t) gc_reserve;
-    extern (C) void   function(void*) gc_free;
-
-    extern (C) void*   function(void*) gc_addrOf;
-    extern (C) size_t  function(void*) gc_sizeOf;
-
-    extern (C) BlkInfo function(void*) gc_query;
-
-    extern (C) void function(void*) gc_addRoot;
-    extern (C) void function(void*, size_t) gc_addRange;
-
-    extern (C) void function(void*) gc_removeRoot;
-    extern (C) void function(void*) gc_removeRange;
-}
-
-Proxy  pthis;
-Proxy* proxy;
-
-static this()
-{
-    pthis.gc_enable = &gc_enable;
-    pthis.gc_disable = &gc_disable;
-    pthis.gc_collect = &gc_collect;
-    pthis.gc_minimize = &gc_minimize;
-
-    pthis.gc_getAttr = &gc_getAttr;
-    pthis.gc_setAttr = &gc_setAttr;
-    pthis.gc_clrAttr = &gc_clrAttr;
-
-    pthis.gc_malloc = &gc_malloc;
-    pthis.gc_calloc = &gc_calloc;
-    pthis.gc_realloc = &gc_realloc;
-    pthis.gc_extend = &gc_extend;
-    pthis.gc_reserve = &gc_reserve;
-    pthis.gc_free = &gc_free;
-
-    pthis.gc_addrOf = &gc_addrOf;
-    pthis.gc_sizeOf = &gc_sizeOf;
-
-    pthis.gc_query = &gc_query;
-
-    pthis.gc_addRoot = &gc_addRoot;
-    pthis.gc_addRange = &gc_addRange;
-
-    pthis.gc_removeRoot = &gc_removeRoot;
-    pthis.gc_removeRange = &gc_removeRange;
-}
-
-extern (C) Proxy* gc_getProxy()
-{
@@ -289 +337 @@
-    if( proxy !is null )
-    {
-error?
+TODO: Decide if this is an error condition.
-    }
-    proxy = p;
-///foreach range
-//proxy.addRange(
-//foreach root
-//proxy.addRoot()
+foreach( r; roots[0 .. nroots] )
+    proxy.gc_addRoot( r 
+foreach( r; ranges[0 .. nranges] )
+    proxy.gc_addRange( r.pos, r.len );
-}
-
-export extern (C) void gc_clrProxy()
-{
-// foreach root
-// proxy.removeRoot(
-// foreach range
-// proxy.removeReange(
+foreach( r; ranges[0 .. nranges] )
+    proxy.gc_removeRange( r.pos 
+foreach( r; roots[0 .. nroots] )
+    proxy.gc_removeRoot( r 
-    proxy = null;
-}

trunk/src/gc/basic/gc.d

@@ -27 +27 @@
-module gc.gc;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-extern (C) void gc_init()
@@ -60 +126 @@
-    //       before its first collection.
-    thread_init();
+    initProxy();
-}
-
@@ -235 +302 @@
-}
-
-struct Proxy
-{
-    extern (C) void function() gc_enable;
-    extern (C) void function() gc_disable;
-    extern (C) void function() gc_collect;
-    extern (C) void function() gc_minimize;
-
-    extern (C) uint function(void*) gc_getAttr;
-    extern (C) uint function(void*, uint) gc_setAttr;
-    extern (C) uint function(void*, uint) gc_clrAttr;
-
-    extern (C) void*  function(size_t, uint) gc_malloc;
-    extern (C) void*  function(size_t, uint) gc_calloc;
-    extern (C) void*  function(void*, size_t, uint ba) gc_realloc;
-    extern (C) size_t function(void*, size_t, size_t) gc_extend;
-    extern (C) size_t function(size_t) gc_reserve;
-    extern (C) void   function(void*) gc_free;
-
-    extern (C) void*   function(void*) gc_addrOf;
-    extern (C) size_t  function(void*) gc_sizeOf;
-
-    extern (C) BlkInfo function(void*) gc_query;
-
-    extern (C) void function(void*) gc_addRoot;
-    extern (C) void function(void*, size_t) gc_addRange;
-
-    extern (C) void function(void*) gc_removeRoot;
-    extern (C) void function(void*) gc_removeRange;
-}
-
-Proxy  pthis;
-Proxy* proxy;
-
-static this()
-{
-    pthis.gc_enable = &gc_enable;
-    pthis.gc_disable = &gc_disable;
-    pthis.gc_collect = &gc_collect;
-    pthis.gc_minimize = &gc_minimize;
-
-    pthis.gc_getAttr = &gc_getAttr;
-    pthis.gc_setAttr = &gc_setAttr;
-    pthis.gc_clrAttr = &gc_clrAttr;
-
-    pthis.gc_malloc = &gc_malloc;
-    pthis.gc_calloc = &gc_calloc;
-    pthis.gc_realloc = &gc_realloc;
-    pthis.gc_extend = &gc_extend;
-    pthis.gc_reserve = &gc_reserve;
-    pthis.gc_free = &gc_free;
-
-    pthis.gc_addrOf = &gc_addrOf;
-    pthis.gc_sizeOf = &gc_sizeOf;
-
-    pthis.gc_query = &gc_query;
-
-    pthis.gc_addRoot = &gc_addRoot;
-    pthis.gc_addRange = &gc_addRange;
-
-    pthis.gc_removeRoot = &gc_removeRoot;
-    pthis.gc_removeRange = &gc_removeRange;
-}
-
-extern (C) Proxy* gc_getProxy()
-{
-    return &pthis;
-}
-
+
-export extern (C) void gc_setProxy( Proxy* p )
-{
@@ -310 +314 @@
-    }
-    proxy = p;
-
+
+
+
+
-}
-
-export extern (C) void gc_clrProxy()
-{
-
+
+
+
+
-    proxy = null;
-}

trunk/src/gc/basic/gcx.d

@@ -1165 +1165 @@
-
-    /**
+     *
+     */
+    int delegate(int delegate(inout void*)) rootIter()
+    {
+        if (!thread_needLock())
+        {
+            return &gcx.rootIter;
+        }
+        else synchronized (gcLock)
+        {
+            return &gcx.rootIter;
+        }
+    }
+
+
+    /**
-     * add range to scan for roots
-     */
@@ -1204 +1220 @@
-        {
-            gcx.removeRange(p);
+        }
+    }
+
+
+    /**
+     *
+     */
+    int delegate(int delegate(inout Range)) rangeIter()
+    {
+        if (!thread_needLock())
+        {
+            return &gcx.rangeIter;
+        }
+        else synchronized (gcLock)
+        {
+            return &gcx.rangeIter;
-        }
-    }
@@ -1574 +1606 @@
-     *
-     */
+    int rootIter(int delegate(inout void*) dg)
+    {
+        int result = 0;
+        for( size_t i = 0; i < nroots; ++i )
+        {
+            result = dg(roots[i]);
+            if (result)
+                break;
+        }
+        return result;
+    }
+
+
+    /**
+     *
+     */
-    void addRange(void *pbot, void *ptop)
-    {
@@ -1621 +1669 @@
-        // other than the one the range was allocated on.
-        //assert(zero);
+    }
+
+
+    /**
+     *
+     */
+    int rangeIter(int delegate(inout Range) dg)
+    {
+        int result = 0;
+        for( size_t i = 0; i < nranges; ++i )
+        {
+            result = dg(ranges[i]);
+            if (result)
+                break;
+        }
+        return result;
-    }
-

trunk/src/gc/stub/gc.d

@@ -21 +21 @@
-module gc.gc;
-
-private import core.stdc.stdlib;
-
-private
-{
+   import core.stdc.stdlib;
+
-   enum BlkAttr : uint
-    {
@@ -42 +42 @@
-    extern (C) void thread_init();
-    extern (C) void onOutOfMemoryError();
+
+    struct Proxy
+    {
+        extern (C) void function() gc_enable;
+        extern (C) void function() gc_disable;
+        extern (C) void function() gc_collect;
+        extern (C) void function() gc_minimize;
+
+        extern (C) uint function(void*) gc_getAttr;
+        extern (C) uint function(void*, uint) gc_setAttr;
+        extern (C) uint function(void*, uint) gc_clrAttr;
+
+        extern (C) void*  function(size_t, uint) gc_malloc;
+        extern (C) void*  function(size_t, uint) gc_calloc;
+        extern (C) void*  function(void*, size_t, uint ba) gc_realloc;
+        extern (C) size_t function(void*, size_t, size_t) gc_extend;
+        extern (C) size_t function(size_t) gc_reserve;
+        extern (C) void   function(void*) gc_free;
+
+        extern (C) void*   function(void*) gc_addrOf;
+        extern (C) size_t  function(void*) gc_sizeOf;
+
+        extern (C) BlkInfo function(void*) gc_query;
+
+        extern (C) void function(void*) gc_addRoot;
+        extern (C) void function(void*, size_t) gc_addRange;
+
+        extern (C) void function(void*) gc_removeRoot;
+        extern (C) void function(void*) gc_removeRange;
+    }
+
+    Proxy  pthis;
+    Proxy* proxy;
+
+    void initProxy()
+    {
+        pthis.gc_enable = &gc_enable;
+        pthis.gc_disable = &gc_disable;
+        pthis.gc_collect = &gc_collect;
+        pthis.gc_minimize = &gc_minimize;
+
+        pthis.gc_getAttr = &gc_getAttr;
+        pthis.gc_setAttr = &gc_setAttr;
+        pthis.gc_clrAttr = &gc_clrAttr;
+
+        pthis.gc_malloc = &gc_malloc;
+        pthis.gc_calloc = &gc_calloc;
+        pthis.gc_realloc = &gc_realloc;
+        pthis.gc_extend = &gc_extend;
+        pthis.gc_reserve = &gc_reserve;
+        pthis.gc_free = &gc_free;
+
+        pthis.gc_addrOf = &gc_addrOf;
+        pthis.gc_sizeOf = &gc_sizeOf;
+
+        pthis.gc_query = &gc_query;
+
+        pthis.gc_addRoot = &gc_addRoot;
+        pthis.gc_addRange = &gc_addRange;
+
+        pthis.gc_removeRoot = &gc_removeRoot;
+        pthis.gc_removeRange = &gc_removeRange;
+    }
+
+    void** roots  = null;
+    size_t nroots = 0;
+
+    struct Range
+    {
+        void*  pos;
+        size_t len;
+    }
+
+    Range* ranges  = null;
+    size_t nranges = 0;
-}
-
@@ -49 +124 @@
-    //       collection, and always before returning from gc_init().
-    thread_init();
+    initProxy();
-}
-
-extern (C) void gc_term()
-{
-
+
+
-}
-
@@ -186 +263 @@
-}
-
-// TODO: Implement range storage.
-// TODO: Implement root storage.
-
-extern (C) void gc_addRoot( void* p )
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
-    return proxy.gc_addRoot( p );
-}
@@ -199 +281 @@
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
+
-    return proxy.gc_addRange( p, sz );
-}
@@ -206 +297 @@
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
+
+
-    return proxy.gc_removeRoot( p );
-}
@@ -213 +314 @@
-{
-    if( proxy is null )
-
+
+
+
+
+
+
+
+
+
+
+
-    return proxy.gc_removeRange( p );
-}
-
-struct Proxy
-{
-    extern (C) void function() gc_enable;
-    extern (C) void function() gc_disable;
-    extern (C) void function() gc_collect;
-    extern (C) void function() gc_minimize;
-
-    extern (C) uint function(void*) gc_getAttr;
-    extern (C) uint function(void*, uint) gc_setAttr;
-    extern (C) uint function(void*, uint) gc_clrAttr;
-
-    extern (C) void*  function(size_t, uint) gc_malloc;
-    extern (C) void*  function(size_t, uint) gc_calloc;
-    extern (C) void*  function(void*, size_t, uint ba) gc_realloc;
-    extern (C) size_t function(void*, size_t, size_t) gc_extend;
-    extern (C) size_t function(size_t) gc_reserve;
-    extern (C) void   function(void*) gc_free;
-
-    extern (C) void*   function(void*) gc_addrOf;
-    extern (C) size_t  function(void*) gc_sizeOf;
-
-    extern (C) BlkInfo function(void*) gc_query;
-
-    extern (C) void function(void*) gc_addRoot;
-    extern (C) void function(void*, size_t) gc_addRange;
-
-    extern (C) void function(void*) gc_removeRoot;
-    extern (C) void function(void*) gc_removeRange;
-}
-
-Proxy  pthis;
-Proxy* proxy;
-
-static this()
-{
-    pthis.gc_enable = &gc_enable;
-    pthis.gc_disable = &gc_disable;
-    pthis.gc_collect = &gc_collect;
-    pthis.gc_minimize = &gc_minimize;
-
-    pthis.gc_getAttr = &gc_getAttr;
-    pthis.gc_setAttr = &gc_setAttr;
-    pthis.gc_clrAttr = &gc_clrAttr;
-
-    pthis.gc_malloc = &gc_malloc;
-    pthis.gc_calloc = &gc_calloc;
-    pthis.gc_realloc = &gc_realloc;
-    pthis.gc_extend = &gc_extend;
-    pthis.gc_reserve = &gc_reserve;
-    pthis.gc_free = &gc_free;
-
-    pthis.gc_addrOf = &gc_addrOf;
-    pthis.gc_sizeOf = &gc_sizeOf;
-
-    pthis.gc_query = &gc_query;
-
-    pthis.gc_addRoot = &gc_addRoot;
-    pthis.gc_addRange = &gc_addRange;
-
-    pthis.gc_removeRoot = &gc_removeRoot;
-    pthis.gc_removeRange = &gc_removeRange;
-}
-
-extern (C) Proxy* gc_getProxy()
-{
@@ -289 +337 @@
-    if( proxy !is null )
-    {
-error?
+TODO: Decide if this is an error condition.
-    }
-    proxy = p;
-///foreach range
-//proxy.addRange(
-//foreach root
-//proxy.addRoot()
+foreach( r; roots[0 .. nroots] )
+    proxy.gc_addRoot( r 
+foreach( r; ranges[0 .. nranges] )
+    proxy.gc_addRange( r.pos, r.len );
-}
-
-export extern (C) void gc_clrProxy()
-{
-// foreach root
-// proxy.removeRoot(
-// foreach range
-// proxy.removeReange(
+foreach( r; ranges[0 .. nranges] )
+    proxy.gc_removeRange( r.pos 
+foreach( r; roots[0 .. nroots] )
+    proxy.gc_removeRoot( r 
-    proxy = null;
-}