# 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
- rx_bytes=$(ovs-vsctl get interface $iface statistics:rx_bytes)
- tx_bytes=$(ovs-vsctl get interface $iface statistics:tx_bytes)
+ 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)
}
### 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> ...