rename gmap-report into gmap-probe

diff --git a/planetlab/exp-tool/Makefile b/planetlab/exp-tool/Makefile
index 98a6af1..f6e85fb 100644 (file)
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@ -305,13 +305,13 @@ graph.ps: graph.dot
 # SENDER-MUX=SENDER=3=0.5
 # which would mean, the link 'SENDER-MUX' should be monitored at the 'SENDER' node and is coded 
 # in links.json with id=3, every half second
 # SENDER-MUX=SENDER=3=0.5
 # which would mean, the link 'SENDER-MUX' should be monitored at the 'SENDER' node and is coded 
 # in links.json with id=3, every half second

-# sliver-ovs gmap-report is designed to run in background,
+# sliver-ovs gmap-probe is designed to run in background,

 # and so that a new run will kill any previously running instance
 # and so that a new run will kill any previously running instance

-gmap-probes: $(foreach probe,$(GMAP_PROBES),gprobe-$(probe))
+gprobes: $(foreach probe,$(GMAP_PROBES),gprobe-$(probe))

 
 gprobe-%: FORCE
        $(SSH) -n $(call solve,$(word 2,$(subst @, ,$(*F)))) $(SUDO) \
 
 gprobe-%: FORCE
        $(SSH) -n $(call solve,$(word 2,$(subst @, ,$(*F)))) $(SUDO) \

-       sliver-ovs gmap-report L$(word 1,$(subst @, ,$(*F))) $(GMAP_SERVER) $(word 3,$(subst @, ,$(*F))) $(word 4,$(subst @, ,$(*F)))
+       sliver-ovs gmap-probe L$(word 1,$(subst @, ,$(*F))) $(GMAP_SERVER) $(word 3,$(subst @, ,$(*F))) $(word 4,$(subst @, ,$(*F)))

 
 ####################
 # 'virtual' targets in that there's no real file attached
 
 ####################
 # 'virtual' targets in that there's no real file attached

diff --git a/planetlab/exp-tool/Makefile.help b/planetlab/exp-tool/Makefile.help
index a7d6182..b046f29 100644 (file)
--- a/planetlab/exp-tool/Makefile.help
+++ b/planetlab/exp-tool/Makefile.help
@@ -62,7 +62,7 @@ make stop
 make status
         list status of db and switch processes in all slivers
 ====================
 make status
         list status of db and switch processes in all slivers
 ====================

-make gmap-probes
+make gprobes

        Uses GMAP_SERVER and GMAP_PROBES to run probes in selected slivers
        that can update a googlemap server for animating link speeds
        This of course is mostly a demo thing, based on a one-host ndnmap deployment for now
        Uses GMAP_SERVER and GMAP_PROBES to run probes in selected slivers
        that can update a googlemap server for animating link speeds
        This of course is mostly a demo thing, based on a one-host ndnmap deployment for now

diff --git a/planetlab/scripts/sliver-ovs.in b/planetlab/scripts/sliver-ovs.in
index c65d0d3..7efbe63 100755 (executable)
--- a/planetlab/scripts/sliver-ovs.in
+++ b/planetlab/scripts/sliver-ovs.in
@@ -267,7 +267,7 @@ 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
 # 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
     iface=$1; shift
     hostname=$1; shift
     linkid=$1; shift


@@ -283,7 +283,7 @@ function gmap_report_once () {
 }
 
 ### the front end, manages pid and so on
 }
 
 ### the front end, manages pid and so on

-function gmap_report () {
+function gmap_probe () {

     iface=$1; shift
     hostname=$1; shift
     linkid=$1; shift
     iface=$1; shift
     hostname=$1; shift
     linkid=$1; shift


@@ -299,7 +299,7 @@ function gmap_report () {
     exec <&-
     exec >&-
     while true; do
     exec <&-
     exec >&-
     while true; do

-       gmap_report_once $iface $hostname $linkid
+       gmap_probe_once $iface $hostname $linkid

        sleep $looptime
     done &
     # this is the pid for the background process
        sleep $looptime
     done &
     # this is the pid for the background process


@@ -310,7 +310,7 @@ function gmap_report () {
 SUPPORTED_SUBCOMMANDS="start stop status 
 start_db stop_db start_switch stop_switch
 create_bridge create_port del_bridge del_port
 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> ...
 
 function main () {
        message="Usage: $COMMAND <subcommand> ...