From 15e75c098a3f086ab1cbf042d742ad4b3cfd8ad8 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 5 May 2025 11:12:47 -0400 Subject: [PATCH 1/2] support jvm options in more frontend scripts --- bin/bg-merger | 5 +++-- bin/decoder | 7 +++++-- bin/hipo-merge-histograms | 8 ++++++-- bin/hipo-utils | 7 +++++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/bin/bg-merger b/bin/bg-merger index 469d48796c..a34fed649f 100755 --- a/bin/bg-merger +++ b/bin/bg-merger @@ -4,7 +4,8 @@ export MALLOC_ARENA_MAX=1 -java -Xmx1536m -Xms1024m -XX:+UseSerialGC \ +java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \ -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \ org.jlab.analysis.eventmerger.EventMerger \ - $* + ${class_options[@]} + diff --git a/bin/decoder b/bin/decoder index 1ea3657a9b..324e69fb26 100755 --- a/bin/decoder +++ b/bin/decoder @@ -2,9 +2,12 @@ . `dirname $0`/../libexec/env.sh +split_cli $@ + export MALLOC_ARENA_MAX=1 -java -Xmx1536m -Xms1024m -XX:+UseSerialGC \ +java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \ -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \ org.jlab.detector.decode.CLASDecoder4 \ - $* + ${class_options[@]} + diff --git a/bin/hipo-merge-histograms b/bin/hipo-merge-histograms index cf8b3b6cda..f93e0fa375 100755 --- a/bin/hipo-merge-histograms +++ b/bin/hipo-merge-histograms @@ -1,7 +1,10 @@ #!/usr/bin/env bash . `dirname $0`/../libexec/env.sh -cmd="java -Xms1024m -cp $CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/* org.jlab.groot.data.TDirectory" + +split_cli $@ + +cmd="java -Xms1024m ${jvm_options[@]} -cp $CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/* org.jlab.groot.data.TDirectory" if [ $# -eq 0 ]; then echo """ @@ -12,4 +15,5 @@ if [ $# -eq 0 ]; then exit 2 fi -$cmd $* +$cmd ${class_options[@]} + diff --git a/bin/hipo-utils b/bin/hipo-utils index 47e579389c..5b00c89d17 100755 --- a/bin/hipo-utils +++ b/bin/hipo-utils @@ -2,9 +2,12 @@ . `dirname $0`/../libexec/env.sh +split_cli $@ + export MALLOC_ARENA_MAX=1 -java -Xmx2048m -Xms1024m -XX:+UseSerialGC \ +java -Xmx2048m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \ -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \ org.jlab.jnp.hipo4.utils.HipoUtilities \ - $* + ${class_options[@]} + From 97410fac18441378d134e836c8e6445772bf5886 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 9 May 2025 18:17:56 -0400 Subject: [PATCH 2/2] Update bin/bg-merger Co-authored-by: Christopher Dilks --- bin/bg-merger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/bg-merger b/bin/bg-merger index a34fed649f..b2df5052bd 100755 --- a/bin/bg-merger +++ b/bin/bg-merger @@ -4,6 +4,8 @@ export MALLOC_ARENA_MAX=1 +split_cli $@ + java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \ -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \ org.jlab.analysis.eventmerger.EventMerger \