ChangeLogTag: Fri May 10 01:21:24 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>

8 files changed, 32 insertions, 145 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index c1203eec917..cadb808c077 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Fri May 10 01:21:24 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
+
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp:
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp:
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp:
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp:
+	* orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp:
+	* orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
+	  Minor memory management fixes.  Reduce complexity of
+	  test scripts.
+
 Thu May  9 14:26:52 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index e726d106cd4..55c91b7644e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -435,33 +435,20 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
                                     ACE_ENV_ARG_DECL)
 {
   // Get the stream controller for this endpoint.
-  CORBA::Any_ptr streamctrl_any =
+  CORBA::Any_var streamctrl_any =
     endpoint->get_property_value ("Related_StreamCtrl"
                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   AVStreams::StreamCtrl_ptr streamctrl;
 
-  *streamctrl_any >>= streamctrl;
-
-  this->streamctrls_.bind (flowname,
-                           streamctrl);
-}
-
-void
-Connection_Manager::destroy (ACE_ENV_SINGLE_ARG_DECL)
-{
-  AVStreams::flowSpec stop_spec;
-
-  // Destroy all the stream controls.
-  for (StreamCtrls::iterator iterator = this->streamctrls_.begin ();
-       iterator != this->streamctrls_.end ();
-       ++iterator)
-    {
-      (*iterator).int_id_->destroy (stop_spec
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
+  if( streamctrl_any.in() >>= streamctrl )
+  {
+     // Any still owns the pointer, so we duplicate it 
+     AVStreams::StreamCtrl::_duplicate( streamctrl );
+     this->streamctrls_.bind (flowname,
+                             streamctrl);
+  }
 }
 
 void
@@ -471,14 +458,8 @@ Connection_Manager::destroy (const ACE_CString &flowname
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
 
-  AVStreams::StreamCtrl_var streamctrl;
-  this->streamctrls_.unbind (flowname,
-                             streamctrl);
+  this->streamctrls_.unbind (flowname );
 
-  AVStreams::flowSpec stop_spec;
-  streamctrl->destroy (stop_spec
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 Connection_Manager::Receivers &
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index f3b06b31f7e..4d9fa718149 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -90,9 +90,6 @@ Distributer_Receiver_Callback::handle_destroy (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Distributer_Callback::end_stream\n"));
 
-      DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
       // We can close down now.
       DISTRIBUTER::instance ()->done (1);
     }
@@ -198,9 +195,6 @@ Distributer::init (int argc,
                   TAO_MMDevice (&this->receiver_endpoint_strategy_),
                   -1);
 
-  // Servant Reference Counting to manage lifetime
-  PortableServer::ServantBase_var safe_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
     this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 55aba9ef483..a2cd8fade22 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -256,8 +256,6 @@ main (int argc,
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
index 2f004e80d8a..06a5ee135b1 100755
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl
@@ -198,17 +198,14 @@ sleep $sleeptime;
 
 print STDERR "Starting Distributer\n";
 
-$distributer = $DI->SpawnWaitKill (1000);
+$DI->Spawn ();
 
-if ($distributer != 0) {
-    print STDERR "ERROR: sender returned $distributer\n";
-    $status = 1;
-}
+$SV1->WaitKill(1000);
 
-$sender = $SV1->TerminateWaitKill (1000);
+$distributer = $DI->TerminateWaitKill(1000);
 
-if ($sender != 0) {
-    print STDERR "ERROR: sender returned $sender\n";
+if ($distributer != 0) {
+    print STDERR "ERROR: sender returned $distributer\n";
     $status = 1;
 }
 
@@ -236,76 +233,6 @@ if ($nserver != 0) {
 unlink $nsior;
 unlink $testfile;
 
-print STDERR "\nReceiver 1 --> Distributer --> Sender --> Receiver 2\n\n";
-
-print STDERR "Starting Naming Service\n";
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 10) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Receiver 1\n";
-
-$RE1->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Distributer\n";
-
-$DI->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Sender\n";
-
-$SV1->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Receiver 2\n";
-
-$receiver2 = $RE2->SpawnWaitKill (1000);
-
-if ($receiver2 != 0) {
-    print STDERR "ERROR: receiver2 returned $receiver2\n";
-    $status = 1;
-}
-
-$distributer = $DI->TerminateWaitKill (1000);
-
-if ($distributer != 0) {
-    print STDERR "ERROR: distributer returned $distributer\n";
-    $status = 1;
-}
-
-$receiver1 = $RE1->TerminateWaitKill (1000);
-
-if ($receiver1 != 0) {
-    print STDERR "ERROR: receiver returned $receiver\n";
-    $status = 1;
-}
-
-$sender = $SV1->TerminateWaitKill (1000);
-
-if ($sender != 0) {
-    print STDERR "ERROR: sender returned $sender\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (1000);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
-}
-
-unlink $nsior;
-unlink $testfile;
-
 exit $status;
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 9d4096ed49a..22f7ce39ece 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -327,8 +327,6 @@ main (int argc,
       SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      SENDER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index 376246e76b7..c5e61528048 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -464,14 +464,6 @@ Connection_Manager::destroy (const ACE_CString &flowname
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
 
-  AVStreams::StreamCtrl_var streamctrl;
-  this->streamctrls_.find (flowname,
-                             streamctrl);
-
-  AVStreams::flowSpec stop_spec;
-  streamctrl->destroy (stop_spec
-                       ACE_ENV_ARG_PARAMETER);
-
   this->streamctrls_.unbind(flowname);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
index 498aa4f5973..08ca59f2925 100755
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl
@@ -10,8 +10,8 @@ use PerlACE::Run_Test;
 
 # amount of delay between running the servers
 
-$sleeptime = 2;
-$distributor_time = 5;
+$sleeptime = 5;
+$distributor_time = 8;
 $sender_time = 8;
 $status = 0;
 
@@ -21,7 +21,7 @@ $makefile = PerlACE::LocalFile ("input");
 
 unlink $nsior;
 
-$NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-ORBDottedDecimalAddresses 1 -ORBEndpoint iiop://128.89.73.40:0 -o $nsior");
+$NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-ORBDottedDecimalAddresses 1 -o $nsior");
 $SV1  = new PerlACE::Process ("sender", "-ORBDottedDecimalAddresses 1 ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r 30");
 $SV2  = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r 30");
 $SV3  = new PerlACE::Process ("sender", " -ORBDottedDecimalAddresses 1 -ORBSvcConf components_svc.conf -ORBInitRef NameService=file://$nsior -s sender -r 30");
@@ -96,19 +96,11 @@ print STDERR "\nStarting Distributer 4\n\n";
 
 $DI4->Spawn ();
 
-$sender2 = $SV2->TerminateWaitKill (5);
+$SV2->WaitKill (300);
 
-if ($sender2 != 0) {
-    print STDERR "ERROR: sender2 returned $sender2\n";
-    $status = 1;
-}
-
-$sender3 = $SV3->TerminateWaitKill (5);
+$SV3->WaitKill (300);
 
-if ($sender3 != 0) {
-    print STDERR "ERROR: sender3 returned $sender3\n";
-    $status = 1;
-}
+$SV1->WaitKill ( 300 );
 
 $distributer3 = $DI3->TerminateWaitKill (5);
 
@@ -145,13 +137,6 @@ if ($receiver2 != 0) {
     $status = 1;
 }
 
-$sender = $SV1->TerminateWaitKill (5);
-
-if ($sender != 0) {
-    print STDERR "ERROR: sender returned $sender\n";
-    $status = 1;
-}
-
 $distributer4 = $DI4->TerminateWaitKill (5);
 if ($distributer4 != 0) {
     print STDERR "ERROR: distributer4 returned $distributer4\n";