Remove unneeded static attribute

[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..bb6529a6cf7e4fa5a48ae7bad72b54a91d999e8d 100644 (file)
--- a/rt/gc/cdgc/opts.d
+++ b/rt/gc/cdgc/opts.d
@@ -51,50 +51,51 @@ 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;

 }
 
 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 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);

 }
 
 
 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 +144,39 @@ 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);

     }
     }

-    parse("mem_stomp=1:verbose=2");
+    parse("mem_stomp");

     with (options) {
     with (options) {

-        assert (verbose == 2);
+        assert (verbose == 0);

         assert (log_file[0] == '\0');
         assert (sentinel == false);
         assert (mem_stomp == true);
         assert (log_file[0] == '\0');
         assert (sentinel == false);
         assert (mem_stomp == true);

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

     }
     }

-    parse("log_file=12345 67890:verbose=1:sentinel=4:mem_stomp=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);
     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);

     }
     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);

     }
 }
 
     }
 }