ChangeLogTag: Sun Nov 10 08:19:21 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

4 files changed, 31 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 16724edc3eb..03fb5b40c1a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Sun Nov 10 08:19:21 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tao/IIOP_Connector.cpp:
+	* tao/Connection_Handler.cpp:
+	* tao/IIOP_Connection_Handler.cpp: Some debugging statements were
+	  either out of format or totally useless for any debugging
+	  purposes. Fixed some of them that I saw in the path that
+	  actually hinders my debugging.
+
 Sat Nov 09 09:47:37 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/RTEventLog.dsp: The release build was not
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 14f6013276c..39ad7108410 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -211,7 +211,7 @@ TAO_Connection_Handler::handle_close_eh (
     {
       if (TAO_debug_level)
         ACE_DEBUG  ((LM_DEBUG,
-                     "TAO (%P|%t) - IIOP_Connection_Handler[%d]::"
+                     "TAO (%P|%t) - Connection_Handler[%d]::"
                      "handle_close, connection closing or already closed\n",
                      my_handle));
       return 0;
@@ -219,7 +219,7 @@ TAO_Connection_Handler::handle_close_eh (
 
   if (TAO_debug_level)
     ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) - IIOP_Connection_Handler[%d]::"
+                 "TAO (%P|%t) - Connection_Handler[%d]::"
                  "handle_close, connection fully closed\n",
                  my_handle));
 
@@ -268,7 +268,7 @@ TAO_Connection_Handler::handle_input_eh (
     {
       ACE_HANDLE handle = eh->get_handle();
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - IIOP_Connection_Handler[%d]::handle_input, "
+                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input, "
                   "handle = %d/%d, refcount = %d\n",
                   this->transport()->id(), handle, h, refcount));
     }
@@ -298,7 +298,7 @@ TAO_Connection_Handler::handle_input_eh (
     {
       ACE_HANDLE handle = eh->get_handle ();
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) - IIOP_Connection_Handler[%d]::handle_input, "
+                  "TAO (%P|%t) Connection_Handler[%d]::handle_input, "
                   "handle = %d/%d, refcount = %d, retval = %d\n",
                   this->transport()->id(), handle, h, refcount, return_value));
     }
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 50fccb14468..aca7dd13b27 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -301,9 +301,9 @@ TAO_IIOP_Connection_Handler::update_protocol_properties (
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_IIOP_Connection_Handler::update_protocol_properties\n"
+                "TAO_IIOP_Connection_Handler::update_protocol_properties\n"
                 "enable_network_priority = %d\n",
-		enable_network_priority));
+                enable_network_priority));
 
   if (this->tcp_properties_.send_buffer_size != send_buffer_size)
     this->tcp_properties_.send_buffer_size = send_buffer_size;
@@ -371,13 +371,17 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (void)
                                           (int) sizeof (tos));
 
       if(TAO_debug_level)
-	{
+        {
           ACE_DEBUG ((LM_DEBUG,
-                      "Failed to set Diffserv codepoint - "
-                      "try running as superuser\n"));
-
-	  ACE_DEBUG((LM_DEBUG, "(%N,%l) set tos: ret: %d %x\n", ret, tos));
-	}
+                      "TAO (%P|%t) - IIOP_Connection_Handler::"
+                      "set_dscp_codepoint, failed to set Diffserv"
+                      " codepoint - try running as superuser\n"));
+
+          ACE_DEBUG((LM_DEBUG,
+                     "TAO (%P|%t) - IIOP_Connection_Handler::"
+                     "set_dscp_codepoint, set tos: ret: %d %x\n",
+                     ret, tos));
+        }
 
       this->dscp_codepoint_ = tos;
     }
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 86c529774ee..1d16fd547d8 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -177,6 +177,12 @@ TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation,
 
    if (result == -1 && errno == EWOULDBLOCK)
      {
+       if (TAO_debug_level)
+         ACE_DEBUG ((LM_DEBUG,
+                     "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                     "going to wait for connection completion on local"
+                     "handle [%d]\n",
+                     svc_handler->get_handle ()));
        result =
          this->active_connect_strategy_->wait (svc_handler,
                                                max_wait_time);