1 files changed, 95 insertions, 67 deletions

diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
index 6eaee2dc1bb..47d09784e9e 100755
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
@@ -5,17 +5,62 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorfile = "test.ior";
 $iterations = 4000;
 $bufsize = 4000;
 $work = 10;
+$transport = "";
 $type = "";
+$shutdown = "";
 $all = 1;
 $other = "";
-$status = 0;
+
+sub run_test
+{
+  my $type = shift(@_);
+
+  if ($type == "none" || $type == "transport") {
+    $transport = "-ORBNodelay 0";
+  }
+  else {
+    $transport = "";
+  }
+
+  if ($all == 0) {
+    $shutdown = "-x";
+  }
+
+  print STDERR "\n***************** STARTING TEST ******************\n";
+
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                         " $transport -t $type -i $iterations "
+			 . "-m $bufsize -w $work $shutdown ");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+}
+
+sub run_buffered
+{
+  my $bufsize = shift (@_);
+
+  print STDERR "\n***************** STARTING TEST ******************\n";
+
+  $CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                         "-ORBNodelay 0 -t none -i $iterations -m $bufsize");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+}
 
 # Parse the arguments
 
@@ -23,81 +68,64 @@ $status = 0;
 
 @bufsizes = (10, 40, 100, 400, 1000, 2000);
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for TAO Reliable Oneways Test\n\n";
-        print "run_test [-t test type] [-i iterations] [-m buffer size]\n";
-        print "\n";
-        print "-t test type      -- runs only one type of oneway test\n";
-        print "-i iterations     -- number of calls in each test\n";
-        print "-m buffer size    -- queue size for buffered oneways\n";
-        print "-w servant work   -- number of loops of 1000 by servant\n";
-        exit 0;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "Run_Test Perl script for TAO Reliable Oneways Test\n\n";
+      print "run_test [-t test type] [-i iterations] [-m buffer size]\n";
+      print "\n";
+      print "-t test type        -- runs only one type of oneway test\n";
+      print "-i iterations       -- number of calls in each test\n";
+      print "-m buffer size      -- queue size for buffered oneways\n";
+      print "-w servant work	 -- number of loops of 1000 by servant\n";
+      exit 0;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-m") {
-        $bufsize = $ARGV[$i + 1];
-        $i++;
-        last SWITCH;
+    if ($ARGV[$i] eq "-m")
+    {
+      $bufsize = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-w") {
-        $work = $ARGV[$i + 1];
-        $i++;
-        last SWITCH;
+    if ($ARGV[$i] eq "-w")
+    {
+      $work = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-t") {
-        @types = split (',', $ARGV[$i + 1]);
-        $all = 0;
-        $i++;
-    }
-    else {
-        $other .= $ARGV[$i];
+    if ($ARGV[$i] eq "-t")
+    {
+      @types = split (',', $ARGV[$i + 1]);
+      $all = 0;
+      $i++;
+      last SWITCH;
     }
+    $other .= $ARGV[$i];
+  }
 }
 
-$CL = new PerlACE::Process ("client");
-
 if ($all == 1) {
-    foreach $bufsize (@bufsizes) {
-        print STDERR "\n***************** STARTING TEST ******************\n";
-        $CL->Arguments ("-ORBNodelay 0 -t none -i $iterations -m $bufsize");
-
-        my $client = $CL->SpawnWaitKill (60);
-        
-        if ($client != 0) {
-            print STDERR "ERROR: client returned $client\n";
-            $status = 1;
-        }
-    }
+  foreach $bufsize (@bufsizes) {
+    run_buffered ($bufsize);
+  }
 }
 
 foreach $type (@types) {
-    my $transport = "";
-    my $shutdown = "";
-    
-    if ($type == "none" || $type == "transport") {
-        $transport = "-ORBNodelay 0";
-    }
-
-    if ($all == 0) {
-        $shutdown = "-x";
-    }
-
-    print STDERR "\n***************** STARTING TEST ******************\n";
-
-    $CL->Arguments ("$transport -t $type -i $iterations -m $bufsize -w $work $shutdown");
-
-    my $client = $CL->SpawnWaitKill (60);
-    
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+  run_test ($type);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($client != 0) {
+  exit 1;
+}
+
+exit 0;