From 7a3f621d2867bce2ba64418558f64fc1813bbb6d Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Wed, 20 Dec 2023 12:05:50 -0700 Subject: [PATCH 1/4] Allow specifying max heap size from env --- pysoot/jython_wrapper.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pysoot/jython_wrapper.py b/pysoot/jython_wrapper.py index 09b44d2..1272cff 100755 --- a/pysoot/jython_wrapper.py +++ b/pysoot/jython_wrapper.py @@ -32,11 +32,13 @@ def __init__(self, jython_folder, module_name, class_name, java_heap_size=None): self.module_name = module_name self.client_stderr = "" self.client_stdout = "" - if java_heap_size is None: + if java_heap_size is not None: + self.java_heap_size = java_heap_size + elif "JYTHON_HEAP_SIZE" in os.environ: + self.java_heap_size = int(os.environ["JYTHON_HEAP_SIZE"]) + else: # use 75% of total memory for the Java heap self.java_heap_size = int(psutil.virtual_memory().total*0.75) - else: - self.java_heap_size = java_heap_size self._start_jython() def _start_jython(self): From 460d6687ae789de333511578a29da35bde78c16a Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Wed, 20 Dec 2023 12:07:24 -0700 Subject: [PATCH 2/4] Better var name --- pysoot/jython_wrapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pysoot/jython_wrapper.py b/pysoot/jython_wrapper.py index 1272cff..65c63f3 100755 --- a/pysoot/jython_wrapper.py +++ b/pysoot/jython_wrapper.py @@ -34,8 +34,8 @@ def __init__(self, jython_folder, module_name, class_name, java_heap_size=None): self.client_stdout = "" if java_heap_size is not None: self.java_heap_size = java_heap_size - elif "JYTHON_HEAP_SIZE" in os.environ: - self.java_heap_size = int(os.environ["JYTHON_HEAP_SIZE"]) + elif "PYSOOT_HEAP_SIZE" in os.environ: + self.java_heap_size = int(os.environ["PYSOOT_HEAP_SIZE"]) else: # use 75% of total memory for the Java heap self.java_heap_size = int(psutil.virtual_memory().total*0.75) From 5c86ec2545ec538ae2c22ea055c35fcf2c4b07de Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Wed, 20 Dec 2023 12:53:03 -0700 Subject: [PATCH 3/4] Don't int() the env var --- pysoot/jython_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysoot/jython_wrapper.py b/pysoot/jython_wrapper.py index 65c63f3..d460f46 100755 --- a/pysoot/jython_wrapper.py +++ b/pysoot/jython_wrapper.py @@ -35,7 +35,7 @@ def __init__(self, jython_folder, module_name, class_name, java_heap_size=None): if java_heap_size is not None: self.java_heap_size = java_heap_size elif "PYSOOT_HEAP_SIZE" in os.environ: - self.java_heap_size = int(os.environ["PYSOOT_HEAP_SIZE"]) + self.java_heap_size = os.environ["PYSOOT_HEAP_SIZE"] else: # use 75% of total memory for the Java heap self.java_heap_size = int(psutil.virtual_memory().total*0.75) From b4679251a8492612081c604593bce3b93dec51c6 Mon Sep 17 00:00:00 2001 From: Kevin Phoenix Date: Wed, 20 Dec 2023 13:34:54 -0700 Subject: [PATCH 4/4] Revert "Don't int() the env var" This reverts commit 5c86ec2545ec538ae2c22ea055c35fcf2c4b07de. --- pysoot/jython_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pysoot/jython_wrapper.py b/pysoot/jython_wrapper.py index d460f46..65c63f3 100755 --- a/pysoot/jython_wrapper.py +++ b/pysoot/jython_wrapper.py @@ -35,7 +35,7 @@ def __init__(self, jython_folder, module_name, class_name, java_heap_size=None): if java_heap_size is not None: self.java_heap_size = java_heap_size elif "PYSOOT_HEAP_SIZE" in os.environ: - self.java_heap_size = os.environ["PYSOOT_HEAP_SIZE"] + self.java_heap_size = int(os.environ["PYSOOT_HEAP_SIZE"]) else: # use 75% of total memory for the Java heap self.java_heap_size = int(psutil.virtual_memory().total*0.75)