Hook up exit handler properly

Author: mhaas

contrib/load-tester/run.sh

@@ -4,55 +4,57 @@
 # echo "core.%e.%p" > /proc/sys/kernel/core_pattern
 # http://stackoverflow.com/a/18368068
 
+function main() {
+    if [[ -z "$SUDO_USER" ]]; then
+        echo "Hey, you should run this with sudo"
+        exit 1
+    fi
 
-if [[ -z "$SUDO_USER" ]]; then
-    echo "Hey, you should run this with sudo"
-    exit 1
-fi
+    echo "core.%e.%p" > /proc/sys/kernel/core_pattern
+    ulimit -c unlimited
 
-echo "core.%e.%p" > /proc/sys/kernel/core_pattern
-ulimit -c unlimited
+    COUNT=40
+    echo "Make sure to configure GatewayInterface in wifidog_mock.conf"
 
-COUNT=40
-echo "Make sure to configure GatewayInterface in wifidog_mock.conf"
+    ./generate_interfaces.sh start $COUNT || exit 1
 
-./generate_interfaces.sh start $COUNT || exit 1
+    sudo -u "$SUDO_USER" ./mock_auth.py &
+    MA_PID="$!"
 
-sudo -u "$SUDO_USER" ./mock_auth.py &
-MA_PID="$!"
+    # work around libtool stuff - do not execute wrapper!
+    #EXEC="../../src/.libs/wifidog"
+    #export LD_LIBRARY_PATH="../../libhttpd/.libs/"
+    # trace-children is necessary because of the libtool wrapper -.-
+    #valgrind --leak-check=full --trace-children=yes --trace-children-skip=/bin/sh \
+    #    --log-file=valgrind.log $EXEC -d 7 -f -c wifidog-mock.conf -a /tmp/arp 2> wifidog.log &
 
-# work around libtool stuff - do not execute wrapper!
-#EXEC="../../src/.libs/wifidog"
-#export LD_LIBRARY_PATH="../../libhttpd/.libs/"
-# trace-children is necessary because of the libtool wrapper -.-
-#valgrind --leak-check=full --trace-children=yes --trace-children-skip=/bin/sh \
-#    --log-file=valgrind.log $EXEC -d 7 -f -c wifidog-mock.conf -a /tmp/arp 2> wifidog.log &
+    # for -fsanitize=address
+    export ASAN_OPTIONS=check_initialization_order=1
+    export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.5
 
-# for -fsanitize=address
-export ASAN_OPTIONS=check_initialization_order=1
-export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.5
 
+    ../../src/wifidog -d 7 -f -c wifidog-mock.conf -a /tmp/arp &> wifidog.log &
+    WD_PID="$!"
 
-../../src/wifidog -d 7 -f -c wifidog-mock.conf -a /tmp/arp &> wifidog.log &
-WD_PID="$!"
 
+    sudo -u "$SUDO_USER" ./plot_memory.sh $WD_PID &
+    M_PID="$!"
 
-sudo -u "$SUDO_USER" ./plot_memory.sh $WD_PID &
-M_PID="$!"
+    IF=`sudo -u "$SUDO_USER" grep GatewayInterface wifidog-mock.conf | cut -f 2 -d ' '`
 
-IF=`sudo -u "$SUDO_USER" grep GatewayInterface wifidog-mock.conf | cut -f 2 -d ' '`
+    echo "Waiting for wifidog to come up"
 
-echo "Waiting for wifidog to come up"
+    sleep 10
 
-sleep 10
+    sudo -u "$SUDO_USER" ./fire_requests.py \
+        --target-interface $IF \
+        --source-interface-prefix mac \
+        --source-interface-count $COUNT \
+        --process-count 3
 
-sudo -u "$SUDO_USER" ./fire_requests.py \
-    --target-interface $IF \
-    --source-interface-prefix mac \
-    --source-interface-count $COUNT \
-    --process-count 3
+    #./generate_interfaces.sh stop
 
-#./generate_interfaces.sh stop
+}
 
 function cleanup() {
 
@@ -64,3 +66,5 @@ function cleanup() {
 }
 
 trap cleanup EXIT
+
+main