Use a function to round up sizes to PAGESIZE

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

diff --git a/rt/gc/cdgc/opts.d b/rt/gc/cdgc/opts.d
index 6e936229bd6fce641ca508cff8d3047daa08fe5c..5f93cd039941314927806c8fb19e2eeb3a0230ba 100644 (file)
--- a/rt/gc/cdgc/opts.d
+++ b/rt/gc/cdgc/opts.d
@@ -35,6 +35,7 @@ module rt.gc.cdgc.opts;
 
 import cstdlib = tango.stdc.stdlib;
 import cstring = tango.stdc.string;
 
 import cstdlib = tango.stdc.stdlib;
 import cstring = tango.stdc.string;

+import cerrno = tango.stdc.errno;

 
 
 private:
 
 
 private:


@@ -51,50 +52,86 @@ struct Options
     char[MAX_OPT_LEN] collect_stats_file = "";
     bool sentinel = false;
     bool mem_stomp = false;
     char[MAX_OPT_LEN] collect_stats_file = "";
     bool sentinel = false;
     bool mem_stomp = false;

+    bool conservative = false;
+    bool fork = true;
+    bool eager_alloc = true;
+    size_t prealloc_psize = 0;
+    size_t prealloc_npools = 0;

 }
 
 package Options options;
 
 
 }
 
 package Options options;
 
 

+bool cstr_eq(char* s1, char* s2)
+{
+    return cstring.strcmp(s1, s2) == 0;
+}
+
+
+bool parse_bool(char* value)
+{
+    if (value[0] == '\0')
+        return true;
+    return (cstdlib.atoi(value) != 0);
+}
+
+
+void parse_prealloc(char* value)
+{
+    char* end;
+    cerrno.errno = 0;
+    long size = cstdlib.strtol(value, &end, 10);
+    if (end == value || cerrno.errno) // error parsing
+        return;
+    size *= 1024 * 1024; // size is supposed to be in MiB
+    long npools = 1;
+    if (*end == 'x') { // number of pools specified
+        char* start = end + 1;
+        npools = cstdlib.strtol(start, &end, 10);
+        if (*end != '\0' || end == start || cerrno.errno) // error parsing
+            return;
+    }
+    else if (*end != '\0') { // don't accept trailing garbage
+        return;
+    }
+    if (size > 0 && npools > 0) {
+        options.prealloc_psize = size;
+        options.prealloc_npools = npools;
+    }
+}
+
+

 void process_option(char* opt_name, char* opt_value)
 {
 void process_option(char* opt_name, char* opt_value)
 {

-    if (cstring.strcmp(opt_name, "verbose") == 0)
-    {
+    if (cstr_eq(opt_name, "verbose"))

         options.verbose = cstdlib.atoi(opt_value);
         options.verbose = cstdlib.atoi(opt_value);

-    }
-    else if (cstring.strcmp(opt_name, "log_file") == 0)
-    {
+    else if (cstr_eq(opt_name, "log_file"))

         cstring.strcpy(options.log_file.ptr, opt_value);
         cstring.strcpy(options.log_file.ptr, opt_value);

-    }
-    else if (cstring.strcmp(opt_name, "malloc_stats_file") == 0)
-    {
+    else if (cstr_eq(opt_name, "malloc_stats_file"))

         cstring.strcpy(options.malloc_stats_file.ptr, opt_value);
         cstring.strcpy(options.malloc_stats_file.ptr, opt_value);

-    }
-    else if (cstring.strcmp(opt_name, "collect_stats_file") == 0)
-    {
+    else if (cstr_eq(opt_name, "collect_stats_file"))

         cstring.strcpy(options.collect_stats_file.ptr, opt_value);
         cstring.strcpy(options.collect_stats_file.ptr, opt_value);

-    }
-    else if (cstring.strcmp(opt_name, "sentinel") == 0)
-    {
-        if (opt_value[0] == '\0')
-            options.sentinel = true;
-        else
-            options.sentinel = (cstdlib.atoi(opt_value) != 0);
-    }
-    else if (cstring.strcmp(opt_name, "mem_stomp") == 0)
-    {
-        if (opt_value[0] == '\0')
-            options.mem_stomp = true;
-        else
-            options.mem_stomp = (cstdlib.atoi(opt_value) != 0);
-    }
+    else if (cstr_eq(opt_name, "sentinel"))
+        options.sentinel = parse_bool(opt_value);
+    else if (cstr_eq(opt_name, "mem_stomp"))
+        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, "fork"))
+        options.fork = parse_bool(opt_value);
+    else if (cstr_eq(opt_name, "eager_alloc"))
+        options.eager_alloc = parse_bool(opt_value);
+    else if (cstr_eq(opt_name, "pre_alloc"))
+        parse_prealloc(opt_value);

 }
 
 
 package void parse(char* opts_string)
 {
     char[MAX_OPT_LEN] opt_name;
 }
 
 
 package void parse(char* opts_string)
 {
     char[MAX_OPT_LEN] opt_name;

+    opt_name[0] = '\0';

     char[MAX_OPT_LEN] opt_value;
     char[MAX_OPT_LEN] opt_value;

+    opt_value[0] = '\0';

     char* curr = opt_name.ptr;
     size_t i = 0;
     if (opts_string is null)
     char* curr = opt_name.ptr;
     size_t i = 0;
     if (opts_string is null)


@@ -143,27 +180,203 @@ unittest
         assert (log_file[0] == '\0');
         assert (sentinel == false);
         assert (mem_stomp == false);
         assert (log_file[0] == '\0');
         assert (sentinel == false);
         assert (mem_stomp == false);

+        assert (conservative == false);
+        assert (fork == true);
+        assert (eager_alloc == true);
+        assert (prealloc_psize == 0);
+        assert (prealloc_npools == 0);
+    }
+    parse("mem_stomp");
+    with (options) {
+        assert (verbose == 0);
+        assert (log_file[0] == '\0');
+        assert (sentinel == false);
+        assert (mem_stomp == true);
+        assert (conservative == false);
+        assert (fork == true);
+        assert (eager_alloc == true);
+        assert (prealloc_psize == 0);
+        assert (prealloc_npools == 0);

     }
     }

-    parse("mem_stomp=1:verbose=2");
+    parse("mem_stomp=0:verbose=2:conservative:fork=0:eager_alloc=0");

     with (options) {
         assert (verbose == 2);
         assert (log_file[0] == '\0');
         assert (sentinel == false);
     with (options) {
         assert (verbose == 2);
         assert (log_file[0] == '\0');
         assert (sentinel == false);

+        assert (mem_stomp == false);
+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
+        assert (prealloc_psize == 0);
+        assert (prealloc_npools == 0);
+    }
+    parse("log_file=12345 67890:verbose=1:sentinel=4:mem_stomp=1");
+    with (options) {
+        assert (verbose == 1);
+        assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
+        assert (sentinel == true);

         assert (mem_stomp == true);
         assert (mem_stomp == true);

+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
+        assert (prealloc_psize == 0);
+        assert (prealloc_npools == 0);

     }
     }

-    parse("log_file=12345 67890:verbose=1:sentinel=4:mem_stomp=0");
+    parse("pre_alloc");

     with (options) {
         assert (verbose == 1);
         assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
         assert (sentinel == true);
     with (options) {
         assert (verbose == 1);
         assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
         assert (sentinel == true);

-        assert (mem_stomp == false);
+        assert (mem_stomp == true);
+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
+        assert (prealloc_psize == 0);
+        assert (prealloc_npools == 0);
+    }
+    parse("pre_alloc=1");
+    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);
+        assert (prealloc_psize == 1 * 1024 * 1024);
+        assert (prealloc_npools == 1);
+    }
+    parse("pre_alloc=5a");
+    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);
+        assert (prealloc_psize == 1 * 1024 * 1024);
+        assert (prealloc_npools == 1);
+    }
+    parse("pre_alloc=5x");
+    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);
+        assert (prealloc_psize == 1 * 1024 * 1024);
+        assert (prealloc_npools == 1);
+    }
+    parse("pre_alloc=09x010");
+    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);
+        assert (prealloc_psize == 9 * 1024 * 1024);
+        assert (prealloc_npools == 10);
+    }
+    parse("pre_alloc=5x2");
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);
+    }
+    parse("pre_alloc=9x5x");
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);
+    }
+    parse("pre_alloc=9x-5");
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);
+    }
+    parse("pre_alloc=0x3x0x4");
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);

     }
     parse(null);
     with (options) {
         assert (verbose == 1);
         assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
         assert (sentinel == true);
     }
     parse(null);
     with (options) {
         assert (verbose == 1);
         assert (cstring.strcmp(log_file.ptr, "12345 67890".ptr) == 0);
         assert (sentinel == true);

-        assert (mem_stomp == false);
+        assert (mem_stomp == true);
+        assert (conservative == true);
+        assert (fork == false);
+        assert (eager_alloc == false);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);
+    }
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);
+    }
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);
+    }
+    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);
+        assert (prealloc_psize == 5 * 1024 * 1024);
+        assert (prealloc_npools == 2);

     }
 }
 
     }
 }