|
From: Jonathan L. <le...@us...> - 2006-12-04 13:14:24
|
Update of /cvsroot/pyxida/Pyxida/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9237/bin Modified Files: query.pl Log Message: missing ports with estimateRTT XML call Index: query.pl =================================================================== RCS file: /cvsroot/pyxida/Pyxida/bin/query.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** query.pl 1 Dec 2006 18:10:54 -0000 1.3 --- query.pl 4 Dec 2006 13:14:19 -0000 1.4 *************** *** 4,12 **** use Getopt::Std; use Frontier::Client; - use Data::Dumper; ! #use Aux; ! #print "rm Aux\n"; # e.g. query.pl http://righthand.eecs.harvard.edu:55501 --- 4,13 ---- use Getopt::Std; use Frontier::Client; use Data::Dumper; ! use Aux; ! warn "rm Aux"; ! ! my $USE_HEIGHT = 1; # e.g. query.pl http://righthand.eecs.harvard.edu:55501 *************** *** 36,41 **** if (defined($para{'l'})) { print "local\n"; ! my $hash = $server->call("pyxida.getLocalCoord"); ! print Dumper($hash); } elsif (defined($para{'r'})) { my $remoteNode = $para{'r'}; --- 37,45 ---- if (defined($para{'l'})) { print "local\n"; ! my $coordArray = $server->call("pyxida.getLocalCoord"); ! #print Dumper($hash); ! #&Aux::printHash($hash); ! my $coord = &parse_coord ($coordArray); ! print "$coord\n"; } elsif (defined($para{'r'})) { my $remoteNode = $para{'r'}; *************** *** 44,49 **** my $nodeA = $para{'a'}; my $nodeB = $para{'b'}; ! print "pair $nodeA $nodeB\n"; } else { die ("Missing arguments\n$usage"); } --- 48,71 ---- my $nodeA = $para{'a'}; my $nodeB = $para{'b'}; ! my $distance = $server->call("pyxida.estimateRTT", $nodeA, $nodeB); ! print "pair $nodeA $nodeB dist $distance\n"; } else { die ("Missing arguments\n$usage"); } + + sub parse_coord { + my ($coord) = @_; + my $out = '['; + for (my $i = 0; $i <= $#$coord; $i++) { + my $element = sprintf ("%.2f", $coord->[$i]); + if ($i == $#$coord && $USE_HEIGHT) { + $out .= 'h'; + } + $out .= $element; + if ($i != $#$coord) { + $out .= ' '; + } + } + $out .= ']'; + return $out; + } |