pyxida-cvs-commits

[Jonathan L. <le...@us...>]

Update of /cvsroot/pyxida/Pyxida/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17794/bin

Modified Files:
	query.pl 
Log Message:
fixed xml calls, added gravity

Index: query.pl
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/bin/query.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** query.pl	4 Dec 2006 13:14:19 -0000	1.4
--- query.pl	4 Dec 2006 16:32:44 -0000	1.5
***************
*** 6,21 ****
  use Data::Dumper;
  
- use Aux;
- warn "rm Aux";
- 
  my $USE_HEIGHT = 1;
  
- # e.g. query.pl http://righthand.eecs.harvard.edu:55501
- 
  my $usage = "query.pl [options] url\n";
  $usage .=   " -l: get local coordinate of node running at url\n";
! $usage .=   " -r remote-node: get remote overlay node coordinate (not yet supported)\n";
  $usage .=   " -a nodeA -b nodeB: estimate latency btw overlay nodes A and B\n";
  
  my %para = ();
  getopts('lr:a:b:', \%para);
--- 6,19 ----
  use Data::Dumper;
  
  my $USE_HEIGHT = 1;
  
  my $usage = "query.pl [options] url\n";
  $usage .=   " -l: get local coordinate of node running at url\n";
! $usage .=   " -r remote-node: get remote overlay node coordinate\n";
  $usage .=   " -a nodeA -b nodeB: estimate latency btw overlay nodes A and B\n";
  
+ $usage .=   "\n";
+ $usage .=   "query.pl -l http://righthand.eecs.harvard.edu:55501\n";
+ $usage .=   "query.pl -a sb02.eecs.harvard.edu:55500 -b sb03.eecs.harvard.edu:55500 http://sb01.eecs.harvard.edu:55501\n";
  my %para = ();
  getopts('lr:a:b:', \%para);
***************
*** 36,40 ****
  
  if (defined($para{'l'})) {
-     print "local\n";
      my $coordArray = $server->call("pyxida.getLocalCoord");
      #print Dumper($hash);
--- 34,37 ----
***************
*** 44,53 ****
  } elsif (defined($para{'r'})) {
      my $remoteNode = $para{'r'};
!     print "remote $remoteNode\n";
  } elsif (defined($para{'a'}) && defined($para{'b'})) {
      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");
--- 41,53 ----
  } elsif (defined($para{'r'})) {
      my $remoteNode = $para{'r'};
!     my $coordArray = $server->call("pyxida.getRemoteCoord", $para{'r'});
!     my $coord = &parse_coord ($coordArray);
!     print "$coord\n";
  } elsif (defined($para{'a'}) && defined($para{'b'})) {
      my $nodeA = $para{'a'};
      my $nodeB = $para{'b'};
      my $distance = $server->call("pyxida.estimateRTT", $nodeA, $nodeB);
!     $distance = sprintf ("%.3f", $distance);
!     print "$distance\n";
  } else {
      die ("Missing arguments\n$usage");
***************
*** 58,62 ****
      my $out = '[';
      for (my $i = 0; $i <= $#$coord; $i++) {
!         my $element = sprintf ("%.2f", $coord->[$i]);
  	if ($i == $#$coord && $USE_HEIGHT) {
  	    $out .= 'h';
--- 58,62 ----
      my $out = '[';
      for (my $i = 0; $i <= $#$coord; $i++) {
!         my $element = sprintf ("%.3f", $coord->[$i]);
  	if ($i == $#$coord && $USE_HEIGHT) {
  	    $out .= 'h';