Out of memory crashes - deal with better

ms609 · Jan 21, 2024 · ace82e6 · ace82e6
1 parent 0e8e475
commit ace82e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/big_jobs.php b/big_jobs.php
@@ -29,6 +29,7 @@ function big_jobs_name() : string { // NEVER save this string. Always use this f
 
 /** @param resource $lock_file **/
 function big_jobs_we_died($lock_file) : void {
+  HandleCache::free_memory();
   @fclose($lock_file);
   hard_unlink(big_jobs_name());
 }

diff --git a/expandFns.php b/expandFns.php
@@ -37,15 +37,18 @@ public static function check_memory_use() : void {
 	       2*count(self::$cache_hdl_loc) + // These include a path too
 	       count(self::$cache_hdl_null);
       if ($usage > self::MAX_CACHE_SIZE) {
-	self::$cache_active = [];
-	self::$cache_inactive  = [];
-	self::$cache_good = [];
-	self::$cache_hdl_loc = [];
-	self::$cache_hdl_bad  = self::BAD_DOI_ARRAY;
-	self::$cache_hdl_null = [];
-	gc_collect_cycles();
+	self::free_memory();
       }
   }
+  public static function free_memory() : void {
+      self::$cache_active = [];
+      self::$cache_inactive  = [];
+      self::$cache_good = [];
+      self::$cache_hdl_loc = [];
+      self::$cache_hdl_bad  = self::BAD_DOI_ARRAY;
+      self::$cache_hdl_null = [];
+      gc_collect_cycles();
+  }
 }