Change 'no_fork' option to 'fork'

[software/dgc/cdgc.git] / rt / gc / cdgc / opts.d

diff --git a/rt/gc/cdgc/opts.d b/rt/gc/cdgc/opts.d
index 728119fdd9bc88dae6a9fade30f37a77fbf98343..97414bd529c42c0eb7522684dd97882b6e525fde 100644 (file)
--- a/rt/gc/cdgc/opts.d
+++ b/rt/gc/cdgc/opts.d
@@ -53,6 +53,7 @@ struct Options
     bool mem_stomp = false;
     bool conservative = false;
     bool fork = true;
+    bool eager_alloc = true;
 }
 
 package Options options;
@@ -88,8 +89,10 @@ void process_option(char* opt_name, char* opt_value)
         options.mem_stomp = parse_bool(opt_value);
     else if (cstr_eq(opt_name, "conservative"))
         options.conservative = parse_bool(opt_value);
-    else if (cstr_eq(opt_name, "no_fork"))
-        options.fork = !parse_bool(opt_value);
+    else if (cstr_eq(opt_name, "fork"))
+        options.fork = parse_bool(opt_value);
+    else if (cstr_eq(opt_name, "eager_alloc"))
+        options.eager_alloc = parse_bool(opt_value);
 }
 
 
@@ -149,6 +152,7 @@ unittest
         assert (mem_stomp == false);
         assert (conservative == false);
         assert (fork == true);
+        assert (eager_alloc == true);
     }
     parse("mem_stomp");
     with (options) {
@@ -158,8 +162,9 @@ unittest
         assert (mem_stomp == true);
         assert (conservative == false);
         assert (fork == true);
+        assert (eager_alloc == true);
     }
-    parse("mem_stomp=0:verbose=2:conservative:no_fork=10");
+    parse("mem_stomp=0:verbose=2:conservative:fork=0:eager_alloc=0");
     with (options) {
         assert (verbose == 2);
         assert (log_file[0] == '\0');
@@ -167,6 +172,7 @@ unittest
         assert (mem_stomp == false);
         assert (conservative == true);
         assert (fork == false);
+        assert (eager_alloc == false);
     }
     parse("log_file=12345 67890:verbose=1:sentinel=4:mem_stomp=1");
     with (options) {
@@ -176,6 +182,7 @@ unittest
         assert (mem_stomp == true);
         assert (conservative == true);
         assert (fork == false);
+        assert (eager_alloc == false);
     }
     parse(null);
     with (options) {
@@ -185,6 +192,37 @@ unittest
         assert (mem_stomp == true);
         assert (conservative == true);
         assert (fork == false);
+        assert (eager_alloc == false);
+    }
+    parse("");
+    with (options) {
+        assert (verbose == 1);
+        assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
+        assert (sentinel == true);
+        assert (mem_stomp == true);
+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
+    }
+    parse(":");
+    with (options) {
+        assert (verbose == 1);
+        assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
+        assert (sentinel == true);
+        assert (mem_stomp == true);
+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
+    }
+    parse("::::");
+    with (options) {
+        assert (verbose == 1);
+        assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
+        assert (sentinel == true);
+        assert (mem_stomp == true);
+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
     }
 }