* gc.c (MALLOC_DELTA_THRESH): Macro remaned to DFL_MALLOC_DELTA_THRESH.

(opt_gc_delta): New global variable.
(make_obj): Use opt_gc_delta rather than MALLOC_DELTA_THRESH.
(gc_set_delta, gc_wrap): New static functions.
(gc_late_init): New function.

* gc.h (gc_late_init): Declared.

* genvim.txr: scan gc.c also.

* lib.c (init): call gc_late_init.

* txr.1: Document new --gc-delta option and the functions
gc and gc-set-delta.

* txr.c (help): Help text for --gc-delta.
(txr_main): Parse --gc-delta option.

* txr.h (opt_gc_delta): Declared.

1 files changed, 23 insertions, 3 deletions

diff --git a/gc.c b/gc.c
index 3143530a..516ba6d6 100644
--- a/gc.c
+++ b/gc.c
@@ -40,6 +40,7 @@
 #include "stream.h"
 #include "hash.h"
 #include "txr.h"
+#include "eval.h"
 #include "gc.h"
 #include "signal.h"
 
@@ -49,7 +50,7 @@
 #define MUTOBJ_VEC_SIZE         (HEAP_SIZE / 4)
 #define FULL_GC_INTERVAL        40
 #define FRESHOBJ_VEC_SIZE       (8 * HEAP_SIZE)
-#define MALLOC_DELTA_THRESH     (64L * 1024 * 1024)
+#define DFL_MALLOC_DELTA_THRESH (64L * 1024 * 1024)
 
 typedef struct heap {
   struct heap *next;
@@ -78,6 +79,7 @@ static val heap_min_bound, heap_max_bound;
 
 alloc_bytes_t gc_bytes;
 static alloc_bytes_t prev_malloc_bytes;
+alloc_bytes_t opt_gc_delta = DFL_MALLOC_DELTA_THRESH;
 
 int gc_enabled = 1;
 
@@ -160,14 +162,14 @@ val make_obj(void)
 
 #if CONFIG_GEN_GC
   if (opt_gc_debug || freshobj_idx >= FRESHOBJ_VEC_SIZE ||
-      malloc_delta >= MALLOC_DELTA_THRESH)
+      malloc_delta >= opt_gc_delta)
   {
     gc();
     assert (freshobj_idx < FRESHOBJ_VEC_SIZE);
     prev_malloc_bytes = malloc_bytes;
   }
 #else
-  if (opt_gc_debug || malloc_delta >= MALLOC_DELTA_THRESH) {
+  if (opt_gc_debug || malloc_delta >= opt_gc_delta) {
     gc();
     prev_malloc_bytes = malloc_bytes;
   }
@@ -670,6 +672,24 @@ val gc_push(val obj, loc plist)
 
 #endif
 
+static val gc_set_delta(val delta)
+{
+  opt_gc_delta = c_num(delta);
+  return nil;
+}
+
+static val gc_wrap(void)
+{
+  gc();
+  return nil;
+}
+
+void gc_late_init(void)
+{
+  reg_fun(intern(lit("gc"), system_package), func_n0(gc_wrap));
+  reg_fun(intern(lit("gc-set-delta"), system_package), func_n1(gc_set_delta));
+}
+
 /*
  * Useful functions for gdb'ing.
  */