syncronize contentious gc state

JuliaLang · Sep 3, 2015 · 2fc8d97 · 2fc8d97 · JeffBezanson · Sep 3, 2015
1 parent 3fd7aca
commit 2fc8d97
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/gc.c b/src/gc.c
@@ -33,6 +33,8 @@
 extern "C" {
 #endif
 
+JL_DEFINE_MUTEX(gc)
+
 // manipulating mark bits
 
 #define GC_CLEAN 0 // freshly allocated
@@ -662,6 +664,7 @@ static NOINLINE void *malloc_page(void)
     int i;
     region_t* region;
     int region_i = 0;
+    JL_LOCK(gc);
     while(region_i < REGION_COUNT) {
         region = regions[region_i];
         if (region == NULL) {
@@ -729,6 +732,7 @@ static NOINLINE void *malloc_page(void)
 #endif
     current_pg_count++;
     max_pg_count = max_pg_count < current_pg_count ? current_pg_count : max_pg_count;
+    JL_UNLOCK(gc);
     return ptr;
 }