Change a few things in collection heuristics, there may be some time/memory regressions. Repair finalizer timing in GC_FINAL_STATS

Author: carnaval

base/base.jl

@@ -149,7 +149,7 @@ end
 
 finalize(o::ANY) = ccall(:jl_finalize, Void, (Any,), o)
 
-gc() = ccall(:jl_gc_collect, Void, ())
+gc(full = true) = ccall(:jl_gc_collect, Void, (Int,), full ? 1 : 0)
 gc_enable() = ccall(:jl_gc_enable, Void, ())
 gc_disable() = ccall(:jl_gc_disable, Void, ())
 

src/dump.c

@@ -1339,8 +1339,8 @@ extern jl_array_t *jl_module_init_order;
 
 DLLEXPORT void jl_save_system_image(char *fname)
 {
-    jl_gc_collect();
-    jl_gc_collect();
+    jl_gc_collect(1);
+    jl_gc_collect(0);
     int en = jl_gc_is_enabled();
     jl_gc_disable();
     htable_reset(&backref_table, 250000);

src/gc.c

@@ -521,7 +521,7 @@ static inline void free_page(void *p)
 static inline int maybe_collect(void)
 {
     if (should_collect()) {
-        jl_gc_collect();
+        jl_gc_collect(0);
         return 1;
     }
     return 0;
@@ -957,7 +957,7 @@ static inline  void *__pool_alloc(pool_t* p, int osize, int end_offset)
     gcval_t *v, *end;
     if (__unlikely((allocd_bytes += osize) >= 0)) {
         //        allocd_bytes -= osize;
-        jl_gc_collect();
+        jl_gc_collect(0);
         //        allocd_bytes += osize;
     }
     v = p->freelist;
@@ -2047,7 +2047,7 @@ static void clear_mark(int);
 #endif
 
 
-void jl_gc_collect(void)
+void jl_gc_collect(int full)
 {
     if (!is_gc_enabled) return;
     if (jl_in_gc) return;
@@ -2142,12 +2142,12 @@ void jl_gc_collect(void)
         int64_t actual_allocd = allocd_bytes_since_sweep;
         if (!sweeping) {
             // marking is over
-#ifdef GC_TIME
+#if defined(GC_TIME) || defined(GC_FINAL_STATS)
             post_time = jl_hrtime();
 #endif
             // 4. check for objects to finalize
             post_mark();
-#ifdef GC_TIME
+#if defined(GC_TIME) || defined(GC_FINAL_STATS)
             post_time = jl_hrtime() - post_time;
 #endif
             estimate_freed = live_bytes - scanned_bytes - perm_scanned_bytes + actual_allocd;
@@ -2168,16 +2168,22 @@ void jl_gc_collect(void)
             total_allocd_bytes += allocd_bytes_since_sweep;
 
             // 5. next collection decision
-            if ((estimate_freed <= 1024 || estimate_freed < (7*(actual_allocd/10))) && n_pause > 1) {
-                if (collect_interval <= 2*(max_collect_interval/5)) {
-                    collect_interval = 5*(collect_interval/2);
+            int not_freed_enough = estimate_freed < (7*(actual_allocd/10));
+            if ((full || quick_count >= 128 || not_freed_enough) && n_pause > 1) {
+                if (prev_sweep_mask != GC_MARKED || full) {
+                    if (full) recollect = 1; // TODO enable this?
                 }
-                sweep_mask = GC_MARKED;
-                if (prev_sweep_mask != GC_MARKED) {
-                    //recollect = 1; // TODO enable this
+                if (not_freed_enough) {
+                    if (collect_interval < default_collect_interval)
+                        collect_interval = default_collect_interval;
+                    else if (collect_interval <= 2*(max_collect_interval/5)) {
+                        collect_interval = 5*(collect_interval/2);
+                    }
                 }
+                sweep_mask = GC_MARKED;
+                quick_count = 0;
             } else {
-                collect_interval = default_collect_interval;
+                collect_interval = default_collect_interval/8;
                 sweep_mask = GC_MARKED_NOESC;
             }
             if (sweep_mask == GC_MARKED)
@@ -2260,7 +2266,7 @@ void jl_gc_collect(void)
     }
 #endif
     if (recollect)
-        jl_gc_collect();
+        jl_gc_collect(0);
 }
 
 #if 0
@@ -2323,7 +2329,7 @@ void jl_gc_collect(void)
         // if a lot of objects were finalized, re-run GC to finish freeing
         // their storage if possible.
         if (nfinal > 100000)
-            jl_gc_collect();
+            jl_gc_collect(0);
     }
 }
 

src/julia.h

@@ -1079,7 +1079,7 @@ DLLEXPORT int64_t jl_gc_total_bytes(void);
 DLLEXPORT uint64_t jl_gc_total_hrtime(void);
 int64_t diff_gc_total_bytes(void);
 void sync_gc_total_bytes(void);
-DLLEXPORT void jl_gc_collect(void);
+DLLEXPORT void jl_gc_collect(int full);
 void jl_gc_preserve(jl_value_t *v);
 void jl_gc_unpreserve(void);
 int jl_gc_n_preserved_values(void);