ChangeLogTag: Mon Dec 20 11:40:14 1999 Irfan Pyarali <irfan@cs.wustl.edu>

8 files changed, 41 insertions, 15 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 6ff681d5f6b..193d875a33b 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,19 @@
+Mon Dec 20 11:40:14 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* TAO/tao/Pluggable.h (send): Addition <two_way> indicator in
+	  send().
+
+	* TAO/tao/IIOP_Transport.cpp (send):
+	* TAO/tao/UIOP_Transport.cpp (send):
+
+	  Short-circuit the call to the sync strategies if this is a two
+	  way call.  Otherwise, we'll end up buffering a two-way call
+	  also.
+
+	* TAO/tao/GIOP.cpp (send_message): It now takes an additional
+	  <two_way> parameter to indicate whether this is a two way
+	  message.
+
 Mon Dec 20 12:15:35 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* performance-tests/RTCorba/Oneways/Makefile: Compile the Reliable
@@ -9,7 +25,7 @@ Mon Dec 20 12:15:35 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 	  since there is no priority mapping in TAO without RT CORBA.
 
 	* examples/Makefile (DIRS): Should be:
-	 
+
 	  ifeq ($(corba_messaging),1)
 
 	  instead of:
@@ -19,8 +35,8 @@ Mon Dec 20 12:15:35 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 Mon Dec 20 11:10:07 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp: Changed some
-	  template instantiations. 
-	  
+	  template instantiations.
+
 
 Mon Dec 20 10:17:01 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -31,7 +47,7 @@ Mon Dec 20 10:17:01 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Mon Dec 20 00:21:50 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp: 
+	* orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp:
 	* orbsvcs/orbsvcs/Notify/ID_Pool_T.i:
 	* orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp:
 	* orbsvcs/orbsvcs/Notify/ID_Pool_T.h:
@@ -48,10 +64,10 @@ Mon Dec 20 00:21:50 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp: Added missing
 	  template instantiations. It was nasty in the sense certain
 	  template instantiations were missing from the Trader
-	  set. Tracing them became a headache. 
-	
+	  set. Tracing them became a headache.
+
 	* orbsvcs/orbsvcs/Makefile: Added a file ID_Pool_T in the list of
-	  compiles. 
+	  compiles.
 
 Sun Dec 19 23:25:33 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
@@ -62,7 +78,7 @@ Sun Dec 19 23:25:33 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
         * orbsvcs/Time_Service/Server_i.cpp: Forgot a ACE_TRY_CHECK after
           orb->run.  Decided to remove the ACE_TRY block and just use
           the ACE_CHECK_RETURN macro instead (main will catch it and
-          print out a message anyway.  
+          print out a message anyway.
 
 Sun Dec 19 17:36:07 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -74,7 +90,7 @@ Sun Dec 19 17:36:07 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp:
 	* orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp:
 	* orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp: Added missing
-	  template instantiations. 
+	  template instantiations.
 
 Sun Dec 19 10:05:38 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 4b5e3c59f7c..a86258f0973 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -384,7 +384,8 @@ TAO_GIOP::send_message (TAO_Transport *transport,
                         TAO_OutputCDR &stream,
                         TAO_ORB_Core *orb_core,
                         ACE_Time_Value *max_wait_time,
-                        TAO_Stub *stub)
+                        TAO_Stub *stub,
+                        int two_way)
 {
 
   TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_SEND_MESSAGE_START);
@@ -450,6 +451,7 @@ TAO_GIOP::send_message (TAO_Transport *transport,
 
   // This guarantees to send all data (bytes) or return an error.
   ssize_t n = transport->send (stub,
+                               two_way,
                                stream.begin (),
                                max_wait_time);
 
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index aa20fe7ab90..2c9545c6bd0 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -436,7 +436,8 @@ public:
                            TAO_OutputCDR &stream,
                            TAO_ORB_Core* orb_core,
                            ACE_Time_Value *max_wait_time = 0,
-                           TAO_Stub *stub = 0);
+                           TAO_Stub *stub = 0,
+                           int two_way = 1);
   // Send message, returns TRUE if success, else FALSE.
 
   static void dump_msg (const char *label,
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 6517c0b4248..c87ec3bcae1 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -195,7 +195,8 @@ TAO_IIOP_Client_Transport::send_request (TAO_Stub *stub,
                               stream,
                               orb_core,
                               max_wait_time,
-                              stub) == -1)
+                              stub,
+                              two_way) == -1)
     return -1;
 
   return this->idle_after_send ();
@@ -311,10 +312,11 @@ TAO_IIOP_Client_Transport::register_handler (void)
 
 ssize_t
 TAO_IIOP_Transport::send (TAO_Stub *stub,
+                          int two_way,
                           const ACE_Message_Block *message_block,
                           const ACE_Time_Value *max_wait_time)
 {
-  if (stub == 0)
+  if (stub == 0 || two_way)
     {
       return this->send (message_block,
                          max_wait_time);
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 90335ab8130..e7d402004d4 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -62,6 +62,7 @@ public:
   virtual ACE_HANDLE handle (void);
   virtual ACE_Event_Handler *event_handler (void);
   virtual ssize_t send (TAO_Stub *stub,
+                        int two_way,
                         const ACE_Message_Block *mblk,
                         const ACE_Time_Value *s = 0);
   virtual ssize_t send (const ACE_Message_Block *mblk,
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index 193207ecc6f..744e26cea56 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -83,6 +83,7 @@ public:
   // handler used by the reactor.
 
   virtual ssize_t send (TAO_Stub *stub,
+                        int two_way,
                         const ACE_Message_Block *mblk,
                         const ACE_Time_Value *s = 0) = 0;
   virtual ssize_t send (const ACE_Message_Block *mblk,
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index c328408d35a..564d929ed85 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -198,7 +198,8 @@ TAO_UIOP_Client_Transport::send_request (TAO_Stub *stub,
                               stream,
                               orb_core,
                               max_wait_time,
-                              stub) == -1)
+                              stub,
+                              two_way) == -1)
     return -1;
 
   return this->idle_after_send ();
@@ -315,10 +316,11 @@ TAO_UIOP_Client_Transport::register_handler (void)
 
 ssize_t
 TAO_UIOP_Transport::send (TAO_Stub *stub,
+                          int two_way,
                           const ACE_Message_Block *message_block,
                           const ACE_Time_Value *max_wait_time)
 {
-  if (stub == 0)
+  if (stub == 0 || two_way)
     {
       return this->send (message_block,
                          max_wait_time);
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
index 481e6232e6a..f5eecddd0e0 100644
--- a/TAO/tao/UIOP_Transport.h
+++ b/TAO/tao/UIOP_Transport.h
@@ -65,6 +65,7 @@ public:
   virtual ACE_HANDLE handle (void);
   virtual ACE_Event_Handler *event_handler (void);
   virtual ssize_t send (TAO_Stub *stub,
+                        int two_way,
                         const ACE_Message_Block *mblk,
                         const ACE_Time_Value *s = 0);
   virtual ssize_t send (const ACE_Message_Block *mblk,