From 899e718a0b1d44ef9cf357d1934bd76e5860bd9c Mon Sep 17 00:00:00 2001
From: Banks Troutman <btrout.dhrs@gmail.com>
Date: Sun, 1 Dec 2019 13:29:23 -0500
Subject: [PATCH] Add timed garbage collection to MemoryManager

---
 .../chameleonvision/util/MemoryManager.java   | 82 ++++++++++++-------
 1 file changed, 51 insertions(+), 31 deletions(-)

diff --git a/chameleon-server/src/main/java/com/chameleonvision/util/MemoryManager.java b/chameleon-server/src/main/java/com/chameleonvision/util/MemoryManager.java
index 20bfd0425..b48cc20ad 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/util/MemoryManager.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/util/MemoryManager.java
@@ -2,45 +2,65 @@ package com.chameleonvision.util;
 
 public class MemoryManager {
 
-	private static final long MEGABYTE_FACTOR = 1024L * 1024L;
+    private static final long MEGABYTE_FACTOR = 1024L * 1024L;
 
-	private int collectionThreshold;
-	private int lastUsedMb = 0;
+    private int collectionThreshold;
+    private long collectionPeriodMillis = -1;
 
-	public MemoryManager(int collectionThreshold) {
-		this.collectionThreshold = collectionThreshold;
-	}
+    private double lastUsedMb = 0;
+    private long lastCollectionMillis = 0;
 
-	public void setCollectionThreshold(int collectionThreshold) {
-		this.collectionThreshold = collectionThreshold;
-	}
+    public MemoryManager(int collectionThreshold) {
+        this.collectionThreshold = collectionThreshold;
+    }
 
-	public static long getUsedMemory() {
-		return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
-	}
+    public MemoryManager(int collectionThreshold, long collectionPeriodMillis) {
+        this.collectionThreshold = collectionThreshold;
+        this.collectionPeriodMillis = collectionPeriodMillis;
+    }
 
-	public static int getUsedMemoryMB() {
-		return (int) (getUsedMemory() / MEGABYTE_FACTOR);
-	}
+    public void setCollectionThreshold(int collectionThreshold) {
+        this.collectionThreshold = collectionThreshold;
+    }
 
-	private static void collect() {
-		System.gc();
-		System.runFinalization();
-	}
+    public void setCollectionPeriodMillis(long collectionPeriodMillis) {
+        this.collectionPeriodMillis = collectionPeriodMillis;
+    }
 
-	public void run() { run(false); }
+    private static long getUsedMemory() {
+        return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+    }
 
-	public void run(boolean print) {
-		var usedMem = getUsedMemoryMB();
+    private static double getUsedMemoryMB() {
+        return ((double) getUsedMemory() / MEGABYTE_FACTOR);
+    }
 
-		if (usedMem != lastUsedMb) {
-			lastUsedMb = usedMem;
-			if (print) System.out.printf("Memory usage: %dMB\n", usedMem);
-		}
+    private void collect() {
+        System.gc();
+        System.runFinalization();
+    }
 
-		if (usedMem >= collectionThreshold) {
-			collect();
-			if (print) System.out.printf("Garbage collected at %dMB\n", usedMem);
-		}
-	}
+    public void run() {
+        run(false);
+    }
+
+    public void run(boolean print) {
+        var usedMem = getUsedMemoryMB();
+
+        if (usedMem != lastUsedMb) {
+            lastUsedMb = usedMem;
+            if (print) System.out.printf("Memory usage: %.2fMB\n", usedMem);
+        }
+
+        boolean collectionThresholdPassed = usedMem >= collectionThreshold;
+        boolean collectionPeriodPassed = collectionPeriodMillis != -1 && (System.currentTimeMillis() - lastCollectionMillis >= collectionPeriodMillis);
+
+        if (collectionThresholdPassed || collectionPeriodPassed) {
+            collect();
+            lastCollectionMillis = System.currentTimeMillis();
+            if (print) {
+                System.out.printf("Garbage collected at %.2fMB\n", usedMem);
+            }
+        }
+    }
 }