better handling of dependencies

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

diff --git a/planetlab/scripts/sliver-ovs.in b/planetlab/scripts/sliver-ovs.in
index 2a95797..0bf2fc3 100755 (executable)
--- a/planetlab/scripts/sliver-ovs.in
+++ b/planetlab/scripts/sliver-ovs.in
@@ -162,14 +162,19 @@ function create_bridge () {
     IP=${IP_PREFIX%/*}
     PREFIX=${IP_PREFIX#*/}
 
-    # ensure ovs-vswitchd is running
-    is_switch_running || { echo "ovs-vswitchd not running" >&2 ; exit 1 ; }
+    W=
+    if ! is_switch_running; then
+       # we can create the bridge even if ovs-vswitchd is not running,
+       # but we need a running ovsdb-server
+       is_db_running || { echo "ovsdb-server not running" >&2; exit 1; }
+       W="--no-wait"
+    fi
+
 
     set -e
-    ovs-vsctl --db=unix:$DB_SOCKET -- --may-exist add-br "$bridge" \
+    ovs-vsctl --db=unix:$DB_SOCKET $W -- --may-exist add-br "$bridge" \
        -- set bridge "$bridge" datapath_type=planetlab \
        -- set interface "$bridge" options:local_ip="$IP" option:local_netmask="$PREFIX"
-    ovs-appctl netdev-pltap/get-tapname "$bridge"
 }
 
 function create_port () {
@@ -271,9 +276,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-appctl netdev-tunnel/get-rx-bytes $iface)
+    tx_bytes=$(ovs-appctl netdev-tunnel/get-tx-bytes $iface)
     rx_bits=$(($rx_bytes*8))
     tx_bits=$(($tx_bytes*8))
     now=$(date +%s).$(date +%N)
@@ -290,19 +294,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
 }
 
 ####################