Changeset 513

Timestamp:

01/16/11 07:14:56 (14 years ago)

Author:

walter

Message:

add gc_isCollecting

Files:

• trunk/src/gcstub/gc.d (modified) (5 diffs)

trunk/src/gcstub/gc.d

@@ -21 +21 @@
-/*          Copyright Sean Kelly 2005 - 2009.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE_1_0.txt or copy at
- *          http://www.boost.org/LICENSE_1_0.txt)
- */
-module gc.gc;
-
-private
-{
-   import core.stdc.stdlib;
+   import core.stdc.stdio;
-
-   enum BlkAttr : uint
-    {
-        FINALIZE    = 0b0000_0001,
-        NO_SCAN     = 0b0000_0010,
-        NO_MOVE     = 0b0000_0100,
-        APPENDABLE  = 0b0000_1000,
-        ALL_BITS    = 0b1111_1111
-    }
-
@@ -48 +49 @@
-    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) bool function(void*) gc_isCollecting;
-        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) BlkInfo function(size_t, uint) gc_qalloc;
-        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;
@@ -82 +84 @@
-    __gshared Proxy  pthis;
-    __gshared 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_isCollecting = &gc_isCollecting;
-        pthis.gc_getAttr = &gc_getAttr;
-        pthis.gc_setAttr = &gc_setAttr;
-        pthis.gc_clrAttr = &gc_clrAttr;
-
-        pthis.gc_malloc = &gc_malloc;
-        pthis.gc_qalloc = &gc_qalloc;
-        pthis.gc_calloc = &gc_calloc;
-        pthis.gc_realloc = &gc_realloc;
-        pthis.gc_extend = &gc_extend;
-        pthis.gc_reserve = &gc_reserve;
@@ -161 +164 @@
-    return proxy.gc_collect();
-}
-
-extern (C) void gc_minimize()
-{
-    if( proxy is null )
-        return;
-    return proxy.gc_minimize();
-}
-
+extern (C) bool gc_isCollecting( void* p )
+{
+    if( proxy is null )
+        return false;
+    return proxy.gc_isCollecting( p );
+}
+
-extern (C) uint gc_getAttr( void* p )
-{
-    if( proxy is null )
-        return 0;
-    return proxy.gc_getAttr( p );
-}
-
-extern (C) uint gc_setAttr( void* p, uint a )
-{
-    if( proxy is null )
@@ -286 +296 @@
-extern (C) void gc_addRoot( void* p )
-{
-    if( proxy is null )
-    {
-        void** r = cast(void**) realloc( roots,
-                                         (nroots+1) * roots[0].sizeof );
-        if( r is null )
-            onOutOfMemoryError();
-        r[nroots++] = p;
-        roots = r;
-
+
-    }
-    return proxy.gc_addRoot( p );
-}
-
-extern (C) void gc_addRange( void* p, size_t sz )
-{
+    //printf("gcstub::gc_addRange() proxy = %p\n", proxy);
-    if( proxy is null )
-    {
-        Range* r = cast(Range*) realloc( ranges,
-                                         (nranges+1) * ranges[0].sizeof );
-        if( r is null )
-            onOutOfMemoryError();
-        r[nranges].pos = p;
-        r[nranges].len = sz;
-        ranges = r;
-        ++nranges;
+    assert(0);  // fix
-    }
-    return proxy.gc_addRange( p, sz );
-}
-
-extern (C) void gc_removeRoot( void *p )
-{
-    if( proxy is null )
-    {
-        for( size_t i = 0; i < nroots; ++i )
-        {