Changeset a3cbddc80d866383727c108410305366cc2e77ab

Timestamp:

04/03/10 23:34:38 (2 years ago)

Author:

Philip Herron <redbrain@…>

Parents:

6165c39a0d5efebafa91849836d99de5e00fc950

Children:

04f48fcb11b23adb59ed7282d589e53b8676e870

git-committer:

Philip Herron <redbrain@omicron.(none)> / 2010-04-03T23:34:38Z+0100

Message:

garbage collector cleanups

Files:

• src/gg_garbage.c (modified) (4 diffs)

src/gg_garbage.c

@@ -41 +41 @@
 extern crl_table *crl_functors, *crl_rules;
 extern crl_stack *crl_parse_stk, *crl_lex_stack;
+
 // the runtime symbol stack!
 extern crl_context_table *crl_runtime_ctx_table;
-crl_stack* crl_runtime_gbg= NULL;
+static crl_stack* crl_runtime_gbg= NULL;
 
 static void free_hash_table_symbols( crl_table ** );
@@ -51 +52 @@
   if( crl_lex_stack )
     {
-      char * o= crl_stack_pop( crl_lex_stack );
-      while( o )
+      char * o;
+      while( (o= crl_stack_pop( crl_lex_stack )) )
         {
           crl_free( o );
-          o= crl_stack_pop( crl_lex_stack );
         }
       crl_stack_free( crl_lex_stack );
@@ -66 +66 @@
   if( crl_runtime_gbg )
     {
-      crl_debug("garbage collection running...\n");
+      crl_debug("garbage collector running...\n");
       crl_symbol_obj *p_obj;
-      while( (p_obj= crl_stack_pop( crl_runtime_gbg )) )
-        {
-          crl_garbage_free_obj( &p_obj );
-        }
+      unsigned int i = crl_stack_get_size( crl_runtime_gbg );
+      unsigned int idx = 0;
+
+      while( idx < i )
+        {
+          p_obj = (crl_symbol_obj*) crl_runtime_gbg->array[ idx ];
+          crl_debug("deleting object <%p>!\n", (void*)&p_obj );
+          idx++; crl_garbage_free_obj( &p_obj );
+        }
       crl_stack_free( crl_runtime_gbg );
-      crl_runtime_gbg= NULL;
+      crl_runtime_gbg = NULL;
     }
 }
@@ -276 +281 @@
     {
       crl_branch_context *branch= (*ctx);
-      if( branch->return_address )
-        crl_garbage_mark_obj( &(branch->return_address) );
-
+      if( (branch->return_ctx) || (branch->loop_ctx) )
+        {
+          if( branch->return_address )
+            crl_garbage_mark_obj( &(branch->return_address) );
+        }
       if( branch->table )
         crl_garbage_free_hash_table( &(branch->table) );