ChangeLogTag:Thu May 10 08:46:21 2001 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 21 insertions, 24 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 4b9f4a871b8..dd0f7ca256a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Thu May 10 08:46:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* tao/IIOP_Connection_Handler.cpp:
+	  A debugging message was confusing it said 'connection from
+	  client', but it was used for both passive and actively
+	  established connections.  IMHO 'connection to peer' is less
+	  confusing.
+
+        * tests/Big_Oneways/Session.cpp:
+        * tests/Big_Twoways/Session.cpp:
+        * tests/Blocking_Sync_None/client.cpp:
+        * tests/MT_Timeout/Client_Task.cpp:
+        * tests/MT_Timeout/Server_Task.cpp:
+	  Several tests were too verbose for the nightly regression tests,
+	  eliminate a lot of output.
+
 Thu May 10 07:11:16 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* performance-tests/DSI_Latency/Roundtrip.h: Added exception
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 9c12ef1cb04..6e3baeec973 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -121,7 +121,7 @@ TAO_IIOP_Connection_Handler::open (void*)
         return -1;
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) IIOP connection from client")
+                  ACE_TEXT ("TAO (%P|%t) IIOP connection to peer ")
                   ACE_TEXT ("<%s> on %d\n"),
                   client, this->peer ().get_handle ()));
     }
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index 0ce9bd9f2ce..a38b00e23a3 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -30,9 +30,6 @@ Session::~Session (void)
 int
 Session::svc (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Session::svc, start\n"));
-
   this->barrier_.wait ();
 
   /// Automatically decrease the reference count at the end of the
@@ -83,8 +80,6 @@ Session::svc (void)
         this->active_thread_count_--;
         if (this->more_work ())
           {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) Session::svc, end\n"));
             return 0;
           }
       }
@@ -98,8 +93,6 @@ Session::svc (void)
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Session::svc, end\n"));
   return 0;
 }
 
@@ -203,14 +196,13 @@ Session::receive_payload (const Test::Payload &the_payload,
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
     this->expected_messages_--;
 
-    int verbose = 0;
 #if 0
+    int verbose = 0;
     verbose = this->expected_messages_ % 500 == 0;
     if (this->expected_messages_ < 500)
       verbose = (this->expected_messages_ % 100 == 0);
     if (this->expected_messages_ < 100)
       verbose = (this->expected_messages_ % 10 == 0);
-#endif /* 0 */
     if (this->expected_messages_ < 5)
       verbose = 1;
 
@@ -221,6 +213,8 @@ Session::receive_payload (const Test::Payload &the_payload,
                     "%d messages to go\n",
                     this->expected_messages_));
       }
+#endif /* 0 */
+
     if (this->more_work ())
       return;
   }
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 4cb813fd04c..2e176ce61f1 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -30,9 +30,6 @@ Session::~Session (void)
 int
 Session::svc (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Session::svc, start\n"));
-
   this->barrier_.wait ();
 
   /// Automatically decrease the reference count at the end of the
@@ -76,8 +73,6 @@ Session::svc (void)
         this->active_thread_count_--;
         if (this->more_work ())
           {
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) Session::svc, end\n"));
             return 0;
           }
       }
@@ -91,8 +86,6 @@ Session::svc (void)
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Session::svc, end\n"));
   return 0;
 }
 
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 86bc49f2613..ad5979bff08 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -105,6 +105,7 @@ main (int argc, char *argv[])
       Test::Payload payload(payload_length);
       payload.length (payload_length);
 
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test running . . .\n"));
       int blocked_calls = 0;
       for (int i = 0; i != iterations; ++i)
         {
@@ -122,9 +123,6 @@ main (int argc, char *argv[])
             {
               blocked_calls++;
             }
-
-          if (i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "Iteration %d finished\n", i));
         }
 
       blocking_sync_none->shutdown (ACE_TRY_ENV);
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 9885febb6a7..a397c282a55 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -46,7 +46,6 @@ Client_Task::too_big_difference_calls (void) const
 int
 Client_Task::svc (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
   ACE_DECLARE_NEW_CORBA_ENV;
 
   int successful_calls = 0;
@@ -110,7 +109,6 @@ Client_Task::svc (void)
       return -1;
     }
   ACE_ENDTRY;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
   this->successful_calls_ += successful_calls;
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 0d140d1c99d..4a90de6a0e0 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -18,7 +18,6 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
 int
 Server_Task::svc (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -30,6 +29,5 @@ Server_Task::svc (void)
       return -1;
     }
   ACE_ENDTRY;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }