ChangeLogTag:Wed Mar 07 08:48:11 2001 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 115 insertions, 13 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 7c195bd6017..7c17a31671a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Wed Mar 07 08:48:11 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/Queued_Message.inl:
+          Both done() and mb() were using contents_, but the flow has
+          changed to use current_message_.
+
+        * tao/Transport.cpp:
+          Simplify code flow in send_current_message()
+          Simplify code in dequeue_head()
+
+        * tao/TAO.dsp:
+        * tao/TAO_Static.dsp:
+          Update project files so they work on the branch.
+
 Tue Mar  6 19:44:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/GIOP_Message_Handler.cpp:
diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl
index 76a86e62d1c..ea40ebf2f81 100644
--- a/TAO/tao/Queued_Message.inl
+++ b/TAO/tao/Queued_Message.inl
@@ -3,13 +3,13 @@
 ACE_INLINE ACE_Message_Block *
 TAO_Queued_Message::mb (void) const
 {
-  return this->contents_;
+  return this->current_block_;
 }
 
 ACE_INLINE int
 TAO_Queued_Message::done (void) const
 {
-  return this->contents_ != 0;
+  return this->current_block_ != 0;
 }
 
 ACE_INLINE TAO_Queued_Message *
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 1e7007991cf..91ec9d7103f 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -219,6 +219,10 @@ SOURCE=.\Bind_Dispatcher_Guard.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Block_Flushing_Strategy.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\BoundsC.cpp

 # End Source File

 # Begin Source File

@@ -379,6 +383,10 @@ SOURCE=.\FILE_Parser.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Flushing_Strategy.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOP_Message_Base.cpp

 # End Source File

 # Begin Source File

@@ -515,6 +523,10 @@ SOURCE=.\Marshal.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.cpp

 # End Source File

 # Begin Source File

@@ -675,6 +687,14 @@ SOURCE=.\Protocols_Hooks.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactive_Flushing_Strategy.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.cpp

 # End Source File

 # Begin Source File

@@ -935,6 +955,10 @@ SOURCE=.\Bind_Dispatcher_Guard.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Block_Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\BoundsC.h

 # End Source File

 # Begin Source File

@@ -1107,6 +1131,10 @@ SOURCE=.\FILE_Parser.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\giop.h

 # End Source File

 # Begin Source File

@@ -1263,6 +1291,14 @@ SOURCE=.\marshal.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Message_Sent_Callback.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.h

 # End Source File

 # Begin Source File

@@ -1443,6 +1479,18 @@ SOURCE=.\Protocols_Hooks.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Queued_Message.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactive_Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 3f64c5a1cc8..9cc1cad5226 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -151,6 +151,10 @@ SOURCE=.\Bind_Dispatcher_Guard.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Block_Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\BoundsC.h

 # End Source File

 # Begin Source File

@@ -315,6 +319,10 @@ SOURCE=.\FILE_Parser.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\giop.h

 # End Source File

 # Begin Source File

@@ -467,6 +475,10 @@ SOURCE=.\marshal.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.h

 # End Source File

 # Begin Source File

@@ -647,6 +659,14 @@ SOURCE=.\Protocols_Hooks.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactive_Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.h

 # End Source File

 # Begin Source File

@@ -1179,6 +1199,10 @@ SOURCE=.\marshal.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_Policy_i.i

 # End Source File

 # Begin Source File

@@ -1315,6 +1339,10 @@ SOURCE=.\Profile.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.i

 # End Source File

 # Begin Source File

@@ -1547,6 +1575,10 @@ SOURCE=.\Bind_Dispatcher_Guard.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Block_Flushing_Strategy.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\BoundsC.cpp

 # End Source File

 # Begin Source File

@@ -1703,6 +1735,10 @@ SOURCE=.\FILE_Parser.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Flushing_Strategy.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\GIOP_Message_Base.cpp

 # End Source File

 # Begin Source File

@@ -1839,6 +1875,10 @@ SOURCE=.\Marshal.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.cpp

 # End Source File

 # Begin Source File

@@ -1999,6 +2039,14 @@ SOURCE=.\Protocols_Hooks.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactive_Flushing_Strategy.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 0854ae28538..d2bdc0ec49e 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -215,16 +215,6 @@ TAO_Transport::send_current_message (void)
       this->current_message_->destroy ();
 
       this->current_message_ = 0;
-
-      if (retval == -1)
-        {
-          if (errno == EWOULDBLOCK || errno == ETIME)
-            return 0;
-
-          return -1;
-        }
-
-      return 1;
     }
 
   if (retval == -1)
@@ -238,6 +228,8 @@ TAO_Transport::send_current_message (void)
       return -1;
     }
 
+  if (this->current_message_ == 0)
+    return 1;
   return 0;
 }
 
@@ -249,7 +241,7 @@ TAO_Transport::dequeue_next_message (void)
     return -1;
 
   this->current_message_ = this->head_;
-  this->head_->remove_from_list (this->head_, this->tail_);
+  this->current_message_->remove_from_list (this->head_, this->tail_);
 
   return 0;
 }