ChangeLogTag: Mon Jul 25 13:34:03 2005 Justin Michel <michel_j@ociweb.com>

4 files changed, 63 insertions, 44 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index be042c0e5ac..09a89b03d4f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Mon Jul 25 13:34:03 2005  Justin Michel  <michel_j@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/airplane_server.cpp:
+        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
+
+          Add suicide capability to the server. This won't help any tests
+        pass, but should prevent airplane server processes from hanging.
+
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+
+          Change the both_ir test to work as documented. The test should run
+        once with the servers running, and then once with the servers launched
+        by the activator. This works around some weird startup problems on
+        Windows.
+
 Mon Jul 25 18:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/PortableServer/ThreadStrategyORBControl.{h,cpp}:
@@ -74,9 +89,9 @@ Sat Jul 23 10:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Jul 22 15:39:18 2005  Gary Maxey <gary.maxey@hp.com>
 
-	* tests/OBV/ValueBox/client.cpp:
+        * tests/OBV/ValueBox/client.cpp:
 
-	  Guard against null pointers returned from _downcast()
+          Guard against null pointers returned from _downcast()
 
 Fri Jul 22 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -178,37 +193,37 @@ Fri Jul 22 09:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Thu Jul 21 15:07:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
-	* orbsvcs/FT_ReplicationManager/Makefile.am:
-	* orbsvcs/Fault_Detector/Makefile.am:
-	* orbsvcs/Fault_Notifier/Makefile.am:
-	* orbsvcs/LifeCycle_Service/Makefile.am:
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
-	* orbsvcs/Naming_Service/Makefile.am:
-	* orbsvcs/Notify_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+        * orbsvcs/FT_ReplicationManager/Makefile.am:
+        * orbsvcs/Fault_Detector/Makefile.am:
+        * orbsvcs/Fault_Notifier/Makefile.am:
+        * orbsvcs/LifeCycle_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Makefile.am:
 
-	  Regenerated.
+          Regenerated.
 
 Thu Jul 21 08:29:13 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/orbsvcs/LogMgr_i.cpp:
+        * orbsvcs/orbsvcs/LogMgr_i.cpp:
 
-	  Fix typo in last change.
+          Fix typo in last change.
 
 Thu Jul 21 07:42:40 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/orbsvcs/LogMgr_i.cpp:
+        * orbsvcs/orbsvcs/LogMgr_i.cpp:
 
-	  Don't set the servant retention policy when creating the log POA
-	  in minimum CORBA builds.
+          Don't set the servant retention policy when creating the log POA
+          in minimum CORBA builds.
 
 Thu Jul 21 07:26:27 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbscvs/orbsvcs/Hash_LogStore.cpp:
-	* orbsvcs/orbsvcs/Hash_LogRecordStore.cpp:
+        * orbscvs/orbsvcs/Hash_LogStore.cpp:
+        * orbsvcs/orbsvcs/Hash_LogRecordStore.cpp:
 
           Use ACE_SYNCH_RW_MUTEX instead of ACE_RW_Thread_Mutex to fix
-	  single threaded builds.
+          single threaded builds.
 
 Thu Jul 21 14:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -237,10 +252,10 @@ Thu Jul 21 06:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Wed Jul 20 13:48:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/orbsvcs/Makefile.am:
-	* tao/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * tao/Makefile.am:
 
-	  Regenerated.
+          Regenerated.
 
 Wed Jul 20 11:06:57 2005   Gary Maxey <gary.maxey@hp.com>
 
@@ -434,9 +449,9 @@ Tue Jul 19 16:02:32 2005  Justin Michel  <michel_j@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
 
-	Free process_map_ entries in handle_exit(). Thanks to
+        Free process_map_ entries in handle_exit(). Thanks to
         Yevgen Galchenko <yevgeng at softcomputer dot com> for finding
-	this memory leak.
+        this memory leak.
 
         * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp:
         * orbsvcs/orbsvcs/Notify/Consumer.inl:
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index a60ed730c74..45f4bd9bca3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -2,8 +2,8 @@
 
 #include "airplane_server_i.h"
 
-ACE_RCSID (ImplRepo, 
-           airplane_server, 
+ACE_RCSID (ImplRepo,
+           airplane_server,
            "$Id$")
 
 int
@@ -21,24 +21,24 @@ main (int argc, char *argv[])
 
       if (retval == -1)
         return -1;
-      else
-        {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
+ 
+ 
+      retval = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
+
+      return retval;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
       ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
       ACE_PRINT_EXCEPTION (userex, "User Exception");
-      return -1;
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
-  return 0;
+  return 1;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index b4cad654f09..6b6aaeff06c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -194,11 +194,19 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_Time_Value tv(60);
+      ACE_Time_Value tvStart = ACE_OS::gettimeofday();
+
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      ACE_Time_Value tvEnd = ACE_OS::gettimeofday();
+
       this->root_poa_->destroy(1, 1);
       this->orb_->destroy();
+
+      if (tvEnd - tvStart > tv - ACE_Time_Value(5))
+        return 1;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index f71ca6f1140..c11ca93dfef 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -873,7 +873,6 @@ sub both_ir_test
        . " $refstyle\"");
     $TAO_IMR->SpawnWaitKill (10);
 
-    # launch the servers once, just to get the IORs
     $N_SVR->Arguments (" -o $nestea_ior -ORBUseIMR 1 $imr_initref $refstyle");
     $N_SVR->Spawn ();
     if (PerlACE::waitforfile_timed ($nestea_ior, 10) == -1) {
@@ -884,9 +883,7 @@ sub both_ir_test
         $N_SVR->Kill ();
         return 1;
     }
-    if ($N_SVR->TerminateWaitKill(10) != 0) {
-       return 1;
-    }
+    
     $A_SVR->Arguments (" -o $airplane_ior -ORBUseIMR 1 $imr_initref $refstyle");
     $A_SVR->Spawn ();
     if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
@@ -897,9 +894,6 @@ sub both_ir_test
         $N_SVR->Kill ();
         return 1;
     }
-    if ($A_SVR->TerminateWaitKill(10) != 0) {
-       return 1;
-    }
 
     my @clients;
 
@@ -908,7 +902,6 @@ sub both_ir_test
        push @clients, &create_ncli();
     }
 
-    # This should spawn one of each server
     print "\n## Spawning multiple simultaneous clients with both servers running.\n";
     map $_->Spawn(), @clients;
     map $_->WaitKill(30), @clients;
@@ -919,6 +912,9 @@ sub both_ir_test
     $TAO_IMR->Arguments ("$imr_initref shutdown airplane_server");
     $TAO_IMR->SpawnWaitKill (15);
 
+    $A_SVR->WaitKill();
+    $N_SVR->WaitKill();
+
     print "\n\n\n\n## Spawning multiple simultaneous clients with no servers running.\n";
 
     map $_->Spawn(), @clients;