From 2f0f67515999c7df5da858b1803fa17c62df187b Mon Sep 17 00:00:00 2001
From: CPunch <sethtstubbs@gmail.com>
Date: Fri, 25 Aug 2023 20:44:24 -0500
Subject: [PATCH] more debug related refactoring

---
 src/cmem.c   | 12 ++++++++++--
 src/cobj.c   |  6 ++----
 src/cstate.c | 22 ++++++++++++++--------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/cmem.c b/src/cmem.c
index efab5fc..d3427d4 100644
--- a/src/cmem.c
+++ b/src/cmem.c
@@ -11,17 +11,20 @@
 void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize)
 {
 #ifdef GC_DEBUG
+    printf("old allocated bytes: %ld\n", state->allocatedBytes);
     if (buf) {
         if (newSize == 0) {
             printf("freeing %p, reclaiming %ld bytes...\n", buf, oldSize);
         } else {
             printf("realloc %p, byte difference: %ld\n", buf, newSize - oldSize);
         }
-    } else {
-        printf("allocating new buffer of size %ld\n", newSize - oldSize);
     }
 #endif
     state->allocatedBytes += newSize - oldSize;
+#ifdef GC_DEBUG
+    printf("new allocated bytes: %ld\n", state->allocatedBytes);
+    fflush(stdout);
+#endif
 
     if (newSize == 0) { // it needs to be freed
         free(buf);
@@ -44,6 +47,11 @@ void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize
     // if NULL is passed, realloc() acts like malloc()
     void *newBuf = realloc(buf, newSize);
 
+#ifdef GC_DEBUG
+    printf("allocating new buffer of size %ld at %p\n", newSize - oldSize, newBuf);
+    fflush(stdout);
+#endif
+
     if (newBuf == NULL) {
         CERROR("failed to allocate memory!");
         exit(1);
diff --git a/src/cobj.c b/src/cobj.c
index 7ec281e..75afbe8 100644
--- a/src/cobj.c
+++ b/src/cobj.c
@@ -33,7 +33,7 @@ CObj *cosmoO_allocateBase(CState *state, size_t sz, CObjType type)
 
     obj->nextRoot = NULL;
 #ifdef GC_DEBUG
-    printf("allocated %p with OBJ_TYPE %d\n", obj, type);
+    printf("allocated %s %p\n", cosmoO_typeStr(obj), obj);
 #endif
     return obj;
 }
@@ -41,9 +41,7 @@ CObj *cosmoO_allocateBase(CState *state, size_t sz, CObjType type)
 void cosmoO_free(CState *state, CObj *obj)
 {
 #ifdef GC_DEBUG
-    printf("freeing %p [", obj);
-    printObject(obj);
-    printf("]\n");
+    printf("freeing %s %p\n", cosmoO_typeStr(obj), obj);
 #endif
     switch (obj->type) {
     case COBJ_STRING: {
diff --git a/src/cstate.c b/src/cstate.c
index dc4d980..fbe704e 100644
--- a/src/cstate.c
+++ b/src/cstate.c
@@ -26,7 +26,7 @@ CState *cosmoV_newState()
     state->grayStack.count = 0;
     state->grayStack.capacity = 2;
     state->grayStack.array = NULL;
-    state->allocatedBytes = sizeof(CState);
+    state->allocatedBytes = 0;
     state->nextGC = 1024 * 8; // threshhold starts at 8kb
 
     // init stack
@@ -86,6 +86,12 @@ void cosmoV_freeState(CState *state)
     CObj *objs = state->objects;
     while (objs != NULL) {
         CObj *next = objs->next;
+
+#ifdef GC_DEBUG
+        printf("STATE FREEING %p\n", objs);
+        fflush(stdout);
+#endif
+
         cosmoO_free(state, objs);
         objs = next;
     }
@@ -100,13 +106,13 @@ void cosmoV_freeState(CState *state)
     // free our gray stack & finally free the state structure
     cosmoM_freearray(state, CObj *, state->grayStack.array, state->grayStack.capacity);
 
-    // TODO: yeah idk, it looks like im missing 520 bytes somewhere? i'll look into it later
-    /*#ifdef GC_DEBUG
-        if (state->allocatedBytes != sizeof(CState)) {
-            printf("state->allocatedBytes doesn't match expected value (%lu), got %lu!",
-    sizeof(CState), state->allocatedBytes); exit(0);
-        }
-    #endif*/
+    // TODO: yeah idk, it looks like im missing 688 bytes somewhere? i'll look into it later
+#ifdef GC_DEBUG
+    if (state->allocatedBytes != 0) {
+        printf("state->allocatedBytes doesn't match, got %lu\n", state->allocatedBytes);
+    }
+#endif
+
     free(state);
 }