Changeset 637Tweet

Timestamp:

May 11, 2011, 1:26:19 AM (9 years ago)

Author:

Sam Hocevar

Message:

lisp: count how deep the garbage collector and the evaluator recurse. The
values are unused for now.

Location:

abuse/trunk/src/lisp

Files:

• lisp.cpp (modified) (3 diffs)
• lisp_gc.cpp (modified) (6 diffs)

abuse/trunk/src/lisp/lisp.cpp

@@ -54 +54 @@
 int print_level = 0, trace_level = 0, trace_print_level = 1000;
 int total_user_functions;
+static int evaldepth = 0, maxevaldepth = 0;
 
 int break_level=0;
@@ -3055 +3056 @@
     PtrRef ref1(this);
 
+    maxevaldepth = Max(maxevaldepth, ++evaldepth);
+
     int tstart = trace_level;
 
@@ -3120 +3123 @@
   Lisp::CollectSpace(&LSpace::Perm);
   ret=l_user_stack.pop(1);  */
+    --evaldepth;
 
     return ret;

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -16 +16 @@
 #include <string.h>
 
+#include "common.h"
+
 #include "lisp.h"
 #include "lisp_gc.h"
@@ -40 +42 @@
 
 static uint8_t *cstart, *cend, *collected_start, *collected_end;
+static int gcdepth, maxgcdepth;
 
 LArray *Lisp::CollectArray(LArray *x)
@@ -83 +86 @@
 {
     LObject *ret = x;
+
+    maxgcdepth = Max(maxgcdepth, ++gcdepth);
 
     if ((uint8_t *)x >= cstart && (uint8_t *)x < cend)
@@ -169 +174 @@
     }
 
+    --gcdepth;
     return ret;
 }
@@ -207 +213 @@
 void Lisp::CollectSpace(LSpace *which_space, int grow)
 {
-    LSpace *old_space = LSpace::Current;
+    LSpace *sp = LSpace::Current;
+
+    maxgcdepth = gcdepth = 0;
+
     cstart = which_space->m_data;
     cend = which_space->m_free;
-
     LSpace::Gc.m_size = which_space->m_size;
     if (grow)
@@ -227 +235 @@
     CollectStacks();
 
-    // for debuging clear it out
-    memset(which_space->m_data, 0, which_space->m_size);
     free(which_space->m_data);
-
     which_space->m_data = new_data;
     which_space->m_size = LSpace::Gc.m_size;
     which_space->m_free = new_data + (LSpace::Gc.m_free - LSpace::Gc.m_data);
-    LSpace::Current = old_space;
-}
-
+
+    LSpace::Current = sp;
+}
+