ChangeLogTag: Wed Aug 8 12:16:22 2001 Balachandran Natarajan <bala@cs.wustl.edu>

6 files changed, 24 insertions, 6 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 727994e87cf..cc611479f26 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,22 @@
+Wed Aug  8 12:16:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* performance-tests/Thread_Per_Connection_Latency/svc.conf:
+	* performance-tests/Thread_Pool_Latency/svc.conf: Made the client
+	  to use Wait On Read Write as we see a big performance drop if we
+	  use the LF. To make the test work without any problems, we now
+	  use the exclusive transport mux strategy. Hopefully this will
+	  get our performance back to normal. 
+	
+	* tao/Muxed_TMS.cpp: Fixed a subtle problem in connection_closed
+	  (). While iterating through the reply_disptacher table to close
+	  the  reply dispatchers, a wrong comparision was made in the for
+	  loop. This would not allow any of the reply dispatchers to be
+	  closed and in turn prevent the transport cleaning up the
+	  resources. This would lead to the client hanging on select ()
+	  even after the connection is closed by the server. I am
+	  surprised that this has not been found out so far. God save
+	  people who have been using the Muxed strategy :-).
+
 Tue Aug 07 21:54:31 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/IORManipulation/IORTest.cpp (main):
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf
index bb33905530c..3b397fa3149 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
-#static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/svc.conf b/TAO/performance-tests/Latency/Thread_Pool/svc.conf
index 89de17c9d74..46ff5409fdf 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/svc.conf
+++ b/TAO/performance-tests/Latency/Thread_Pool/svc.conf
@@ -2,4 +2,4 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
-#static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/svc.conf b/TAO/performance-tests/Thread_Per_Connection_Latency/svc.conf
index bb33905530c..3b397fa3149 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/svc.conf
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/svc.conf
@@ -2,5 +2,5 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
-#static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"
diff --git a/TAO/performance-tests/Thread_Pool_Latency/svc.conf b/TAO/performance-tests/Thread_Pool_Latency/svc.conf
index 89de17c9d74..46ff5409fdf 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/svc.conf
+++ b/TAO/performance-tests/Thread_Pool_Latency/svc.conf
@@ -2,4 +2,4 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"
-#static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 1975af86fb9..6e4016f402c 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -125,11 +125,10 @@ void
 TAO_Muxed_TMS::connection_closed (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-
   // @@ This should be done using a mutex, the table
 
   REQUEST_DISPATCHER_TABLE::ITERATOR end =
-    this->dispatcher_table_.begin ();
+    this->dispatcher_table_.end ();
   for (REQUEST_DISPATCHER_TABLE::ITERATOR i =
          this->dispatcher_table_.begin ();
        i != end;