diff options
author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-22 04:36:58 +0000 |
---|---|---|
committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-22 04:36:58 +0000 |
commit | f95b5f109a9de18b65e6734f16fafb1772def5bd (patch) | |
tree | df3a851a300f798858717f881b287911fad1af22 | |
parent | 6ab3c06d7dd5666b31d759f8dbb0cfbb169da582 (diff) | |
download | ATCD-f95b5f109a9de18b65e6734f16fafb1772def5bd.tar.gz |
ChangeLogTag:Wed Feb 21 20:32:42 2001 Darrell Brunsch <brunsch@uci.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
-rwxr-xr-x | TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl | 35 |
2 files changed, 19 insertions, 23 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b239bbb704d..e28d342bdfd 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Feb 21 20:32:42 2001 Darrell Brunsch <brunsch@uci.edu> + + * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: + + Updated to use PerlACE::Run_Test. Also fixed the timeout + problem we've been seeing on Win2000_DLL_Debug nightly build. + Wed Feb 21 20:17:22 2001 Carlos O'Ryan <coryan@uci.edu> * tests/Multiple/Multiple_Impl.cpp: 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 25aa493ff3b..36de02e21a5 100755 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl @@ -5,14 +5,13 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -$usage = "run_tests.pl [-l suppress -ORBGIOPlite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n"; +$usage = "run_tests.pl [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n"; use lib "../../../../../bin"; -require ACEutils; +use PerlACE::Run_Test; -$iorfile = "mtcubit.ior"; +$iorfile = PerlACE::LocalFile ("mtcubit.ior"); $sleeptime = 3; -$gioplite = '-ORBSvcConf iiop_lite.conf'; $iterations = 1000; $low_priority_threads = 1; $thread_per_rate = ''; @@ -21,9 +20,7 @@ $thread_per_rate = ''; #### Process command line args. #### while ($#ARGV >= $[ && $ARGV[0] =~ /^-/) { - if ($ARGV[0] eq '-l') { - $gioplite = ''; - } elsif ($ARGV[0] eq '-n') { + if ($ARGV[0] eq '-n') { if ($ARGV[1] =~ /^[\da-zA-Z]+$/) { $iterations = $ARGV[1]; shift; } else { @@ -54,32 +51,24 @@ $threads = $low_priority_threads + 1; # Make sure the file is gone, so we can wait on it. unlink $iorfile; -$SV = Process::Create ('.' . $DIR_SEPARATOR . "server" . $EXE_EXT, - " $gioplite $thread_per_rate -f $iorfile -t $threads"); +$SV = new PerlACE::Process ("server", "$thread_per_rate -f $iorfile -t $threads"); +$CL = new PerlACE::Process ("client", "$thread_per_rate -f $iorfile -t $threads -n $iterations"); -sleep $sleeptime; +$SV->Spawn (); -if (ACE::waitforfile_timed ($iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); + $SV->Kill (); exit 1; } -$CL = Process::Create ('.' . $DIR_SEPARATOR . "client" . $EXE_EXT . - " $gioplite $thread_per_rate " . - "-f $iorfile -n $iterations -t $threads"); - -$client = $CL->TimedWait (120); +$client = $CL->SpawnWaitKill (180); if ($client == -1) { print STDERR "ERROR: client timedout\n"; - $CL->Kill (); $CL->TimedWait (1); + $CL->Kill (); } -$SV->Terminate (); $server = $SV->TimedWait (10); -if ($server == -1) { - print STDERR "ERROR: server could not be terminated\n"; - $SV->Kill (); $SV->TimedWait (1); -} +$SV->Kill (); unlink $iorfile; |