diff --git a/benchmark/bench.sh b/benchmark/bench.sh
index ab7bd594..36459f30 100755
--- a/benchmark/bench.sh
+++ b/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
diff --git a/benchmark/benchmarks.txt b/benchmark/benchmarks.txt
index 56b46b3e..50bd2602 100644
--- a/benchmark/benchmarks.txt
+++ b/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
diff --git a/benchmark/configs/parasim-dist-16.xml b/benchmark/configs/parasim-dist-16.xml
index fb477ed8..42a84d98 100644
--- a/benchmark/configs/parasim-dist-16.xml
+++ b/benchmark/configs/parasim-dist-16.xml
@@ -21,7 +21,6 @@
pheme06
pheme07
pheme08
- pheme09
pheme10
pheme11
pheme12
@@ -29,6 +28,7 @@
pheme14
pheme15
pheme16
+ pheme17
diff --git a/benchmark/configs/parasim-shared-1.xml b/benchmark/configs/parasim-shared-1.xml
index e22fa40e..d7c27ce1 100644
--- a/benchmark/configs/parasim-shared-1.xml
+++ b/benchmark/configs/parasim-shared-1.xml
@@ -2,4 +2,10 @@
1
+
+
+ 20
+ 40
+ 3
+
diff --git a/benchmark/configs/parasim-shared-2.xml b/benchmark/configs/parasim-shared-2.xml
index 8f931069..071858f7 100644
--- a/benchmark/configs/parasim-shared-2.xml
+++ b/benchmark/configs/parasim-shared-2.xml
@@ -2,4 +2,10 @@
2
+
+
+ 20
+ 40
+ 3
+
diff --git a/benchmark/configs/parasim-shared-3.xml b/benchmark/configs/parasim-shared-3.xml
deleted file mode 100644
index 6d3d5d64..00000000
--- a/benchmark/configs/parasim-shared-3.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 3
-
-
diff --git a/benchmark/configs/parasim-shared-4.xml b/benchmark/configs/parasim-shared-4.xml
index c96887bf..e1fc0ed4 100644
--- a/benchmark/configs/parasim-shared-4.xml
+++ b/benchmark/configs/parasim-shared-4.xml
@@ -2,4 +2,10 @@
4
+
+
+ 20
+ 40
+ 3
+
diff --git a/benchmark/configs/parasim-shared-5.xml b/benchmark/configs/parasim-shared-5.xml
deleted file mode 100644
index 90b1f14e..00000000
--- a/benchmark/configs/parasim-shared-5.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 5
-
-
diff --git a/benchmark/configs/parasim-shared-6.xml b/benchmark/configs/parasim-shared-6.xml
deleted file mode 100644
index 669875c2..00000000
--- a/benchmark/configs/parasim-shared-6.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 6
-
-
diff --git a/benchmark/configs/parasim-shared-7.xml b/benchmark/configs/parasim-shared-7.xml
deleted file mode 100644
index 15c67bc5..00000000
--- a/benchmark/configs/parasim-shared-7.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 7
-
-
diff --git a/benchmark/configs/parasim-shared-8.xml b/benchmark/configs/parasim-shared-8.xml
index cea11ec1..d4b9031c 100644
--- a/benchmark/configs/parasim-shared-8.xml
+++ b/benchmark/configs/parasim-shared-8.xml
@@ -2,4 +2,10 @@
8
+
+
+ 20
+ 40
+ 3
+
diff --git a/extensions/computation-lifecycle-impl/src/main/java/org/sybila/parasim/computation/lifecycle/impl/common/ComputationFuture.java b/extensions/computation-lifecycle-impl/src/main/java/org/sybila/parasim/computation/lifecycle/impl/common/ComputationFuture.java
index 3d93f784..9900f3c2 100644
--- a/extensions/computation-lifecycle-impl/src/main/java/org/sybila/parasim/computation/lifecycle/impl/common/ComputationFuture.java
+++ b/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;
diff --git a/parasim.sh b/parasim.sh
index e90f8537..1e66e4d0 100755
--- a/parasim.sh
+++ b/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 "" "$SELF_DIR/pom.xml" | head -n 1 | tr -d ' ' | sed 's///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
diff --git a/servers-start.sh b/servers-start.sh
index ea8ed2e1..29e880ab 100755
--- a/servers-start.sh
+++ b/servers-start.sh
@@ -5,6 +5,7 @@ CONFIG_FILE=$1
LOG_DIR=$2
PARASIM_VERSION=`grep "" "$SELF_DIR/pom.xml" | head -n 1 | tr -d ' ' | sed 's///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 "" $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