*** empty log message ***

6 files changed, 21 insertions, 194 deletions

diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index 5981bba8f77..ef6f7a9c079 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -385,9 +385,9 @@ TAO_Server_Connection_Handler::send_response (TAO_OutputCDR &msg)
 {
   TAO_SVC_HANDLER *this_ptr = this;
 
-  ACE_TIMEPROBE ("  -> Connection_Handler::send_response - start");
+  ACE_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
   TAO_GIOP::send_request (this_ptr, msg);
-  ACE_TIMEPROBE ("  -> Connection_Handler::send_response - end");
+  ACE_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_END);
 }
 
 int
@@ -399,7 +399,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
   // 2. construct a complete request
   // 3. dispatch that request and return any required reply and errors
 
-  ACE_TIMEPROBE ("  -> Connection_Handler::handle_input");
+  ACE_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
 
   char reqbuf[CDR::DEFAULT_BUFSIZE];
   TAO_InputCDR msg (reqbuf, sizeof(reqbuf));
@@ -456,7 +456,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
   if (response_required || error_encountered)
     this->send_response (reply);
 
-  ACE_TIMEPROBE ("  -> Connection_Handler::handle_input done");
+  ACE_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
   return result;
 }
 
@@ -525,7 +525,7 @@ int
 TAO_Client_Connection_Handler::send_request (TAO_OutputCDR &stream,
 					     int is_twoway)
 {
-  ACE_TIMEPROBE ("  -> Client_Connection_Handler::send_request - start");
+  ACE_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
 
   // NOTE: Here would also be a fine place to calculate a digital
   // signature for the message and place it into a preallocated slot
@@ -571,7 +571,7 @@ TAO_Client_Connection_Handler::send_request (TAO_OutputCDR &stream,
       this->expecting_response_ = 0;
     }
 
-  ACE_TIMEPROBE ("  -> Client_Connection_Handler::send_request - done");
+  ACE_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END);
   return 0;
 }
 
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index ef119c34798..0a0e35d58b9 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -86,7 +86,7 @@ CORBA::Boolean
 TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
                         TAO_OutputCDR &stream)
 {
-  ACE_TIMEPROBE ("  -> GIOP::send_request - start");
+  ACE_TIMEPROBE (TAO_GIOP_SEND_REQUEST_START);
 
   char *buf = (char *) stream.buffer ();
   size_t buflen = stream.length ();
@@ -123,7 +123,7 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) ?? writebuf, buflen %u > length %u\n",
                       buflen, stream.length ()));
-          ACE_TIMEPROBE ("  -> GIOP::send_request - fail");
+          ACE_TIMEPROBE (TAO_GIOP_SEND_REQUEST_FAIL);
           return CORBA::B_FALSE;
         }
 
@@ -154,7 +154,7 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) closing conn %d after fault\n", peer.get_handle ()));
           handler->close ();
-          ACE_TIMEPROBE ("  -> GIOP::send_request - fail");
+          ACE_TIMEPROBE (TAO_GIOP_SEND_REQUEST_FAIL);
           return CORBA::B_FALSE;
         }
       else if (writelen == 0)
@@ -163,7 +163,7 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
                       "(%P|%t) OutgoingMessage::writebuf () ... EOF, closing conn %d\n",
                       peer.get_handle ()));
           handler->close ();
-          ACE_TIMEPROBE ("  -> GIOP::send_request - fail");
+          ACE_TIMEPROBE (TAO_GIOP_SEND_REQUEST_FAIL);
           return CORBA::B_FALSE;
         }
       if ((buflen -= writelen) != 0)
@@ -178,7 +178,8 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
         dmsg_filter (8, "%u more bytes to write...\n", buflen);
 #endif /* DEBUG */
     }
-  ACE_TIMEPROBE ("  -> GIOP::send_request - done");
+  ACE_TIMEPROBE (TAO_GIOP_SEND_REQUEST_FAIL);
+  ACE_TIMEPROBE ();
   return CORBA::B_TRUE;
 }
 
@@ -305,7 +306,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
                         TAO_InputCDR &msg,
                         CORBA::Environment &env)
 {
-  ACE_TIMEPROBE ("  -> GIOP::recv_request - start");
+  ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_START);
   TAO_GIOP::Message_Type      retval;
   CORBA::ULong message_size;
   ACE_SOCK_Stream &connection = handler->peer ();
@@ -341,7 +342,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Header EOF ... peer probably aborted connection %d\n",
                       connection.get_handle ()));
-          ACE_TIMEPROBE ("  -> GIOP::recv_request - EOF");
+          ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_EOF);
           return TAO_GIOP::EndOfFile;
           // @@ should probably find some way to report this without
           // an exception, since for most servers it's not an error.
@@ -362,7 +363,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
         }
 
       env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
+      ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_FAIL);
       return TAO_GIOP::MessageError;
     }
 
@@ -379,7 +380,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));      // header
       ACE_DEBUG ((LM_DEBUG, "bad header, magic word\n"));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
+      ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_FAIL);
       return TAO_GIOP::MessageError;
     }
 
@@ -391,7 +392,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));      // header
       ACE_DEBUG ((LM_DEBUG, "bad header, version\n"));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
+      ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_FAIL);
       return TAO_GIOP::MessageError;
     }
 
@@ -463,14 +464,14 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
       // clean up, and ...
       env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE)); // body
       ACE_DEBUG ((LM_DEBUG, "couldn't read rest of message\n"));
-      ACE_TIMEPROBE ("  -> GIOP::recv_request - fail");
+      ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_FAIL);
       return TAO_GIOP::MessageError;
     }
 
   TAO_GIOP::dump_msg ("recv",
                       ACE_reinterpret_cast (u_char *, header),
                       message_size + TAO_GIOP_HEADER_LEN);
-  ACE_TIMEPROBE ("  -> GIOP::recv_request - done");
+  ACE_TIMEPROBE (TAO_GIOP_RECV_REQUEST_END);
   return retval;
 }
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index d2382e9c47c..61cdbf63250 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -185,7 +185,7 @@ CORBA_ORB::run (ACE_Time_Value *tv)
 
   while (this->should_shutdown_ == 0)
     {
-      ACE_TIMEPROBE ("  -> CORBA_ORB::run handling events");
+      ACE_TIMEPROBE (TAO_CORBA_ORB_RUN);
       switch (r->handle_events (tv))
         {
         case 0: // Timed out, so we return to caller.
@@ -196,7 +196,7 @@ CORBA_ORB::run (ACE_Time_Value *tv)
           /* NOTREACHED */
         default: // Some handlers were dispatched, so keep on processing
                  // requests until we're told to shutdown .
-          ACE_TIMEPROBE ("  -> CORBA_ORB::run events handled");
+          ACE_TIMEPROBE (TAO_CORBA_ORB_RUN_END);
           break;
           /* NOTREACHED */
         }
diff --git a/TAO/tao/Timeprobe.cpp b/TAO/tao/Timeprobe.cpp
deleted file mode 100644
index bdf4a601f6c..00000000000
--- a/TAO/tao/Timeprobe.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-
-#include "ace/OS.h"
-#include "Timeprobe.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Timeprobe.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Timeprobe *ACE_Timeprobe::instance_ = 0;
-
-ACE_Timeprobe &
-ACE_Timeprobe::instance (void)
-{
-  if (instance_ == 0)
-    // If this allocation fails, we're in big trouble . . .
-    ACE_NEW_RETURN (instance_,
-                    ACE_Timeprobe (),
-                    *instance_);
-  return *instance_;
-}
-
-void
-ACE_Timeprobe::timeprobe (const char *id)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
-  timeprobes [current_slot_].id_ = id;
-  timeprobes [current_slot_].time_ = ACE_OS::gethrtime ();
-  timeprobes [current_slot_].thread_ = ACE_OS::thr_self ();
-
-  ++current_slot_;
-
-  ACE_ASSERT (current_slot_ < SLOTS);
-}
-
-void
-ACE_Timeprobe::print_times (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\nACE_Timeprobe; %u timeprobes were recorded:\n",
-              current_slot_ > 1 ? current_slot_ - 1 : 0));
-
-  if (current_slot_ <= 0)
-  return;
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "%-52.52s %8.8s %10.10s\n",
-              "NAME",
-              "thread",
-              "usec"));
-  ACE_DEBUG ((LM_DEBUG,
-              "\"%-50s\" %8.8x %10.10s\n",
-              timeprobes[0].id_,
-              timeprobes[0].thread_,
-              "START"));
-
-  for (u_int i = 1; i < current_slot_; ++i)
-    {
-      ACE_hrtime_t elapsed =
-        timeprobes [i].time_ - timeprobes [i-1].time_;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\"%-50s\" %8.8x %10.3f\n",
-                  timeprobes [i].id_,
-                  timeprobes [i].thread_,
-                  (double) (elapsed /
-                            (ACE_UINT32) 1000u) /* nanosec/microsec */));
-    }
-#if 0
-  ACE_hrtime_t elapsed2 = (timeprobes [current_slot_ - 1].time_
-                           - timeprobes [0].time_);
-
-  double total = elapsed2/1000.0; // nanoseconds/microsecond
-  // print the total time
-  ACE_DEBUG ((LM_DEBUG, 
-              "%52.52s =========\n"
-              "%46.46s total %10.3f usec\n",
-              "",
-              "",
-              total));
-#endif /* 0 */
-}
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
deleted file mode 100644
index 59007bf7105..00000000000
--- a/TAO/tao/Timeprobe.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#if !defined (ACE_TIMEPROBE_H)
-#define ACE_TIMEPROBE_H
-
-#include "ace/Synch.h"
-
-class ACE_Timeprobe
-{
-  // @@ Please comment me.
-public:
-  static ACE_Timeprobe &instance (void);
-
-  void timeprobe (const char *id);
-
-  void print_times (void) const;
-
-  void reset (void);
-
-  void destroy (void);
-
-private:
-  ACE_Timeprobe (void);
-  ~ACE_Timeprobe (void);
-
-  ACE_Timeprobe (const ACE_Timeprobe &); 
-  // Not implemented.
-
-private:
-  static ACE_Timeprobe *instance_;
-
-  enum { SLOTS = 8192 };
-
-  ACE_SYNCH_MUTEX mutex_;
-
-  u_int current_slot_;
-
-  struct timeprobe_t
-  {
-    const char *id_;
-    ACE_hrtime_t time_;
-    ACE_thread_t thread_;
-  };
-
-  timeprobe_t timeprobes [SLOTS];
-
-  // @@ Don't we have a macro that does this?
-  friend class null_friend_to_avoid_compiler_warning_about_no_friends;
-};
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-#  define ACE_TIMEPROBE_RESET ACE_Timeprobe::instance ().reset ()
-#  define ACE_TIMEPROBE(id) ACE_Timeprobe::instance ().timeprobe (id)
-#  define ACE_TIMEPROBE_PRINT ACE_Timeprobe::instance ().print_times ()
-#  define ACE_TIMEPROBE_FINI ACE_Timeprobe::instance ().destroy ()
-#else
-#  define ACE_TIMEPROBE_RESET
-#  define ACE_TIMEPROBE(id)
-#  define ACE_TIMEPROBE_PRINT
-#  define ACE_TIMEPROBE_FINI
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-#if defined (__ACE_INLINE__)
-#include "Timeprobe.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_TIMEPROBE_H */
diff --git a/TAO/tao/Timeprobe.i b/TAO/tao/Timeprobe.i
deleted file mode 100644
index faed2b6d69c..00000000000
--- a/TAO/tao/Timeprobe.i
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_Timeprobe::ACE_Timeprobe (void)
-  : current_slot_ (0)
-{
-}
-
-ACE_INLINE
-ACE_Timeprobe::~ACE_Timeprobe (void)
-{
-}
-
-ACE_INLINE void
-ACE_Timeprobe::destroy (void)
-{
-  delete instance_;
-  instance_ = 0;
-}
-
-ACE_INLINE void
-ACE_Timeprobe::reset (void)
-{
-  current_slot_ = 0;
-}