Changes in / [3b8e52c:7a5d773]

Location:

src/examples/gc_no_raii

Files:

• containers/vector (added)
• containers/vector.c (added)
• premake4.lua (modified) (2 diffs)
• src/gc.h (modified) (1 diff)
• src/gcpointers.c (modified) (5 diffs)
• src/gcpointers.h (modified) (2 diffs)
• src/internal/collector.c (modified) (2 diffs)
• src/internal/state.h (modified) (2 diffs)
• test/gctest.c (modified) (2 diffs)

src/examples/gc_no_raii/premake4.lua

@@ -6 +6 @@
         "src/",
         "../",
+        "containers/"
 }
 
@@ -48 +49 @@
                 linkoptions (linkOptionList)
                 includedirs (includeDirList)
-                files { "src/**.c" }
+                files { "src/**.c", "containers/**.c" }
 
         configuration "debug"

src/examples/gc_no_raii/src/gc.h

@@ -4 +4 @@
 #include "internal/collector.h"
 
-forall(otype T)
-static inline gcpointer(T) gcmalloc()
-{
-    gcpointer(T) ptr = { gc_allocate(sizeof(T)) };
-    ptr{};
-    gc_conditional_collect();
-    return ptr;
-}
+// forall(otype T)
+// static inline gcpointer(T) gcmalloc()
+// {
+//     gcpointer(T) ptr = { gc_allocate(sizeof(T)) };
+//     ptr{};
+//     gc_conditional_collect();
+//     return ptr;
+// }
 
 forall(otype T)
 static inline void gcmalloc(gcpointer(T)* ptr)
 {
-        ptr{ gc_allocate(sizeof(T)) };
-      (*ptr){};
+        ptr { gc_allocate(sizeof(T)) };
+        get(ptr) {};
       gc_conditional_collect();
 }

src/examples/gc_no_raii/src/gcpointers.c

@@ -42 +42 @@
 }
 
-void gcpointer_ctor(gcpointer_t* this)
+void ?{}(gcpointer_t* this)
 {
         this->ptr = (intptr_t)NULL;
@@ -48 +48 @@
 }
 
-void gcpointer_ctor(gcpointer_t* this, void* address)
+void ?{}(gcpointer_t* this, void* address)
 {
         this->ptr = (intptr_t)address;
@@ -56 +56 @@
 }
 
-void gcpointer_ctor(gcpointer_t* this, gcpointer_t* other)
+void ?{}(gcpointer_t* this, gcpointer_t other)
 {
-        this->ptr = other->ptr;
+        this->ptr = other.ptr;
         this->next = NULL;
 
@@ -64 +64 @@
 }
 
-void gcpointer_dtor(gcpointer_t* this)
+void ^?{}(gcpointer_t* this)
 {
         unregister_ptr(this);
@@ -98 +98 @@
         return this->ptr == (intptr_t)NULL;
 }
+
+forall(otype T) void ?{}(gcpointer(T)* this) {
+        (&this->internal) {};
+}
+
+forall(otype T) void ?{}(gcpointer(T)* this, void* address) {
+        (&this->internal) { address };
+}
+
+forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T)* other) {
+        (&this->internal) { other->internal };
+}
+
+forall(otype T) void ^?{}(gcpointer(T)* this) {
+        ^?{}(&this->internal);
+}
+
+// forall(otype T) gcpointer(T) ?=?(gcpointer(T) this, gcpointer(T) rhs);
+//
+// forall(otype T) T *?(gcpointer(T) this);
+
+forall(otype T) T* get(gcpointer(T)* this) {
+        return (T*)this->internal.ptr;
+}
+//
+// //Logical operators
+// forall(otype T) int ?!=?(gcpointer(T) this, gcpointer(T) rhs);
+// forall(otype T) int ?==?(gcpointer(T) this, gcpointer(T) rhs);

src/examples/gc_no_raii/src/gcpointers.h

@@ -30 +30 @@
 forall(otype T) void ?{}(gcpointer(T)* this);
 forall(otype T) void ?{}(gcpointer(T)* this, void* address);
-forall(otype T) void ctor(gcpointer(T)* this, void* address);
 forall(otype T) void ?{}(gcpointer(T)* this, gcpointer(T)* other);
 forall(otype T) void ^?{}(gcpointer(T)* this);
@@ -37 +36 @@
 
 forall(otype T) T *?(gcpointer(T) this);
+forall(otype T) T* get(gcpointer(T)* this);
 
 //Logical operators

src/examples/gc_no_raii/src/internal/collector.c

@@ -8 +8 @@
 }
 #endif
+
+#include <fstream>
 
 #include "state.h"
@@ -36 +38 @@
 void* gc_allocate(size_t target_size)
 {
+        sout | "Allocating " | target_size | " bytes" | endl;
+
         size_t size = gc_compute_size(target_size + sizeof(gc_object_header));
+
+        sout | "Object header size: " | sizeof(gc_object_header) | " bytes" | endl;
+        sout | "Actual allocation size: " | size | " bytes" | endl;
 
         check(size < POOL_SIZE_BYTES);

src/examples/gc_no_raii/src/internal/state.h

@@ -9 +9 @@
 }
 #endif
+#include <fstream>
 #include <vector>
 
@@ -37 +38 @@
 static inline bool gc_needs_collect(gc_state* state)
 {
+        sout | "Used Space: " | state->used_space | " bytes" | endl;
         return state->used_space * 2 > state->total_space;
 }

src/examples/gc_no_raii/test/gctest.c

@@ -2 +2 @@
 
 #include "gc.h"
+#include "internal/collector.h"
 
 #warning default test
@@ -8 +9 @@
         sout | "Bonjour au monde!\n";
 
-        for(int i = 0; i < 1000000; i++) {
-                gcpointer(int) anInt;
-                gcmalloc(&anInt);
+        gcpointer(int) theInt;
+        gcmalloc(&theInt);
+
+        for(int i = 0; i < 10; i++) {
+                int a;
+                {
+                        gcpointer(int) anInt;
+                        gcmalloc(&anInt);
+                }
+                int p;
         }
+
+        gc_collect(gc_get_state());
+        gc_conditional_collect();
 }