Squashed commit of the following:

commit d837337 Merge: 1a56a3b c474ee8 Author: Martin K. Scherer <[email protected]> Date: Mon Nov 18 08:34:35 2024 +0100 Merge pull request #1235 from Thrameos/win_gc Fix for GC on windows commit c474ee8 Author: Karl Nelson <[email protected]> Date: Sun Nov 17 20:25:19 2024 -0800 Fix tab/spaces commit 3d2577a Author: Karl Nelson <[email protected]> Date: Sat Nov 16 18:15:44 2024 -0800 Fix for GC on windows
jpype-project · Nov 18, 2024 · e8f6ed3 · e8f6ed3
1 parent 81f5ee6
commit e8f6ed3
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 3 deletions.
diff --git a/native/common/include/jp_gc.h b/native/common/include/jp_gc.h
@@ -56,8 +56,15 @@ class JPGarbageCollection
 	bool java_triggered;
 	PyObject *python_gc;
 	jclass _SystemClass;
+	jclass _ContextClass;
 	jmethodID _gcMethodID;
 
+	jmethodID _totalMemoryID;
+	jmethodID _freeMemoryID;
+	jmethodID _maxMemoryID;
+	jmethodID _usedMemoryID;
+	jmethodID _heapMemoryID;
+
 	size_t last_python;
 	size_t last_java;
 	size_t low_water;
@@ -69,4 +76,4 @@ class JPGarbageCollection
 	int python_triggered;
 } ;
 
-#endif /* JP_GC_H */
+#endif /* JP_GC_H */
diff --git a/native/common/jp_gc.cpp b/native/common/jp_gc.cpp
@@ -154,6 +154,14 @@ void JPGarbageCollection::init(JPJavaFrame& frame)
 	_SystemClass = (jclass) frame.NewGlobalRef(frame.FindClass("java/lang/System"));
 	_gcMethodID = frame.GetStaticMethodID(_SystemClass, "gc", "()V");
 
+	jclass ctxt = frame.getContext()->m_ContextClass.get();
+	_ContextClass = ctxt;
+	_totalMemoryID = frame.GetStaticMethodID(ctxt, "getTotalMemory", "()J");
+	_freeMemoryID = frame.GetStaticMethodID(ctxt, "getFreeMemory", "()J");
+	_maxMemoryID = frame.GetStaticMethodID(ctxt, "getMaxMemory", "()J");
+	_usedMemoryID = frame.GetStaticMethodID(ctxt, "getUsedMemory", "()J");
+	_heapMemoryID = frame.GetStaticMethodID(ctxt, "getHeapMemory", "()J");
+
 	running = true;
 	high_water = getWorkingSize();
 	limit = high_water + DELTA_LIMIT;
@@ -237,10 +245,24 @@ void JPGarbageCollection::onEnd()
 		Py_ssize_t pred = current + 2 * (current - last);
 		last = current;
 		if ((Py_ssize_t) pred > (Py_ssize_t) limit)
+		{
 			run_gc = 2;
+			limit = high_water + (high_water>>3) + 8 * (current - last);
+		}
 
-		//		printf("consider gc %d (%ld, %ld, %ld, %ld) %ld\n", run_gc,
-		//				current, low_water, high_water, limit, limit - pred);
+#if 0
+		{
+			JPJavaFrame frame = JPJavaFrame::outer(m_Context);
+			jlong totalMemory = frame.CallStaticLongMethodA(_ContextClass, _totalMemoryID, nullptr);
+			jlong freeMemory = frame.CallStaticLongMethodA(_ContextClass, _freeMemoryID, nullptr);
+			jlong maxMemory = frame.CallStaticLongMethodA(_ContextClass, _maxMemoryID, nullptr);
+			jlong usedMemory = frame.CallStaticLongMethodA(_ContextClass, _usedMemoryID, nullptr);
+			jlong heapMemory = frame.CallStaticLongMethodA(_ContextClass, _heapMemoryID, nullptr);
+			printf("consider gc run=%d (current=%ld, low=%ld, high=%ld, limit=%ld) %ld\n", run_gc,
+				current, low_water, high_water, limit, limit - pred);
+			printf(" java total=%ld free=%ld max=%ld used=%ld heap=%ld\n", totalMemory, freeMemory, maxMemory, usedMemory, heapMemory);
+		}
+#endif
 
 		if (run_gc > 0)
 		{

diff --git a/native/java/org/jpype/JPypeContext.java b/native/java/org/jpype/JPypeContext.java
@@ -637,4 +637,29 @@ private static void scanExistingJars()
     }
   }
 
+  private static long getTotalMemory() 
+  {
+    return Runtime.getRuntime().totalMemory();
+  }
+
+  private static long getFreeMemory() 
+  {
+    return Runtime.getRuntime().freeMemory();
+  }
+
+  private static long getMaxMemory() 
+  {
+    return Runtime.getRuntime().maxMemory();
+  }
+
+  private static long getUsedMemory() 
+  {
+    return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+  }
+
+  private static long getHeapMemory()
+  {
+    java.lang.management.MemoryMXBean memoryBean = java.lang.management.ManagementFactory.getMemoryMXBean();
+    return memoryBean.getHeapMemoryUsage().getUsed();
+  }
 }