diff options
| -rwxr-xr-x | testscripts/slave-agent | 12 | ||||
| -rwxr-xr-x | testscripts/slave-client | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/testscripts/slave-agent b/testscripts/slave-agent index 2f22c187a..a97e7cfbc 100755 --- a/testscripts/slave-agent +++ b/testscripts/slave-agent @@ -32,14 +32,14 @@ # Run: # nxproxy [...] slave=12000 # nxagent -display nx/nx,options=nxagent.conf # slave=22000 in nxagent.conf -# +# # Where 12000 and 22000 are example TCP ports the program will listen on. -# +# # For ease of debugging and running both sides on a single machine, the script # reacts to its own name and changes the prompt to "Proxy" if $0 contains # "proxy", or "Agent" if it contains "agent". This has no other effect. # -# +# use strict; use POSIX ":sys_wait_h"; @@ -99,7 +99,7 @@ while(!$EXIT) { if (!defined $ret) { die "Read failed: $!"; } - + if (!$ret) { last; } @@ -156,7 +156,7 @@ sub cmd_blkecho { if ( !defined $ret ) { die "Error reading from socket: $!"; } - + last if ( $ret == 0 ); $buf .= $tmp; } @@ -226,7 +226,7 @@ sub cmd_fastgen { } } -# Output RFC 864 chargen. +# Output RFC 864 chargen. # Used to test bandwidth sub cmd_chargen { my $text = ""; diff --git a/testscripts/slave-client b/testscripts/slave-client index 4ce75f45f..99a8f1ae5 100755 --- a/testscripts/slave-client +++ b/testscripts/slave-client @@ -74,7 +74,7 @@ Options: -d, --dump Dump benchmark data in tab separated format, for graphing. -e, --delay=FLOAT Delay between blocks or pings. None by default. - -H, --host=HOST Host to connect to. 'localhost' by default. + -H, --host=HOST Host to connect to. 'localhost' by default. -P, --port=PORT Port to connect to. Mandatory. Benchmarks: @@ -84,7 +84,7 @@ Benchmarks: --fastreadbench Benchmark reading a single repeated character. --fastwritebench Benchmark writing a single repeated character. --pingbench Benchmark ping time. - --randechobench Benchmark sending random data, and receiving it + --randechobench Benchmark sending random data, and receiving it back --randreadbench Benchmark reading random, incompressible data. --randwritebench Benchmark writing random, incompressible data. @@ -100,7 +100,7 @@ Example: Connect to port 42000 and run all the benchmarks: $0 --port 42000 -a - + HELP exit(0); } @@ -111,7 +111,7 @@ if (!$opt_port) { } -my $socket = IO::Socket::INET->new(PeerAddr => $opt_host, PeerPort => $opt_port, Proto => 'tcp'); +my $socket = IO::Socket::INET->new(PeerAddr => $opt_host, PeerPort => $opt_port, Proto => 'tcp'); if (!$socket) { die "Can't connect to $opt_host:$opt_port: $!"; } @@ -142,7 +142,7 @@ if ( $cmd_pingbench ) { for(my $i=0;$i<$opt_count;$i++) { send_cmd("echo $i"); read_until_prompt(); - + my $elapsed = tv_interval($t0, [gettimeofday()]); if ( $opt_dump ) { print "$elapsed\t$i\n"; @@ -413,4 +413,3 @@ sub show_last { undef $self->{prev_time}; $self->set( $self->{last_str} ) if ( $self->{last_str} ); } - |