ChangeLogTag:Tue Jul 20 19:32:39 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 34 insertions, 10 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 9effd08fd73..d7d51a7973b 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,15 @@
+Tue Jul 20 19:32:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/ORB_Core.cpp:
+	  Fixed memory leaks in output_cdr_dblock_allocator method.
+
+	* performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
+	* performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf:
+	  Fixed configuration for IDL cubit, we must use locks in the POA
+	  to avoid dead-locks on shutdown.  Added a new file with the old
+	  configuration so experiments can still be executed using a well
+	  known configuration.
+
 Tue Jul 20 19:16:00 1999  Ossama Othman  <othman@cs.wustl.edu>
 
 	* tao/ObjectIDList.{h,i}:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 73790a79bb3..30ddeaec8b3 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -5,4 +5,4 @@
 
 static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
new file mode 100644
index 00000000000..992b80929aa
--- /dev/null
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
@@ -0,0 +1,12 @@
+# $Id$
+#
+# Please see $TAO_ROOT/docs/Options.html for details on these options.
+#
+# This configuration is almost safe for IDL_Cubit, it uses no locks
+# but runs with thread-per-connection, since there is only one client
+# the only problems are on shutdown.
+#
+
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index a4dd33b3355..00bbf2b1a64 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1426,7 +1426,7 @@ TAO_Leader_Follower::get_next_follower (void)
 
   // We *must* remove it when we signal it so the same condition is
   // not signalled for both wake up as a follower and as the next
-  // leader. 
+  // leader.
   // The follower may not be there if the reply is received while the
   // consumer is not yet waiting for it (i.e. it send the request but
   // has not blocked to receive the reply yet)
@@ -1522,27 +1522,27 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void)
                              "no more TSS keys"),
                           0);
 
-      if (tss->output_cdr_buffer_allocator_ == 0)
+      if (tss->output_cdr_dblock_allocator_ == 0)
         {
-          tss->output_cdr_buffer_allocator_ = this->resource_factory ()->output_cdr_buffer_allocator ();
+          tss->output_cdr_dblock_allocator_ = this->resource_factory ()->output_cdr_dblock_allocator ();
           tss->owns_resources_ = 1;
         }
-      return tss->output_cdr_buffer_allocator_;
+      return tss->output_cdr_dblock_allocator_;
     }
 
 #if 0
-  if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
+  if (this->orb_resources_.output_cdr_dblock_allocator_ == 0)
     {
       // Double checked locking
       ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-      if (this->orb_resources_.output_cdr_buffer_allocator_ == 0)
+      if (this->orb_resources_.output_cdr_dblock_allocator_ == 0)
         {
-          this->orb_resources_.output_cdr_buffer_allocator_ =
-            this->resource_factory ()->output_cdr_buffer_allocator ();
+          this->orb_resources_.output_cdr_dblock_allocator_ =
+            this->resource_factory ()->output_cdr_dblock_allocator ();
           this->orb_resources_.owns_resources_ = 1;
         }
     }
-  return this->orb_resources_.output_cdr_buffer_allocator_;
+  return this->orb_resources_.output_cdr_dblock_allocator_;
 #endif /* 0 */
 }