From aa524c8ad41c98385db25a64d27c75d1605e5da7 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Wed, 15 Jul 2020 10:17:44 +0200 Subject: [PATCH 1/1] revert some overzealous changes --- .../smpi/replay_multiple/generate_multiple_deployment.sh | 2 +- src/smpi/smpirun.in | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/smpi/replay_multiple/generate_multiple_deployment.sh b/examples/smpi/replay_multiple/generate_multiple_deployment.sh index 30d6ea8931..aab51a4e9f 100755 --- a/examples/smpi/replay_multiple/generate_multiple_deployment.sh +++ b/examples/smpi/replay_multiple/generate_multiple_deployment.sh @@ -136,7 +136,7 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then hosttrace=$(tr '\n\r' ' ' < $(echo "$line"|cut -d' ' -f2)) NUMPROCSMINE=$(wc -l < $(echo "$line"|cut -d' ' -f2)) - if [ "$NUMPROCSMINE" != $(echo "$line"|cut -d' ' -f3) ]; + if [ $NUMPROCSMINE != $(echo "$line"|cut -d' ' -f3) ]; then echo "declared num of processes for instance $instance : $(echo "$line"|cut -d' ' -f3) is not the same as the one in the replay files : $NUMPROCSMINE. Please check consistency of these information" exit 1 diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 0c4c7af49a..74523e1dcf 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -14,7 +14,6 @@ DEFAULT_LOOPBACK_BANDWIDTH="498000000Bps" DEFAULT_LOOPBACK_LATENCY="0.000004s" DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))Bps" DEFAULT_NETWORK_LATENCY="0.000005s" -DEFAULT_NUMPROCS="4" DEFAULT_SPEED="100flops" LOOPBACK_BANDWIDTH="${DEFAULT_LOOPBACK_BANDWIDTH}" @@ -117,7 +116,7 @@ smpirun_trap() { unset pid # Raise the same signal again (remove the traps first): - trap - "$trapped_signals" + trap - $trapped_signals kill -"$sig" $$ # This should never happen: @@ -126,7 +125,7 @@ smpirun_trap() { } for s in $trapped_signals; do - trap 'smpirun_trap $s' "$s" + trap "smpirun_trap $s" "$s" done while true; do -- 2.20.1