further settings around benchmarking

benchmark/bench.sh

@@ -44,7 +44,7 @@ for LINE in `cat $BENCHMARK_LIST_FILE`; do
 	if [[ $CONFIG =~ .*dist.* ]]; then
 		COMMAND="(time $BASH_EXEC $SELF_DIR/../parasim.sh -e $SELF_DIR/experiments/$EXPERIMENT/benchmark.experiment.properties -b -csv $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/data.csv -c $SELF_DIR/configs/$CONFIG.xml > $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/log.txt) 2> $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/time.txt";
 	else
-		LAST_PROC=$((CONFIG_SIZE-1))
+		LAST_PROC=$((2*CONFIG_SIZE-1))
 		COMMAND="(time taskset -c 0-$LAST_PROC $BASH_EXEC $SELF_DIR/../parasim.sh -e $SELF_DIR/experiments/$EXPERIMENT/benchmark.experiment.properties -b -csv $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/data.csv -c $SELF_DIR/configs/$CONFIG.xml > $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/log.txt) 2> $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/time.txt";
 	fi
 	echo $COMMAND > $SELF_DIR/results/${EXPERIMENT}__${CONFIG}/command

benchmark/benchmarks.txt

@@ -1,8 +1,8 @@
 parasim-shared-1:lotkav-common
 parasim-shared-2:lotkav-common
-parasim-shared-3:lotkav-common
 parasim-shared-4:lotkav-common
-parasim-shared-5:lotkav-common
-parasim-shared-6:lotkav-common
-parasim-shared-7:lotkav-common
-parasim-shared-8:lotkav-common
+parasim-dist-1:lotkav-common
+parasim-dist-2:lotkav-common
+parasim-dist-4:lotkav-common
+parasim-dist-8:lotkav-common
+parasim-dist-16:lotkav-common

benchmark/configs/parasim-dist-16.xml

@@ -21,14 +21,14 @@
 			<value>pheme06</value>
 			<value>pheme07</value>
 			<value>pheme08</value>
-			<value>pheme09</value>
 			<value>pheme10</value>
 			<value>pheme11</value>
 			<value>pheme12</value>
 			<value>pheme13</value>
 			<value>pheme14</value>
 			<value>pheme15</value>
 			<value>pheme16</value>
+			<value>pheme17</value>
 		</property>
 	</extension>
 </parasim>

benchmark/configs/parasim-shared-1.xml

@@ -2,4 +2,10 @@
 	<extension qualifier="computation-lifecycle">
 		<property name="numberOfThreads">1</property>
 	</extension>
+
+	<extension qualifier="application">
+		<property name="warmupComputationSize">20</property>
+		<property name="computationSize">40</property>
+		<property name="warmupIterationLimit">3</property>
+	</extension>
 </parasim>

benchmark/configs/parasim-shared-2.xml

@@ -2,4 +2,10 @@
 	<extension qualifier="computation-lifecycle">
 		<property name="numberOfThreads">2</property>
 	</extension>
+
+	<extension qualifier="application">
+		<property name="warmupComputationSize">20</property>
+		<property name="computationSize">40</property>
+		<property name="warmupIterationLimit">3</property>
+	</extension>
 </parasim>

benchmark/configs/parasim-shared-4.xml

@@ -2,4 +2,10 @@
 	<extension qualifier="computation-lifecycle">
 		<property name="numberOfThreads">4</property>
 	</extension>
+
+	<extension qualifier="application">
+		<property name="warmupComputationSize">20</property>
+		<property name="computationSize">40</property>
+		<property name="warmupIterationLimit">3</property>
+	</extension>
 </parasim>

benchmark/configs/parasim-shared-8.xml

@@ -2,4 +2,10 @@
 	<extension qualifier="computation-lifecycle">
 		<property name="numberOfThreads">8</property>
 	</extension>
+
+	<extension qualifier="application">
+		<property name="warmupComputationSize">20</property>
+		<property name="computationSize">40</property>
+		<property name="warmupIterationLimit">3</property>
+	</extension>
 </parasim>

extensions/computation-lifecycle-impl/src/main/java/org/sybila/parasim/computation/lifecycle/impl/common/ComputationFuture.java

@@ -117,7 +117,6 @@ public M get(long timeout, TimeUnit unit) throws InterruptedException, Execution
 
     @Override
     public synchronized void done(UUID node, Mergeable event) {
-        LOGGER.info("merging partial result from " + node);
         if (partial == null) {
             LOGGER.debug("the first partial result is " + event);
             partial = (M) event;

parasim.sh

@@ -1,11 +1,12 @@
 #!/bin/sh
 JAVA_BIN=java
+JAVA_OPT="-Xmx4096m -XX:MaxPermSize=2048m"
 SELF=`readlink -f $0`
 SELF_DIR=`dirname $SELF`
 PARASIM_VERSION=`grep "<version>" "$SELF_DIR/pom.xml" | head -n 1 | tr -d ' ' | sed 's/<version>//g' | sed 's/<\/version>//g'`
 TARGET_DIST=$SELF_DIR/application/target/parasim-${PARASIM_VERSION}-dist.jar
 if [ -f $TARGET_DIST ]; then
-	$JAVA_BIN -jar $TARGET_DIST "$@"
+	$JAVA_BIN $JAVA_OPT -jar $TARGET_DIST "$@"
 else
 	echo "Parasim has not been built. Try \`build-all install'."
 	exit 1

servers-start.sh

@@ -5,6 +5,7 @@ CONFIG_FILE=$1
 LOG_DIR=$2
 PARASIM_VERSION=`grep "<version>" "$SELF_DIR/pom.xml" | head -n 1 | tr -d ' ' | sed 's/<version>//g' | sed 's/<\/version>//g'`
 TARGET_DIST=$SELF_DIR/application/target/parasim-${PARASIM_VERSION}-dist.jar
+JAVA_OPT="-Xmx4096m -XX:MaxPermSize=2048m"
 
 usage()
 {
@@ -29,7 +30,7 @@ if [ -z $LOG_DIR ]; then
 fi
 
 for IP in `grep "<value>" $CONFIG_FILE | tr '<>' ' ' | awk '{ print $2 }'`; do
-	nohup ssh $IP -t "java -Dparasim.remote.host=$IP -jar $TARGET_DIST -s -c $CONFIG_FILE" > "$LOG_DIR/log-$IP" &
+	nohup ssh $IP -t "java $JAVA_OPT -Dparasim.remote.host=$IP -jar $TARGET_DIST -s -c $CONFIG_FILE" > "$LOG_DIR/log-$IP" &
 	sleep 1
 	echo "server $IP started";
 done