diff options
22 files changed, 675 insertions, 851 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index cbcd391e65a..73a02424588 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,61 @@ +Thu Mar 1 14:14:38 2001 Darrell Brunsch <brunsch@uci.edu> + + And today's quote is..... + + "What we call progress is the exchange of one Nuisance for another + Nuisance." + - Havelock Ellis + + This is the first in a set of updates to the run_test.pl scripts. + The goal is to start running the tests for the Release configuration + and for Borland. These setups output the executables into sub- + directories, which wasn't handled too well by the old ACEutils.pm + perl module. PerlACE::Run_Test contains an updated Process class + which does a much better job of handling this (among other things). + + * performance-tests/Latency/deferred_synch_client.dsp: + + Changed the output executable name to match the other platforms. + + * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp: + * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp: + + Output directory of Win32 Release executables should be "Release". + + * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: + + Made sure to clean up shmiop files when finished. + + * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: + + Made some minor updates to make it more consistent with the rest of + the run_test.pl scripts. + + * performance-tests/Callback/run_test.pl: + * performance-tests/Cubit/TAO/DII_Cubit/run_test.pl: + * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: + * performance-tests/Latency/multi_threaded.pl: + * performance-tests/Latency/run_test.pl: + * performance-tests/Latency/scalability.pl: + * performance-tests/Latency/single_threaded.pl: + * performance-tests/POA/Object_Creation_And_Registration/run_test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl: + * performance-tests/RTCorba/Oneways/Reliable/client_test.pl: + * performance-tests/RTCorba/Oneways/Reliable/run_test.pl: + + Updated to use PerlACE::Run_Test. + +Tue Feb 27 17:45:55 2001 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> + + * orbsvcs/tests/AVStreams/Latency/control.cpp: + * orbsvcs/tests/AVStreams/Latency/pong.cpp: + Thu Mar 1 15:21:53 2001 Jeff Parsons <parsons@cs.wustl.edu> * tao/TypeCode.cpp: @@ -762,7 +820,6 @@ Mon Feb 26 01:24:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de> With TAO_ORB_Core_instance we could have actually fetched the wrong ORB. ->>>>>>> 1.2613 Sun Feb 25 19:37:24 2001 Carlos O'Ryan <coryan@uci.edu> * examples/POA/Adapter_Activator/run_test.pl: diff --git a/TAO/performance-tests/Callback/run_test.pl b/TAO/performance-tests/Callback/run_test.pl index fb117e30f64..dcb684aee66 100755 --- a/TAO/performance-tests/Callback/run_test.pl +++ b/TAO/performance-tests/Callback/run_test.pl @@ -5,44 +5,40 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../bin'; -require ACEutils; +use lib "../../../bin"; +use PerlACE::Run_Test; -$iorfile = "test.ior"; +$status = 0; +$iorfile = PerlACE::LocalFile ("test.ior"); + +$SV = new PerlACE::Process ("server", "-o $iorfile"); +$CL = new PerlACE::Process ("client", "-k file://$iorfile -i 1000"); print STDERR "================ Callback performance test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -o $iorfile"); +$SV->Spawn (); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -k file://$iorfile " - . " -i 1000"); +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (10); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; } -$server = $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; -} - -exit 0; +exit 1; diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl index 9265b516fbd..5373e0b021b 100755 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl @@ -5,114 +5,80 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -# The first three lines above let this script run without specifying the -# full path to perl, as long as it is in the user's PATH. -# Taken from perlrun man page. - -# Do not use environment variables here since not all platforms use ACE_ROOT use lib "../../../../../bin"; +use PerlACE::Run_Test; -require ACEutils; - -$iorfile = "cubit.ior"; -$clexepref = '.' . $DIR_SEPARATOR; -$svexepref = ".." . $DIR_SEPARATOR . "IDL_Cubit" . $DIR_SEPARATOR; -$svnsflags = " -f $iorfile"; -$clnsflags = " -f $iorfile"; +$status = 0; +$iorfile = PerlACE::LocalFile ("cubit.ior"); +$svnsflags = " -f $iorfile "; +$clnsflags = " -f $iorfile "; $clflags = ""; $svflags = ""; -# Make sure the file is gone, so we can wait on it. -unlink $iorfile; - - +############################################################################### # Parse the arguments -for ($i = 0; $i <= $#ARGV; $i++) -{ - SWITCH: - { - if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") - { - print "run_test [-h] [-n num] [-sleeptime t] [-debug] [-release] [-orblite]\n"; - print "\n"; - print "-h -- prints this information\n"; - print "-n num -- client uses <num> iterations\n"; - print "-sleeptime t -- run_test should sleep for <t> seconds between running\n"; - print " the server and client (default is 5 seconds)\n"; - print "-debug -- sets the debug flag for both client and server\n"; - print "-release -- runs the Release version of the test (for NT use)\n"; - print "-orblite -- Use the lite version of the orb"; - exit; - } - if ($ARGV[$i] eq "-debug") - { - $clflags .= " -d"; - $svflags .= " -d"; - last SWITCH; +for (my $i = 0; $i <= $#ARGV; $i++) { + if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { + print "run_test [-h] [-n num] [-debug] [-orblite]\n"; + print "\n"; + print "-h -- prints this information\n"; + print "-n num -- client uses <num> iterations\n"; + print "-debug -- sets the debug flag for both client and server\n"; + print "-orblite -- Use the lite version of the orb"; + exit; } - if ($ARGV[$i] eq "-release") - { - $exepref = "Release".$DIR_SEPARATOR; - last SWITCH; + elsif ($ARGV[$i] eq "-debug") { + $clflags .= " -d "; + $svflags .= " -d "; } - if ($ARGV[$i] eq "-n") - { - $clflags .= " -n $ARGV[$i + 1]"; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-n") { + $clflags .= " -n $ARGV[$i + 1] "; + $i++; } - if ($ARGV[$i] eq "-sleeptime") - { - $ACE::sleeptime = $ARGV[$i + 1]; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-orblite") { + $clflags .= " -ORBgioplite "; + $svflags .= " -ORBgioplite "; } - if ($ARGV[$i] eq "-orblite") - { - $clflags .= " -ORBgioplite"; - $svflags .= " -ORBgioplite"; - last SWITCH; + else { + print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n"; } - print "run_test: Unknown Option: ".$ARGV[$i]."\n"; - } } -(-f $svexepref."server".$EXE_EXT && - -f $clexepref."client".$EXE_EXT) || - die "$0: server and/or client need to be built!\n"; +############################################################################### -$SV = Process::Create ($svexepref."server".$EXE_EXT, - $svflags. - $svnsflags); +my $SV = new PerlACE::Process ("../IDL_Cubit/server", $svflags . $svnsflags); +my $CL = new PerlACE::Process ("client", "$clflags $clnsflags -x"); -# Put in a wait between the server and client +if (! (-x $SV->Executable () && -x $CL->Executable)) { + print STDERR "ERROR: server and/or client missing or not executable!\n"; + exit 1; +} + +# Make sure the file is gone, so we can wait on it. +unlink $iorfile; -if (ACE::waitforfile_timed ($iorfile, 10) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$CL = Process::Create ($clexepref . "client".$EXE_EXT, - " $clflags $clnsflags -x"); +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (10); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; } -$server = $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; -} - -exit 0; +exit $status; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl index f3d52ad8721..738d2c8fa96 100755 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl @@ -11,259 +11,137 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # Do not use environment variables here since not all platforms use ACE_ROOT use lib "../../../../../bin"; - +use PerlACE::Run_Test; use English; -require Process; -require ACEutils; -$iorfile = "cubit.ior"; -$exepref = '.' . $DIR_SEPARATOR; +$status = 0; + +$iorfile = PerlACE::LocalFile ("cubit.ior"); +$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite.conf"); +$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite.conf"); +$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop.conf"); + $svnsflags = " -f $iorfile"; $clnsflags = " -f $iorfile"; $clflags = ""; $svflags = ""; -$quietflag = "-q"; -$liteflag = ""; -$svliteflag = ""; -$clliteflag = ""; +$quietflag = " -q "; +$giopliteflag = 0; + +############################################################################### # Parse the arguments -for ($i = 0; $i <= $#ARGV; $i++) -{ - SWITCH: - { - if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") - { - print "run_test [-h] [-n num] [-sleeptime t]", - " [-debug] [-release] [-orblite] [-verbose]\n"; - print "\n"; - print "-h -- prints this information\n"; - print "-n num -- client uses <num> iterations\n"; - print "-sleeptime t -- run_test should sleep for <t> seconds between running\n"; - print " the server and client (default is 5 seconds)\n"; - print "-debug -- sets the debug flag for both client and server\n"; - print "-release -- runs the Release version of the test (for NT use)\n"; - print "-orblite -- Use the lite version of the orb"; - exit; - } - if ($ARGV[$i] eq "-debug") - { - $clflags .= " -d"; - $svflags .= " -d"; - last SWITCH; +for ($i = 0; $i <= $#ARGV; $i++) { + if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { + print "run_test [-h] [-n num] [-debug] [-orblite] [-verbose]\n"; + print "\n"; + print "-h -- prints this information\n"; + print "-n num -- client uses <num> iterations\n"; + print "-debug -- sets the debug flag for both client and " + . "server\n"; + print "-orblite -- Use the lite version of the orb"; + exit; } - if ($ARGV[$i] eq "-release") - { - $exepref = "Release".$DIR_SEPARATOR; - last SWITCH; + elsif ($ARGV[$i] eq "-debug") { + $clflags .= " -d "; + $svflags .= " -d "; } - if ($ARGV[$i] eq "-n") - { - $clflags .= " -n $ARGV[$i + 1]"; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-n") { + $clflags .= " -n $ARGV[$i + 1] "; + $i++; } - if ($ARGV[$i] eq "-sleeptime") - { - $ACE::sleeptime = $ARGV[$i + 1]; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq " -orblite ") { + $giopliteflag = 1; } - if ($ARGV[$i] eq "-orblite") - { - $liteflag = "uselite"; - last SWITCH; + elsif ($ARGV[$i] eq " -verbose ") { + $quietflag = ""; } - if ($ARGV[$i] eq "-verbose") - { - $quietflag = ""; - last SWITCH; + else { + print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n"; } - print "run_test: Unknown Option: ".$ARGV[$i]."\n"; - } } -(-f $exepref."server".$EXE_EXT && - -f $exepref."client".$EXE_EXT) || - die "$0: server and/or client need to be built!\n"; - -unlink $iorfile; - -sleep 2; +$SV = new PerlACE::Process ("server"); +$CL = new PerlACE::Process ("client"); -print stderr "\nRunning IDL_Cubit with the default ORB protocol.\n\n"; +############################################################################### +# run_test_helper -if ($liteflag eq "uselite") +sub run_test_helper () { - $svliteflag = "-ORBSvcConf iiop_lite.conf"; - $clliteflag = "-ORBSvcConf iiop_lite.conf"; - print stderr "\nRunning IDL_Cubit with the a lite ORB protocol.\n\n"; -} - -$SV = Process::Create ($exepref."server".$EXE_EXT, - $svflags. - $svliteflag. - $svnsflags); - -if (ACE::waitforfile_timed ($iorfile, 10) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} - -$CL = Process::Create ($exepref . "client".$EXE_EXT, - " $quietflag $clflags $clnsflags $clliteflag -x"); + $SV->Spawn (); -$client = $CL->TimedWait (120); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); -} - -$server = $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} - -unlink $iorfile; + if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; + } -if ($server != 0) { - print STDERR "ERROR: server error status $server\n"; -} + my $client = $CL->SpawnWaitKill (120); + my $server = $SV->WaitKill (30); + + unlink $iorfile; -if ($client != 0) { - print STDERR "ERROR: client error status $client\n"; -} + if ($server != 0) { + print STDERR "ERROR: server error status $server\n"; + $status = 1; + } -if ($server != 0 || $client != 0) { - exit 1; + if ($client != 0) { + print STDERR "ERROR: client error status $client\n"; + $status = 1; + } } -if ($OSNAME ne "MSWin32") -{ - # Only run the UIOP test on Unix platforms. - - Process::Wait(); - - # No need to unlink the iorfile again. - # unlink $iorfile; +############################################################################### - sleep 2; - - print stderr "\nRunning IDL_Cubit with the UIOP protocol.\n\n"; - if ($liteflag eq "uselite") - { - $svliteflag = "-ORBSvcConf uiop_lite.conf"; - $clliteflag = "-ORBSvcConf uiop_lite.conf"; - print stderr "\nRunning IDL_Cubit with the a UIOP lite ORB protocol.\n\n"; - } - - # Save the original server flags. - $save_svflags = $svflags; - - $svflags .= " -ORBEndpoint uiop://"; - - $SV = Process::Create ($exepref."server".$EXE_EXT, - $svflags. - $svliteflag. - $svnsflags); - - if (ACE::waitforfile_timed ($iorfile, 10) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; - } - - $CL = Process::Create ($exepref . "client".$EXE_EXT, - " $quietflag $clflags $clnsflags $clliteflag -x"); - - $client = $CL->TimedWait (120); - if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); - } - - $server = $SV->TimedWait (30); - if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); - } - - # Restore the original server flags - $svflags = $save_svflags; - - unlink $iorfile; - - if ($server != 0) { - print STDERR "ERROR: server error status $server\n"; - } - - if ($client != 0) { - print STDERR "ERROR: client error status $client\n"; - } - - if ($server != 0 || $client != 0) { +if (! (-x $SV->Executable () && -x $CL->Executable)) { + print STDERR "ERROR: server and/or client missing or not executable!\n"; exit 1; - } } -# Run the SHMIOP test. - -Process::Wait(); - -# No need to unlink the iorfile again. -# unlink $iorfile; - -sleep 2; +unlink $iorfile; -print stderr "\nRunning IDL_Cubit with the SHMIOP protocol.\n\n"; +print STDERR "============================================================\n"; +print STDERR "Running IDL_Cubit with the default ORB protocol.\n\n"; -# Save the original server flags. -$save_svflags = $svflags; +$SV->Arguments ($svflags . $svnsflags); +$CL->Arguments ($clflags . $clnsflags . $quietflag . " -x "); -$svflags .= " -ORBEndpoint shmiop:// -ORBSvcconf server_shmiop.conf "; +if ($giopliteflag) { + print STDERR "\nRunning IDL_Cubit with the a lite ORB protocol.\n\n"; + $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $iiop_lite_conf "); + $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $iiop_lite_conf "); +} -$SV = Process::Create ($exepref."server".$EXE_EXT, - $svflags. - $svnsflags); +run_test_helper (); -if (ACE::waitforfile_timed ($iorfile, 10) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +if ($OSNAME ne "MSWin32") { + print STDERR "============================================================\n"; + print STDERR "Running IDL_Cubit with the UIOP protocol.\n\n"; -$CL = Process::Create ($exepref . "client".$EXE_EXT, - " $quietflag $clflags $clnsflags -x"); + $SV->Arguments ($svflags . $svnsflags . " -ORBEndpoint uiop:// "); + $CL->Arguments ($clflags . $clnsflags . $quietflag . " -x "); -$client = $CL->TimedWait (120); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); -} + if ($giopliteflag) { + print STDERR "\nRunning IDL_Cubit with the a UIOP lite ORB protocol.\n\n"; + $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $uiop_lite_conf "); + $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $uiop_lite_conf "); + } -$server = $SV->TimedWait (30); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); + run_test_helper (); } -# Restore the original server flags -$svflags = $save_svflags; - -unlink $iorfile; +print STDERR "============================================================\n"; +print STDERR "Running IDL_Cubit with the SHMIOP protocol.\n\n"; -if ($server != 0) { - print STDERR "ERROR: server error status $server\n"; -} +$SV->Arguments ($svflags . $svnsflags + . " -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf "); +$CL->Arguments ($clflags . $clnsflags . $quietflag . " -x "); -if ($client != 0) { - print STDERR "ERROR: client error status $client\n"; -} +run_test_helper (); -if ($server != 0 || $client != 0) { - exit 1; -} +# Clean up SHMIOP files +unlink glob ("server_shmiop_*"); -exit 0; +exit $status; diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl index 36de02e21a5..559bdaac458 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl @@ -11,7 +11,6 @@ use lib "../../../../../bin"; use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("mtcubit.ior"); -$sleeptime = 3; $iterations = 1000; $low_priority_threads = 1; $thread_per_rate = ''; @@ -57,19 +56,19 @@ $CL = new PerlACE::Process ("client", "$thread_per_rate -f $iorfile -t $threads $SV->Spawn (); if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); - exit 1; + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } $client = $CL->SpawnWaitKill (180); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); -} - $SV->Kill (); unlink $iorfile; -exit $client == 0 ? 0 : 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + exit 1; +} + +exit 0; diff --git a/TAO/performance-tests/Latency/deferred_synch_client.dsp b/TAO/performance-tests/Latency/deferred_synch_client.dsp index d9fa02ab94d..b40b99983b2 100644 --- a/TAO/performance-tests/Latency/deferred_synch_client.dsp +++ b/TAO/performance-tests/Latency/deferred_synch_client.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 TAO_DynamicInterface.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /out:"deferred_synch_client.exe" /libpath:"../../tao/DynamicInterface" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/Strategies"
+# ADD LINK32 TAO_DynamicInterface.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"../../tao/DynamicInterface" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/Strategies"
!ELSEIF "$(CFG)" == "Latency Tests Deferred Synch Client - Win32 Debug"
diff --git a/TAO/performance-tests/Latency/multi_threaded.pl b/TAO/performance-tests/Latency/multi_threaded.pl index 1fdc3496661..62a81e05b40 100755 --- a/TAO/performance-tests/Latency/multi_threaded.pl +++ b/TAO/performance-tests/Latency/multi_threaded.pl @@ -5,46 +5,47 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../bin'; -require ACEutils; +use lib "../../../bin"; +use PerlACE::Run_Test; -$iorfile = "test.ior"; +$iorfile = PerlACE::LocalFile ("test.ior"); +$server_conf = PerlACE::LocalFile ("server.conf"); +$client_conf = PerlACE::LocalFile ("client.conf"); print STDERR "================ Multi-threaded test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ", - " -ORBSvcConf server.conf" - . " -o $iorfile"); +$SV = new PerlACE::Process ("st_server", + " -ORBSvcConf $server_conf" + . " -o $iorfile"); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +$CL = new PerlACE::Process ("st_client", + " -ORBSvcConf $client_conf " + . " -k file://$iorfile " + . " -i 50000"); -$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -k file://$iorfile " - . " -i 50000"); +$SV->Spawn (); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$server = $SV->TimedWait (5); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (10); unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } -exit 0; +exit $status; diff --git a/TAO/performance-tests/Latency/run_test.pl b/TAO/performance-tests/Latency/run_test.pl index 5bd06dca430..bbda039337d 100755 --- a/TAO/performance-tests/Latency/run_test.pl +++ b/TAO/performance-tests/Latency/run_test.pl @@ -5,124 +5,122 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../bin'; -require ACEutils; +use lib "../../../bin"; +use PerlACE::Run_Test; -$client_conf="client.conf"; -$server_conf="server.conf"; -$threads='4'; +$status = 0; -$iorfile = "test.ior"; +$threads = '4'; -print STDERR "================ Multi-threaded test\n"; +$iorfile = PerlACE::LocalFile ("test.ior"); +$server_conf = PerlACE::LocalFile ("server.conf"); +$client_conf = PerlACE::LocalFile ("client.conf"); +$st_server_conf = PerlACE::LocalFile ("st_server.conf"); +$st_client_conf = PerlACE::LocalFile ("st_client.conf"); +$client_st_muxed_conf = PerlACE::LocalFile ("client-st-muxed.conf"); unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf server.conf" - . " -o $iorfile -n $threads"); +print STDERR "================ Multi-threaded test\n"; -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +$SV = new PerlACE::Process ("server", + " -ORBSvcConf $server_conf -o $iorfile" + . " -n $threads"); +$CL = new PerlACE::Process ("client", + " -ORBSvcConf $client_conf -k file://$iorfile " + . " -n $threads -i 1000"); -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -k file://$iorfile " - . " -n $threads -i 1000"); +$SV->Spawn (); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$server = $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (5); unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } print STDERR "================ Single-threaded test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ", - " -ORBSvcConf st_server.conf" - . " -o $iorfile"); - -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +$SV = new PerlACE::Process ("st_server", + " -ORBSvcConf $st_server_conf" + . " -o $iorfile"); +$CL = new PerlACE::Process ("st_client", + " -ORBSvcConf $st_client_conf " + . " -k file://$iorfile " + . " -i 1000"); -$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ", - " -ORBSvcConf st_client.conf " - . " -k file://$iorfile " - . " -i 1000"); +$SV->Spawn (); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$server = $SV->TimedWait (5); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (5); unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } print STDERR "================ Deferred synchronous test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ", - " -ORBSvcConf st_server.conf" - . " -o $iorfile"); - -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +$SV = new PerlACE::Process ("st_server", + " -ORBSvcConf $st_server_conf" + . " -o $iorfile"); +$CL = new PerlACE::Process ("deferred_synch_client", + " -ORBSvcConf $client_st_muxed_conf " + . " -k file://$iorfile " + . " -i 1000"); -$CL = Process::Create ($EXEPREFIX."deferred_synch_client$EXE_EXT ", - " -ORBSvcConf client-st-muxed.conf " - . " -k file://$iorfile " - . " -i 1000"); +$SV->Spawn (); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$server = $SV->TimedWait (5); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (5); unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } -exit 0; +exit $status; diff --git a/TAO/performance-tests/Latency/scalability.pl b/TAO/performance-tests/Latency/scalability.pl index 9d31258417c..b3a235cf32f 100755 --- a/TAO/performance-tests/Latency/scalability.pl +++ b/TAO/performance-tests/Latency/scalability.pl @@ -5,85 +5,81 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../bin'; -require ACEutils; +use lib '../../../bin'; +use PerlACE::Run_Test; -$client_conf="client.conf"; -$server_conf="server.conf"; +$status = 0; +$server_conf = PerlACE::LocalFile ("server.conf"); +$client_conf = PerlACE::LocalFile ("client.conf"); $iterations = 10000; -$iorfile = "test.ior"; +$iorfile = PerlACE::LocalFile ("test.ior"); + +$JSV = new PerlACE::Process ("vbj", + "java_server" + . " -D -OAid TPool" + . " -D -OAthreadMax 0" + . " -D -OAthreadMin 16"); + +$JSV->IgnoreExeSubDir (1); + +$SV = new PerlACE::Process ("server", + " -ORBSvcConf $server_conf" + . " -o $iorfile -n 16"); + + +$CL = new PerlACE::Process ("client"); print STDERR "================ Java server test\n"; unlink $iorfile; -$SV = Process::Create ("vbj", - "java_server", - " -D -OAid TPool" - ." -D -OAthreadMax 0" - ." -D -OAthreadMin 16"); +$JSV->Spawn (); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $JSV->Kill (); + exit 1; } for ($i = 1; $i < 40; $i += 4) { - $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -k file://$iorfile " - . " -n $i -i $iterations -p 10 -x"); - - # Each iteration should take 100 seconds - $client = $CL->Wait (); - if ($client == -1) { - print STDERR "ERROR: client <$i> timedout\n"; - $CL->Kill (); $CL->TimedWait (1); - } + $CL->Arguments ("-ORBSvcConf $client_conf " + . " -k file://$iorfile " + . " -n $i -i $iterations -p 10 -x"); + + if ($CL->SpawnWaitKill (120) != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; + } } -$server = $SV->Terminate (); $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$JSV->Kill (); print STDERR "================ C++ server test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf $server_conf" - . " -o $iorfile -n 16"); +$SV->Spawn (); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } for ($i = 1; $i < 40; $i += 4) { - $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -k file://$iorfile " - . " -n $i -i $iterations -p 10 -x"); - - # Each iteration should take 100 seconds - $client = $CL->Wait (); - if ($client == -1) { - print STDERR "ERROR: client <$i> timedout\n"; - $CL->Kill (); $CL->TimedWait (1); - } + $CL->Arguments (" -ORBSvcConf $client_conf " + . " -k file://$iorfile " + . " -n $i -i $iterations -p 10 -x"); + + if ($CL->SpawnWaitKill (120) != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; + } } -$server = $SV->Terminate (); $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$SV->Kill (); unlink $iorfile; -exit 0; +exit $status; diff --git a/TAO/performance-tests/Latency/single_threaded.pl b/TAO/performance-tests/Latency/single_threaded.pl index 6a2c12f4ab3..6ef0f33ec7e 100755 --- a/TAO/performance-tests/Latency/single_threaded.pl +++ b/TAO/performance-tests/Latency/single_threaded.pl @@ -5,46 +5,48 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../bin'; -require ACEutils; +use lib "../../../bin"; +use PerlACE::Run_Test; -$iorfile = "test.ior"; +$status = 0; +$iorfile = PerlACE::LocalFile ("test.ior"); +$st_server_conf = PerlACE::LocalFile ("st_server.conf"); +$st_client_conf = PerlACE::LocalFile ("st_client.conf"); print STDERR "================ Single-threaded test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ", - " -ORBSvcConf st_server.conf" - . " -o $iorfile"); +$SV = new PerlACE::Process ("st_server", + " -ORBSvcConf $st_server_conf" + . " -o $iorfile"); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +$CL = new PerlACE::Process ("st_client", + " -ORBSvcConf $st_client_conf " + . " -k file://$iorfile " + . " -i 50000"); -$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ", - " -ORBSvcConf st_client.conf " - . " -k file://$iorfile " - . " -i 50000"); +$SV->Spawn (); -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$server = $SV->TimedWait (5); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (10); unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } -exit 0; +exit $status; diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl index 1c23e2a8df2..edb693dbf93 100755 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl @@ -5,20 +5,16 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../bin'; -require Process; -require ACEutils; +use lib '../../../../bin'; +use PerlACE::Run_Test -$T = Process::Create ($EXEPREFIX."registration".$EXE_EXT, ""); +$T = new PerlACE::Process ("registration"); -$client = $T->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: test timedout\n"; - $T->Kill (); $T->TimedWait (1); -} +$test = $T->SpawnWaitKill (60); -if ($client == -1) { - exit 1; +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; } exit 0; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp index d1a93d437c9..4e6dca6bd58 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp index cab64ea3608..8273d2aa2cc 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
!ELSEIF "$(CFG)" == "Endpoint_per_Priority Server - Win32 Debug"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl index 76dd7418d19..830c4f8a718 100755 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl @@ -5,53 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../../bin'; -require ACEutils; - -$client_conf="client.conf"; -$server_conf="server.conf"; -$iorfile = "test.ior"; - +use lib '../../../../../bin'; +use PerlACE::Run_Test; + +$client_conf = PerlACE::LocalFile ("client.conf"); +$server_conf = PerlACE::LocalFile ("server.conf"); +$iorfile = PerlACE::LocalFile ("test.ior"); + +$SV = new PerlACE::Process ("server", + " -ORBSvcConf $server_conf " + . " -ORBEndPoint iiop://localhost:0/priority=1 " + . " -ORBEndPoint iiop://localhost:0/priority=2 " + . " -ORBEndPoint iiop://localhost:0/priority=3 " + . " -ORBEndPoint iiop://localhost:0/priority=4 " + . " -ORBEndPoint iiop://localhost:0/priority=5 " + . " -o $iorfile"); +$CL = new PerlACE::Process ("client", + " -ORBSvcConf $client_conf " + . " -i file://$iorfile " + . " -t 1 -t 2 -t 3 -t 4 -t 5 -n 4000"); + print STDERR "================ Endpoint Per Priority Test\n"; unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf server.conf" - . " -ORBEndPoint iiop://localhost:0/priority=1 " - . " -ORBEndPoint iiop://localhost:0/priority=2 " - . " -ORBEndPoint iiop://localhost:0/priority=3 " - . " -ORBEndPoint iiop://localhost:0/priority=4 " - . " -ORBEndPoint iiop://localhost:0/priority=5 " - . " -o $iorfile"); - -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} +$SV->Spawn (); -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -i file://$iorfile " - . " -t 1 -t 2 -t 3 -t 4 -t 5 -n 4000"); - -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$server = $SV->TimedWait (30); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill(60); +$SV->Kill (); unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + exit 1; } exit 0; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp index e1bff30e19d..7761d2a4772 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp index 66d80158c3f..435718c0cbd 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
!ELSEIF "$(CFG)" == "Orb_Per_Priority Server - Win32 Debug"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl index 60c13e346db..17b493a1953 100755 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl @@ -5,13 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../../bin'; -require ACEutils; - -$client_conf="client.conf"; -$server_conf="server.conf"; -$iorfile = "test.ior"; - +use lib '../../../../../bin'; +use PerlACE::Run_Test; + +$client_conf = PerlACE::LocalFile ("client.conf"); +$server_conf = PerlACE::LocalFile ("server.conf"); +$iorfile = PerlACE::LocalFile ("ior"); + +$SV = new PerlACE::Process ("server", + " -ORBSvcConf $server_conf" + . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 " + . " -o $iorfile"); + +$CL = new PerlACE::Process ("client", + " -ORBSvcConf $client_conf " + . " -i file://$iorfile " + . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 40000"); + print STDERR "================ ORB Per Priority Test\n"; unlink $iorfile."_1"; @@ -21,33 +31,16 @@ unlink $iorfile."_4"; unlink $iorfile."_5"; unlink $iorfile."_30"; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf server.conf" - . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 " - . " -o $iorfile"); +$SV->Spawn (); -if (ACE::waitforfile_timed ($iorfile."_1", 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; +if (PerlACE::waitforfile_timed ($iorfile."_1", 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -i file://$iorfile " - . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 40000"); - -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); -} - -$server = $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$client = $CL->SpawnWaitKill (120); +$SV->Kill (10); unlink $iorfile."_1"; unlink $iorfile."_2"; @@ -56,9 +49,9 @@ unlink $iorfile."_4"; unlink $iorfile."_5"; unlink $iorfile."_30"; - -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + exit 1; } exit 0; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp index 8107b74ac2b..b1c7f4b7e7a 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp index e6864b9a68c..30de49bfac9 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
!ELSEIF "$(CFG)" == "Single_Endpoint Server - Win32 Debug"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl index f1de2e49498..e85431f372e 100755 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl @@ -5,51 +5,52 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../../bin'; -require ACEutils; +use lib '../../../../../bin'; +use PerlACE::Run_Test; -$client_conf="client.conf"; -$server_conf="server.conf"; -$iorfile="test.ior"; +$status = 0; +$client_conf = PerlACE::LocalFile ("client.conf"); +$server_conf = PerlACE::LocalFile ("server.conf"); +$iorfile = PerlACE::LocalFile ("test.ior"); -print STDERR "================ Single Endpoint Test\n"; +$SV = new PerlACE::Process ("server", + " -ORBSvcConf $server_conf" + . " -o $iorfile"); -unlink $iorfile; +# Run client with 5 threads of low priority and 1 thread of high priority. -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", - " -ORBSvcConf server.conf" - . " -o $iorfile"); +$CL = new PerlACE::Process ("client", + " -ORBSvcConf $client_conf " + . " -i file://$iorfile " + . " -n 10000 " + . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30"); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; -} -# Run client with 5 threads of low priority and 1 thread of high priority. +print STDERR "================ Single Endpoint Test\n"; -$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBSvcConf client.conf " - . " -i file://$iorfile " - . " -n 10000 " - . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30"); +unlink $iorfile; -$client = $CL->TimedWait (60); -if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); -} +$SV->Spawn (); -$server = $SV->TimedWait (60); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } +$client = $CL->SpawnWaitKill (60); +$server = $SV->WaitKill (10); + unlink $iorfile; -if ($server != 0 || $client != 0) { - exit 1; +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } -exit 0; +exit $status; diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl index 47d09784e9e..6eaee2dc1bb 100755 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl @@ -5,62 +5,17 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../../bin'; -require ACEutils; +use lib '../../../../../bin'; +use PerlACE::Run_Test; -$iorfile = "test.ior"; +$iorfile = PerlACE::LocalFile ("test.ior"); $iterations = 4000; $bufsize = 4000; $work = 10; -$transport = ""; $type = ""; -$shutdown = ""; $all = 1; $other = ""; - -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); - } -} +$status = 0; # Parse the arguments @@ -68,64 +23,81 @@ sub run_buffered @bufsizes = (10, 40, 100, 400, 1000, 2000); -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; +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; } - if ($ARGV[$i] eq "-i") - { - $iterations = $ARGV[$i + 1]; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-i") { + $iterations = $ARGV[$i + 1]; + $i++; } - if ($ARGV[$i] eq "-m") - { - $bufsize = $ARGV[$i + 1]; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-m") { + $bufsize = $ARGV[$i + 1]; + $i++; + last SWITCH; } - if ($ARGV[$i] eq "-w") - { - $work = $ARGV[$i + 1]; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-w") { + $work = $ARGV[$i + 1]; + $i++; + last SWITCH; } - if ($ARGV[$i] eq "-t") - { - @types = split (',', $ARGV[$i + 1]); - $all = 0; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-t") { + @types = split (',', $ARGV[$i + 1]); + $all = 0; + $i++; + } + else { + $other .= $ARGV[$i]; } - $other .= $ARGV[$i]; - } } +$CL = new PerlACE::Process ("client"); + if ($all == 1) { - foreach $bufsize (@bufsizes) { - run_buffered ($bufsize); - } + 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 $type (@types) { - run_test ($type); -} + my $transport = ""; + my $shutdown = ""; + + if ($type == "none" || $type == "transport") { + $transport = "-ORBNodelay 0"; + } -unlink $iorfile; + if ($all == 0) { + $shutdown = "-x"; + } + + print STDERR "\n***************** STARTING TEST ******************\n"; + + $CL->Arguments ("$transport -t $type -i $iterations -m $bufsize -w $work $shutdown"); -if ($client != 0) { - exit 1; + my $client = $CL->SpawnWaitKill (60); + + if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; + } } -exit 0; +unlink $iorfile; + +exit $status; diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl index 05165d051df..70f1649babe 100755 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl @@ -5,66 +5,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -unshift @INC, '../../../../../bin'; -require ACEutils; +use lib "../../../../../bin"; +use PerlACE::Run_Test; -$iorfile = "test.ior"; $iterations = 4000; $bufsize = 4000; $work = 10; -$transport = ""; $type = ""; $level = "object"; $shutdown = ""; $all = 1; $other = ""; -unlink $iorfile; - -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 -l $level" - . " -m $bufsize -w $work $shutdown "); - - $client = $CL->TimedWait (60); - if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); - } -} +$status = 0; -sub run_buffered -{ - my $bufsize = shift (@_); - - print STDERR "\n***************** STARTING TEST ******************\n"; - - $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", - " -ORBNodelay 0 -l $level " - . " -t none -i $iterations -m $bufsize"); - - $client = $CL->TimedWait (60); - if ($client == -1) { - print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); - } -} +$iorfile = PerlACE::LocalFile ("test.ior"); +unlink $iorfile; # Parse the arguments @@ -72,91 +28,111 @@ sub run_buffered @bufsizes = (10, 40, 100, 400, 1000, 2000); -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 "-l level -- level at which policy is set\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++) { + 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 "-l level -- level at which policy is set\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++; } - if ($ARGV[$i] eq "-t") - { - @types = split (',', $ARGV[$i + 1]); - $all = 0; - $i++; - last SWITCH; + elsif ($ARGV[$i] eq "-l") { + $level = $ARGV[$i + 1]; + $i++; } - if ($ARGV[$i] eq "-l") - { - $level = $ARGV[$i + 1]; - $i++; - last SWITCH; + else { + $other .= $ARGV[$i]; } - $other .= $ARGV[$i]; - } } +############################################################################### + unlink $iorfile; -$SV = Process::Create ($EXEPREFIX."server$EXE_EXT"); +$SV = new PerlACE::Process ("server"); +$CL = new PerlACE::Process ("client"); -if (ACE::waitforfile_timed ($iorfile, 5) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); - exit 1; +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; } +############################################################################### + if ($all == 1) { - foreach $bufsize (@bufsizes) { - run_buffered ($bufsize); - } + foreach $bufsize (@bufsizes) { + print STDERR "\n***************** STARTING TEST ******************\n"; + + $CL->Arguments ("-ORBNodelay 0 -l $level -t none -i $iterations -m $bufsize"); + + my $client = $CL->SpawnWaitKill (60); + if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; + } + } } -print STDERR "\nSyncScope policy set at the "; -print STDERR $level; -print STDERR " level\n"; +############################################################################### + +print STDERR "\nSyncScope policy set at the $level level\n"; foreach $type (@types) { - run_test ($type); -} + print STDERR "\n***************** STARTING TEST ******************\n"; + + my $transport = ""; + + if ($type == "none" || $type == "transport") { + $transport = "-ORBNodelay 0"; + } -$server = $SV->TimedWait (5); -if ($server == -1) { - print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); + if ($all == 0) { + $shutdown = "-x"; + } + + $CL->Arguments (" $transport -t $type -i $iterations -l $level -m $bufsize -w $work $shutdown "); + + my $client = $CL->SpawnWaitKill (60); + if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; + } } -unlink $iorfile; +############################################################################### -if ($server != 0 || $client != 0) { - exit 1; +$server = $SV->WaitKill (5); +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; } -exit 0; +unlink $iorfile; + +exit $status; |