Logging enhancements

    * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
    * TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp:
    * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
    * TAO/tao/IIOP_Connection_Handler.cpp:
    * TAO/tao/Strategies/SCIOP_Connection_Handler.cpp:
    * TAO/tao/Transport.cpp:

6 files changed, 41 insertions, 36 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index b5175d47571..1e363ce11e8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -203,6 +203,13 @@ AsyncAccessManager::remote_state (ImplementationRepository::AAM_Status state)
 void
 AsyncAccessManager::final_state (bool active)
 {
+  if (ImR_Locator_i::debug () > 5)
+    {
+      ORBSVCS_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state - ")
+                      ACE_TEXT ("server <%C> active <%d> status <%C>\n"),
+                      this, info_->ping_id (), active, status_name (this->status_)));
+    }
   bool const success = this->status_ == ImplementationRepository::AAM_SERVER_READY;
   this->info_.edit (active)->started (success);
   this->retries_ = this->info_->start_limit_;
@@ -224,8 +231,8 @@ AsyncAccessManager::final_state (bool active)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state ")
-                          ACE_TEXT ("removing this from map, server <%C>\n"),
-                          this, info_->ping_id ()));
+                          ACE_TEXT ("removing this from map, server <%C> remove_on_death_rh_ <%@>\n"),
+                          this, info_->ping_id (), this->remove_on_death_rh_));
         }
       if (this->remove_on_death_rh_ != 0)
         {
@@ -490,9 +497,9 @@ AsyncAccessManager::notify_child_death (int pid)
   if (ImR_Locator_i::debug () > 4)
     {
       ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, pid <%d>, status <%C> ")
+                      ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, server <%C>, pid <%d>, status <%C> ")
                       ACE_TEXT ("this info_.pid <%d> prev_pid <%d> waiter count <%d>\n"),
-                      this, pid, status_name (status_),
+                      this, info_->ping_id (), pid, status_name (status_),
                       this->info_->pid, this->prev_pid_, this->rh_list_.size() ));
     }
   if (this->info_->pid == pid || this->prev_pid_ == pid)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index dc8f16cd468..3ea492fdd0c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -205,9 +205,8 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior)
   else
     {
       ORBSVCS_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) ImR_ResponseHandler::send_ior (): Invalid corbaloc ior.\n")
-                  ACE_TEXT ("\t<%C>\n"),
-                  ior.c_str()));
+                  ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Invalid corbaloc ior for key <%C> server_name <%C> IOR <%C>\n"),
+                  key_str_.in (), server_name_.in (), pior));
     }
 
   this->invoke_excep_i (new CORBA::OBJECT_NOT_EXIST
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 576c744eb74..38446e6a48d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -769,8 +769,8 @@ LiveCheck::handle_timeout (const ACE_Time_Value &,
             {
               ORBSVCS_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d)")
-                              ACE_TEXT (", ping sent\n"),
-                              token));
+                              ACE_TEXT (", ping sent to server <%C>\n"),
+                              token, entry->server_name ()));
             }
         }
       else
@@ -779,8 +779,8 @@ LiveCheck::handle_timeout (const ACE_Time_Value &,
             {
               ORBSVCS_DEBUG ((LM_DEBUG,
                               ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d)")
-                              ACE_TEXT (", ping skipped\n"),
-                              token));
+                              ACE_TEXT (", ping skipped for server <%C>\n"),
+                              token, entry->server_name ()));
             }
         }
     }
@@ -903,29 +903,28 @@ LiveCheck::remove_server (const char *server, int pid)
 void
 LiveCheck::remove_deferred_servers (void)
 {
-  if (this->removed_entries_.size () == 0)
-    return;
-
-  NameStack::iterator re_end = this->removed_entries_.end();
-  for (NameStack::iterator re = this->removed_entries_.begin();
-       re != re_end;
-       ++re)
+  if (!this->removed_entries_.is_empty ())
     {
-      if (ImR_Locator_i::debug () > 0)
+      NameStack::iterator re_end = this->removed_entries_.end();
+      for (NameStack::iterator re = this->removed_entries_.begin();
+          re != re_end;
+          ++re)
         {
-          ORBSVCS_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) LiveCheck::remove_deferred_entries ")
-                          ACE_TEXT ("removing <%C>\n"), (*re).c_str()));
-        }
-      LiveEntry *entry = 0;
-      int const result = entry_map_.unbind (*re, entry);
-      if (result == 0)
-        {
-          delete entry;
+          if (ImR_Locator_i::debug () > 0)
+            {
+              ORBSVCS_DEBUG ((LM_DEBUG,
+                              ACE_TEXT ("(%P|%t) LiveCheck::remove_deferred_entries ")
+                              ACE_TEXT ("removing <%C>\n"), (*re).c_str()));
+            }
+          LiveEntry *entry = 0;
+          int const result = entry_map_.unbind (*re, entry);
+          if (result == 0)
+            {
+              delete entry;
+            }
         }
+      this->removed_entries_.reset ();
     }
-  this->removed_entries_.reset ();
-
 }
 
 bool
@@ -1080,7 +1079,7 @@ LiveCheck::schedule_ping (LiveEntry *entry)
       if (ImR_Locator_i::debug () > 2)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping deferred")));
+                          ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping deferred\n")));
         }
       if (!this->want_timeout_ || next < this->deferred_timeout_)
         {
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index b282597af12..66900bc5dc8 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -349,7 +349,7 @@ TAO_IIOP_Connection_Handler::open (void*)
 
       TAOLIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::open, IIOP ")
-                  ACE_TEXT ("connection to peer <%s> on %d\n"),
+                  ACE_TEXT ("connection to peer <%s> on [%d]\n"),
                   client_addr, this->peer ().get_handle ()));
     }
 
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index ca78a469494..c538040a969 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -238,7 +238,7 @@ TAO_SCIOP_Connection_Handler::open (void*)
 
       TAOLIB_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - SCIOP_Connection_Handler::open, SCIOP ")
-                  ACE_TEXT ("connection to peer <%s> on %d\n"),
+                  ACE_TEXT ("connection to peer <%s> on [%d]\n"),
                   client, this->peer ().get_handle ()));
     }
 
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 43fe81ae0e5..9792cd3ab69 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -2797,7 +2797,7 @@ TAO_Transport::post_open (size_t id)
   if (TAO_debug_level > 9)
     {
       TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport::post_open, ")
-                  ACE_TEXT ("tport id changed from %d to %d\n"), this->id_, id));
+                  ACE_TEXT ("tport id changed from [%d] to [%d]\n"), this->id_, id));
     }
   this->id_ = id;
 
@@ -2851,10 +2851,10 @@ TAO_Transport::post_open (size_t id)
     this->is_connected_ = true;
   }
 
-  if (TAO_debug_level > 9 && !this->cache_map_entry_)
+  if (TAO_debug_level > 9)
     {
       TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_open")
-                            ACE_TEXT (", cache_map_entry_ is 0\n"), this->id_));
+                            ACE_TEXT (", cache_map_entry_ is [%@]\n"), this->id_, this->cache_map_entry_));
     }
 
   this->transport_cache_manager ().mark_connected (this->cache_map_entry_,