gmap-report now runs in background and will safely kill a previously

[sliver-openvswitch.git] / planetlab / scripts / sliver-ovs.in

diff --git a/planetlab/scripts/sliver-ovs.in b/planetlab/scripts/sliver-ovs.in
index 2a95797..08bef1c 100755 (executable)
--- a/planetlab/scripts/sliver-ovs.in
+++ b/planetlab/scripts/sliver-ovs.in
@@ -271,9 +271,8 @@ function gmap_report_once () {
     iface=$1; shift
     hostname=$1; shift
     linkid=$1; shift
-    report=$(ovs-vsctl get interface $iface statistics)
-    rx_bytes=$(echo $report | sed -e 's/^.*rx_bytes=//' -e 's/,.*$//')
-    tx_bytes=$(echo $report | sed -e 's/^.*tx_bytes=//' -e 's/,.*$//')
+    rx_bytes=$(ovs-vsctl get interface $iface statistics:rx_bytes)
+    tx_bytes=$(ovs-vsctl get interface $iface statistics:tx_bytes)
     rx_bits=$(($rx_bytes*8))
     tx_bits=$(($tx_bytes*8))
     now=$(date +%s).$(date +%N)
@@ -290,19 +289,18 @@ function gmap_report () {
     linkid=$1; shift
     looptime=$1; shift
     [ -z "$looptime" ] && looptime=1
-# we'd need a means to avoid running 2 instances at the same time
-# but it's kind of hard to keep track of the right pid here..
-#    pidfile=/var/run/openvswitch/gmap-$iface.pid
-#    if [ -f $pidfile ] ; then
-#      pid=$(cat $pidfile)
-#      [ -n "$pid" ] && kill $pid
-#      rm $pidfile
-#    fi
+    pid_file=/var/run/openvswitch/gmap-$iface.pid
+    if [ -f $pid_file ] ; then
+       pid=$(cat $pid_file)
+       [ -n "$pid" ] && kill $pid >& /dev/null
+       rm $pid_file
+    fi
     while true; do
-#      echo $$ > $pidfile
        gmap_report_once $iface $hostname $linkid
        sleep $looptime
-    done 
+    done &
+    # this is the pid for the background process
+    echo $! > $pid_file
 }
 
 ####################