X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fscripts%2Fsliver-ovs.in;h=dfcba3bbe4251309d882fc0da6bf83e12ccabcc6;hb=31ce74a9f05312e3d68e55034b23ff2690a91ce7;hp=2a95797add00ca2fbc23605c0edbc6ecf8d31525;hpb=21ccf217a1462ccfe1b822d88acf5761a33e0f92;p=sliver-openvswitch.git

diff --git a/planetlab/scripts/sliver-ovs.in b/planetlab/scripts/sliver-ovs.in
index 2a95797ad..dfcba3bbe 100755
--- a/planetlab/scripts/sliver-ovs.in
+++ b/planetlab/scripts/sliver-ovs.in
@@ -29,7 +29,7 @@ function error {
 function get_params {
     params=$1; shift
     err_msg="$COMMAND $SUBCOMMAND $(echo $params | perl -pe 's/\S+/<$&>/g')"
-    for p in $(echo $params); do
+    for p in $params; do
         [[ -z "$@" ]] && error "$err_msg"
         pname=$(echo -n $p|perl -pe 's/\W/_/g')
         eval $pname="$1"; shift
@@ -157,19 +157,26 @@ function stop () {
 #################### create functions
 function create_bridge () {
     
-    get_params "bridge IP/PREFIX" "$@"
+    get_params "bridge IP/PREFIX" "$1" "$2"
+    shift; shift;
 
     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"
+	-- set interface "$bridge" options:local_ip="$IP" option:local_netmask="$PREFIX" \
+	-- "$@"
 }
 
 function create_port () {
@@ -267,13 +274,12 @@ function show () {
 # this one-shot function writes the current statistics onto the ndnmap site
 # it needs to be called regularly so that ndnmap can do the bw computations
 # would make sense for the caller to redirect stderr onto some relevant location
-function gmap_report_once () {
+function gmap_probe_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)
@@ -284,32 +290,34 @@ function gmap_report_once () {
 }
 
 ### the front end, manages pid and so on
-function gmap_report () {
+function gmap_probe () {
     iface=$1; shift
     hostname=$1; shift
     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
+    # close std fds so that ssh invokations can return
+    exec <&-
+    exec >&-
     while true; do
-#	echo $$ > $pidfile
-	gmap_report_once $iface $hostname $linkid
+	gmap_probe_once $iface $hostname $linkid
 	sleep $looptime
-    done 
+    done &
+    # this is the pid for the background process
+    echo $! > $pid_file
 }
 
 ####################
 SUPPORTED_SUBCOMMANDS="start stop status 
 start_db stop_db start_switch stop_switch
 create_bridge create_port del_bridge del_port
-show set_remote_endpoint set_controller del_controller gmap_report"
+show set_remote_endpoint set_controller del_controller gmap_probe"
 
 function main () {
 	message="Usage: $COMMAND <subcommand> ...