Changeset 385c130 for src/examples/gc_no_raii/src/internal/state.c

Timestamp:

Apr 19, 2016, 1:19:25 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9026b4b

Parents:

356bb95

Message:

pre merge

File:

• src/examples/gc_no_raii/src/internal/state.c (modified) (2 diffs)

src/examples/gc_no_raii/src/internal/state.c

@@ -1 +1 @@
 #include "state.h"
 
-// #include <stdlib.h>
-//
-// //general purpouse includes
-// #include "tools.h"
-//
-// //platform abstraction includes
-// #include "allocate-pool.h"
-//
-// //gc internal includes
-// // #include "globals.h"
-// #include "memory_pool.h"
+#include <stdlib.h>
+
+//general purpouse includes
+#include "tools.h"
+
+//platform abstraction includes
+#include "allocate-pool.h"
+
+//gc internal includes
+#include "globals.h"
+#include "memory_pool.h"
 // #include "memory_pool_iterator.h"
-// #include "object_header.h"
-//
-// void swap(gc_state* state);
-// void sweep_roots(worklist_t worklist);
-// void clear(gc_state* state);
-// void calc_usage(gc_state* state);
-//
-// #if DEBUG
-//      bool roots_match(gc_state* state);
-//      bool no_from_space_ref(gc_state* state);
-// #endif
-
-// void gc_state_ctor(gc_state* state)
-// {
-//      state->from_code = 0;
-//      state->to_space = NULL;
-//      state->from_space = NULL;
-//      state->total_space = 0;
-//      state->used_space = 0;
-//      // state->pools_table();
-//
-//      gc_allocate_pool(state);
-//
-//      state->is_initialized = true;
-// }
+#include "object_header.h"
+
+void gc_state_swap(gc_state *const this);
+void gc_state_sweep_roots(gc_state *const this, worklist_t* worklist);
+void gc_state_clear(gc_state *const this);
+void gc_state_calc_usage(gc_state *const this);
+
+#if DEBUG
+        bool gc_state_roots_match(gc_state *const this);
+        bool gc_state_no_from_space_ref(gc_state *const this);
+#endif
+
+gc_state* gc_get_state()
+{
+        static gc_state s;
+        if(!s.is_initialized) gc_state_ctor(&s);
+        return &s;
+}
+
+void gc_state_ctor(gc_state *const this)
+{
+        this->from_code = 0;
+        this->to_space = NULL;
+        this->from_space = NULL;
+        this->total_space = 0;
+        this->used_space = 0;
+        // state->pools_table();
+
+        gc_allocate_pool(this);
+
+        this->is_initialized = true;
+}
 
 // bool state::is_in_heap(void* address) const
@@ -86 +93 @@
 //      return NULL;
 // }
-//
-// void* state::try_allocate(size_t size)
-// {
-//      memory_pool* pool = from_space;
-//      while(pool)
-//      {
-//              if(pool->size_left() > size)
-//              {
-//                      return pool->allocate(size, true);
-//              }
-//              pool = pool->next();
-//      }
-//
-//      return nullptr;
-// }
-//
-// void state::allocate_pool()
-// {
-//      memory_pool* old_from_space = from_space;
-//       memory_pool* old_to_space = to_space;
-//
-//       from_space = reinterpret_cast<memory_pool*>(pal_allocPool(POOL_SIZE_BYTES, 1));
-//       to_space = reinterpret_cast<memory_pool*>(pal_allocPool(POOL_SIZE_BYTES, 1));
-//
-//       new (from_space) memory_pool(POOL_SIZE_BYTES, old_from_space, to_space, from_code);
-//       new (to_space) memory_pool(POOL_SIZE_BYTES, old_to_space, from_space, (~from_code) & 0x01);
-//
-//      total_space += from_space->size();
-//
-//      pools_table.push_back(from_space);
-//      pools_table.push_back(to_space);
-// }
-//
-// void state::collect()
-// {
-//      DEBUG("collecting");
-//      DEBUG("previous usage " << used_space << " / " << total_space);
-//
-//      std::vector<void**> worklist;
-//      sweep_roots(worklist);
-//
-//      while(!worklist.empty())
-//      {
-//              void** ref = worklist.back();
-//              worklist.pop_back();
-//              process_reference(ref, worklist);
-//      }
-//
-//      check(roots_match());
-//      check(no_from_space_ref());
-//
-//      swap();
-//
-//      calc_usage();
-//
-//      if(needs_collect()) allocate_pool();
-//
-//      DEBUG("done");
-// }
+
+void* gc_state_try_allocate(gc_state *const this, size_t size)
+{
+        gc_memory_pool* pool = this->from_space;
+        while(pool != (gc_memory_pool*)0)
+        {
+                if(gc_pool_size_left(pool) > size)
+                {
+                        return gc_pool_allocate(pool, size, true);
+                }
+                pool = pool->next;
+        }
+
+        return (void*)0;
+}
+
+void gc_state_allocate_pool(gc_state *const this)
+{
+        gc_memory_pool* old_from_space = this->from_space;
+      gc_memory_pool* old_to_space = this->to_space;
+
+      this->from_space = (gc_memory_pool*)(pal_allocPool(POOL_SIZE_BYTES, 1));
+      this->to_space = (gc_memory_pool*)(pal_allocPool(POOL_SIZE_BYTES, 1));
+
+      gc_memory_pool_ctor(this->from_space, POOL_SIZE_BYTES, old_from_space, this->to_space,   this->from_code);
+      gc_memory_pool_ctor(this->to_space,   POOL_SIZE_BYTES, old_to_space,   this->from_space, (~this->from_code) & 0x01);
+
+        this->total_space += gc_pool_size_used(this->from_space);
+
+        // pools_table.push_back(from_space);
+        // pools_table.push_back(to_space);
+}
+
+void gc_state_collect(gc_state *const this)
+{
+        // DEBUG("collecting");
+        // DEBUG("previous usage " << this->used_space << " / " << this->total_space);
+
+        worklist_t worklist;
+        // vector_ctor(&worklist);
+        gc_state_sweep_roots(this, &worklist);
+
+        while(!empty(&worklist))
+        {
+                void** ref = back(&worklist);
+                pop_back(&worklist);
+                gc_state_process_reference(this, ref, &worklist);
+        }
+        //
+        // check(gc_state_roots_match(this));
+        // check(gc_state_no_from_space_ref(this));
+        //
+        // gc_state_swap(this);
+        //
+        // gc_state_calc_usage(this);
+        //
+        // if(gc_state_needs_collect(this)) gc_state_allocate_pool(this);
+
+        // DEBUG("done");
+        // dtor(&worklist);
+}
 //
 // void state::swap()