From 517ed4cf703ac6b03f1eb8b579baa9a63a2d7ab0 Mon Sep 17 00:00:00 2001 From: harrisb Date: Thu, 14 Mar 2013 20:24:01 +0000 Subject: Thu Mar 14 20:21:19 UTC 2013 Byron Harris --- TAO/ChangeLog | 8 ++++++++ TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp | 10 ++++++++-- TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl | 11 ++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6f0e4b6ecef..b7710deb362 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 14 20:21:19 UTC 2013 Byron Harris + + * orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp: + * orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: + + If valgrind is being ran, adjust delay parameters to + account for valgrind slowing processes down. + Thu Mar 14 15:54:03 UTC 2013 Kevin Stanley * orbsvcs/tests/ImplRepo/run_test.pl: diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp index 30b0cd05b24..1c4daf1fc00 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp @@ -6,11 +6,12 @@ #include "ace/OS_NS_unistd.h" const ACE_TCHAR *ior = ACE_TEXT("file://Messenger.ior"); +int seconds_between_requests = 4; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:d:")); int c; while ((c = get_opts ()) != -1) @@ -20,11 +21,16 @@ parse_args (int argc, ACE_TCHAR *argv[]) ior = get_opts.opt_arg (); break; + case 'd': + seconds_between_requests = ACE_OS::atoi (get_opts.opt_arg ()); + break; + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-k " + "-d (Delay between requests) " "\n", argv [0]), -1); @@ -70,7 +76,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Force server to abort to verify it will be brought // back up when send_message() is called. messenger->abort(2); - ACE_OS::sleep(4); + ACE_OS::sleep(seconds_between_requests); ACE_DEBUG ((LM_INFO, "(%P|%t) - Sending another message after abort of server\n")); diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl index 8c8d2ae5cdc..9d502a77a40 100755 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl @@ -18,6 +18,14 @@ foreach $i (@ARGV) { my $extra_timeout = 45; +my $seconds_between_requests = 4; + +# Valgrind may slow down processes enough that an extra delay +# is needed between client requests. +if (exists $ENV{'ACE_RUN_VALGRIND_CMD'}) { + $seconds_between_requests = 10; +} + my $c1 = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $imr = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $act = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; @@ -87,7 +95,8 @@ $SI = $si->CreateProcess ($tao_imr, "-ORBInitRef ImplRepoService=file://$si_imri $C1 = $c1->CreateProcess ("MessengerClient", "-k file://$c1_srviorfile ". "-ORBForwardOnReplyClosedLimit 20 -ORBForwardDelay 500 ". - "-ORBSvcConf $c1_conffile -ORBdebuglevel $debug_level"); + "-ORBSvcConf $c1_conffile -ORBdebuglevel $debug_level ". + "-d $seconds_between_requests"); $SDN = $sdn->CreateProcess ("$tao_imr", "-ORBInitRef ImplRepoService=file://$sdn_imriorfile ". "shutdown MessengerService"); -- cgit v1.2.1