Pass hard-heap-limit to MMTk

Author: qinsoon

src/gc-mmtk.c

@@ -104,36 +104,46 @@ void jl_gc_init(void) {
     // MMTK_MIN_HSIZE and MMTK_MAX_HSIZE environment variables
     long long min_heap_size;
     long long max_heap_size;
-    char* min_size_def = getenv("MMTK_MIN_HSIZE");
-    char* min_size_gb = getenv("MMTK_MIN_HSIZE_G");
-
-    char* max_size_def = getenv("MMTK_MAX_HSIZE");
-    char* max_size_gb = getenv("MMTK_MAX_HSIZE_G");
-
-    // If min and max values are not specified, set them to 0 here
-    // and use stock heuristics as defined in the binding
-    if (min_size_def != NULL) {
-        char *p;
-        double min_size = strtod(min_size_def, &p);
-        min_heap_size = (long) 1024 * 1024 * min_size;
-    } else if (min_size_gb != NULL) {
-        char *p;
-        double min_size = strtod(min_size_gb, &p);
-        min_heap_size = (long) 1024 * 1024 * 1024 * min_size;
-    } else {
-        min_heap_size = 0;
-    }
 
-    if (max_size_def != NULL) {
-        char *p;
-        double max_size = strtod(max_size_def, &p);
-        max_heap_size = (long) 1024 * 1024 * max_size;
-    } else if (max_size_gb != NULL) {
-        char *p;
-        double max_size = strtod(max_size_gb, &p);
-        max_heap_size = (long) 1024 * 1024 * 1024 * max_size;
+    if (jl_options.hard_heap_limit != 0) {
+        min_heap_size = jl_options.hard_heap_limit;
+        max_heap_size = jl_options.hard_heap_limit;
     } else {
-        max_heap_size = 0;
+        char* min_size_def = getenv("MMTK_MIN_HSIZE");
+        char* min_size_gb = getenv("MMTK_MIN_HSIZE_G");
+        char* max_size_def = getenv("MMTK_MAX_HSIZE");
+        char* max_size_gb = getenv("MMTK_MAX_HSIZE_G");
+
+        // If min and max values are not specified, set them to 0 here
+        // and use stock heuristics as defined in the binding
+        if (min_size_def != NULL) {
+            char *p;
+            double min_size = strtod(min_size_def, &p);
+            min_heap_size = (long) 1024 * 1024 * min_size;
+        } else if (min_size_gb != NULL) {
+            char *p;
+            double min_size = strtod(min_size_gb, &p);
+            min_heap_size = (long) 1024 * 1024 * 1024 * min_size;
+        } else {
+            min_heap_size = 0;
+        }
+
+        if (max_size_def != NULL) {
+            char *p;
+            double max_size = strtod(max_size_def, &p);
+            max_heap_size = (long) 1024 * 1024 * max_size;
+        } else if (max_size_gb != NULL) {
+            char *p;
+            double max_size = strtod(max_size_gb, &p);
+            max_heap_size = (long) 1024 * 1024 * 1024 * max_size;
+        } else {
+            max_heap_size = 0;
+        }
+
+        // if only max size is specified initialize MMTk with a fixed size heap
+        if (max_size_def != NULL || (max_size_gb != NULL && (min_size_def == NULL && min_size_gb == NULL))) {
+            min_heap_size = 0;
+        }
     }
 
     // Assert that the number of stock GC threads is 0; MMTK uses the number of threads in jl_options.ngcthreads
@@ -150,15 +160,10 @@ void jl_gc_init(void) {
 
     mmtk_julia_copy_stack_check(copy_stacks);
 
-    // if only max size is specified initialize MMTk with a fixed size heap
     // TODO: We just assume mark threads means GC threads, and ignore the number of concurrent sweep threads.
     // If the two values are the same, we can use either. Otherwise, we need to be careful.
     uintptr_t gcthreads = jl_options.nmarkthreads;
-    if (max_size_def != NULL || (max_size_gb != NULL && (min_size_def == NULL && min_size_gb == NULL))) {
-        mmtk_gc_init(0, max_heap_size, gcthreads, (sizeof(jl_taggedvalue_t)), jl_buff_tag);
-    } else {
-        mmtk_gc_init(min_heap_size, max_heap_size, gcthreads, (sizeof(jl_taggedvalue_t)), jl_buff_tag);
-    }
+    mmtk_gc_init(min_heap_size, max_heap_size, gcthreads, (sizeof(jl_taggedvalue_t)), jl_buff_tag);
 }
 
 void jl_start_gc_threads(void) {