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 187fb04..08bef1c 100755 (executable)
--- a/planetlab/scripts/sliver-ovs.in
+++ b/planetlab/scripts/sliver-ovs.in
@@ -259,11 +259,55 @@ function show () {
     ovs-vsctl --db=unix:$DB_SOCKET show
 }
 
+### for demos - connect to an ndnmap deployment to visualize links bandwidth
+# this expects 3 arguments
+# an interface name, L<id1>-<id2> based on your ids in conf.mk
+# the hostname for a ndnmap deployment
+# a linkid, this is the id that this link has in your ndnmap scenario (hard-coded in some json file)
+# 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 () {
+    iface=$1; shift
+    hostname=$1; shift
+    linkid=$1; shift
+    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)
+    trigger=http://${hostname}/bw/${linkid}/${now}/${rx_bits}/${tx_bits}
+#    curl -s -L $trigger | grep -q "Got it" || echo Missed event with $trigger
+#    echo $trigger
+    curl -s -L $trigger >& /dev/null
+}
+
+### the front end, manages pid and so on
+function gmap_report () {
+    iface=$1; shift
+    hostname=$1; shift
+    linkid=$1; shift
+    looptime=$1; shift
+    [ -z "$looptime" ] && looptime=1
+    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
+       gmap_report_once $iface $hostname $linkid
+       sleep $looptime
+    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"
+show set_remote_endpoint set_controller del_controller gmap_report"
 
 function main () {
        message="Usage: $COMMAND <subcommand> ...