tfcache-comparison

parameterized JAVA_OPTS

6/28/2019 11:28:01 PM

Rômulo Manciola Meloca

Commit: 2fbcb41

Tree: e8f4bde

Parents: ee9b6fb

Changes

reduce.sh 2(+1 -1)

run.sh 7(+4 -3)

trace.sh 5(+3 -2)

Details

reduce.sh 2(+1 -1)

diff --git a/reduce.sh b/reduce.sh
index fa09571..fd8763f 100644
--- a/reduce.sh
+++ b/reduce.sh
@@ -5,7 +5,7 @@ if [ "$(whoami)" != 'root' ]; then
     exit 1;
 fi
 
-export JAVA_OPTS="-Xms4096m -Xmx6124m"
+JAVA_OPTS=${JAVA_OPTS:-"-Xms4096m -Xmx6124m"}
 
 host="localhost"
 versions="uncached developers aplcache memoizeit"

run.sh 7(+4 -3)

diff --git a/run.sh b/run.sh
index 7a9e813..43a10a4 100644
--- a/run.sh
+++ b/run.sh
@@ -5,7 +5,8 @@ if [ "$(whoami)" != 'root' ]; then
 	exit 1;
 fi
 
-export JAVA_OPTS="-Xms4096m -Xmx6124m"
+export JAVA_OPTS=${JAVA_OPTS:-"-Xmx7500m"}
+JAVA_SERVER_OPTS=${JAVA_SERVER_OPTS:-"-Xmx30000m"}
 
 host="localhost"
 versions="uncached developers aplcache memoizeit"
@@ -34,7 +35,7 @@ for application in $applications; do
 						export TRACER_ENABLE=false
 						docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build
 					else
-						command="TRACER_ENABLE=false docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build"
+						command="JAVA_OPTS=$JAVA_SERVER_OPTS TRACER_ENABLE=false docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build"
 						while ! java -jar adapters/RemoteExecutor/target/RemoteExecutor-1.0.jar --send="caching-approaches-comparison $command" --host=$host --port=5000; do sleep 5; done
 					fi
 					while ! curl -s $host:8080 > /dev/null; do sleep 5; done
@@ -56,7 +57,7 @@ for application in $applications; do
 						export CACHE_EVENTS=/caching-approaches-comparison/applications/output/$application-$version-${user}user-${execution}execution-cache
 						docker-compose -f applications/$version/$application/docker-compose.yml up -d --build
 					else
-						command="TRACER_ENABLE=false CACHE_EVENTS=/caching-approaches-comparison/applications/output/$application-$version-${user}user-${execution}execution-cache docker-compose -f applications/$version/$application/docker-compose.yml up -d --build"
+						command="JAVA_OPTS=$JAVA_SERVER_OPTS TRACER_ENABLE=false CACHE_EVENTS=/caching-approaches-comparison/applications/output/$application-$version-${user}user-${execution}execution-cache docker-compose -f applications/$version/$application/docker-compose.yml up -d --build"
 						while ! java -jar adapters/RemoteExecutor/target/RemoteExecutor-1.0.jar --send="caching-approaches-comparison $command" --host=$host --port=5000; do sleep 5; done
 					fi
 					while ! curl -s $host:8080 > /dev/null; do sleep 5; done

trace.sh 5(+3 -2)

diff --git a/trace.sh b/trace.sh
index 9dcf0d7..ba7002d 100644
--- a/trace.sh
+++ b/trace.sh
@@ -5,7 +5,8 @@ if [ "$(whoami)" != 'root' ]; then
 	exit 1;
 fi
 
-export JAVA_OPTS="-Xms4096m -Xmx6124m"
+export JAVA_OPTS=${JAVA_OPTS:-"-Xmx7500m"}
+JAVA_SERVER_OPTS=${JAVA_SERVER_OPTS:-"-Xmx30000m"}
 
 host="localhost"
 applications=$(echo applications/uncached/*/)
@@ -27,7 +28,7 @@ for application in $applications; do
 			export TRACER_ENABLE=true
 			docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build
 		else
-			command="TRACER_ENABLE=true docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build"
+			command="JAVA_OPTS=$JAVA_SERVER_OPTS TRACER_ENABLE=true docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build"
 			while ! java -jar adapters/RemoteExecutor/target/RemoteExecutor-1.0.jar --send="caching-approaches-comparison $command" --host=$host --port=5000; do sleep 5; done
 		fi
 		while ! curl -s $host:8080 > /dev/null; do sleep 5; done