ChangeLogTag:Sun Sep 15 13:39:51 2002 Ossama Othman <ossama@uci.edu>

4 files changed, 90 insertions, 38 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8014fb18a6e..c6789f4634d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,26 @@
+Sun Sep 15 13:39:51 2002  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/orbsvcs/Time/Timer_Helper.h:
+
+	  Corrected inclusion of `ace/pre.h'.  It was included between the
+	  #ifndef/#define header include guards.  It should have been
+	  included after the include guard.
+
+	* orbsvcs/orbsvcs/Time/Timer_Helper.cpp (Timer_Helper):
+
+	  Initialize the clerk_ member.  Do not leave it uninitialized.
+
+	  (~Timer_Helper):
+
+	  Removed "delete this" code.  This code made no sense since it
+	  was called inside a destructor!
+
+	  (handle_timeout):
+
+	  Only print debugging statements if TAO_debug_level is greater
+	  than zero.  Previously, debugging statements were always
+	  printed.  [Bug 1302]
+
 Sun Sep 15 13:04:49 2002  Ossama Othman  <ossama@uci.edu>
 
 	* tao/PortableServer/IORInfo.h:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTime b/TAO/orbsvcs/orbsvcs/Makefile.CosTime
index 3fec4ac53e5..e8944cc3967 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosTime
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTime
@@ -113,6 +113,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
@@ -286,8 +287,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
@@ -306,7 +309,8 @@ realclean: clean
  TimeServiceS.i \
  Time/time_export.h Time/TAO_TIO.h \
  $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \
- Time/TAO_Time_Service_Server.h
+ Time/TAO_Time_Service_Server.h \
+ $(TAO_ROOT)/tao/debug.h
 
 .obj/TAO_Time_Service_Clerk.o .obj/TAO_Time_Service_Clerk.so .shobj/TAO_Time_Service_Clerk.o .shobj/TAO_Time_Service_Clerk.so: Time/TAO_Time_Service_Clerk.cpp \
  Time/TAO_Time_Service_Clerk.h $(ACE_ROOT)/ace/pre.h \
@@ -380,6 +384,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
@@ -527,8 +532,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
@@ -683,6 +690,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
@@ -856,8 +864,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
@@ -916,6 +926,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
@@ -1091,8 +1102,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
@@ -1174,6 +1187,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
@@ -1332,8 +1346,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
@@ -1384,7 +1400,8 @@ realclean: clean
  CosNamingS_T.i \
  CosNamingS_T.cpp \
  CosNamingS.i \
- Naming/nsconf.h
+ Naming/nsconf.h \
+ $(TAO_ROOT)/tao/debug.h
 
 .obj/TimeServiceS.o .obj/TimeServiceS.so .shobj/TimeServiceS.o .shobj/TimeServiceS.so: TimeServiceS.cpp TimeServiceS.h \
  $(ACE_ROOT)/ace/pre.h TimeBaseS.h \
@@ -1424,6 +1441,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
@@ -1595,8 +1613,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(ACE_ROOT)/ace/Atomic_Op.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.h \
+ $(ACE_ROOT)/ace/Atomic_Op_T.i \
+ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Atomic_Op.cpp \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
@@ -1771,6 +1791,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index b183f778d22..66bd6f22243 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -1,5 +1,8 @@
 #include "Timer_Helper.h"
 #include "TAO_Time_Service_Clerk.h"
+
+#include "tao/debug.h"
+
 #include "ace/OS.h"
 
 
@@ -8,22 +11,19 @@ ACE_RCSID (Time,
            "$Id$")
 
 
-// Constructor.
 Timer_Helper::Timer_Helper (void)
+  : clerk_ (0)
 {
 }
 
-// Constructor that sets the clerk.
 Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk)
   : clerk_ (clerk)
 {
 
 }
 
-// Destructor.
 Timer_Helper::~Timer_Helper (void)
 {
-  delete this;
 }
 
 int
@@ -59,29 +59,31 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
 #if defined (ACE_LACKS_LONGLONG_T)
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n"
-                      "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
-                      ACE_U64_TO_U32 (UTO_server->time ()),
-                      ACE_U64_TO_U32 (UTO_server->inaccuracy ()),
-                      UTO_server->tdf (),
-                      ACE_U64_TO_U32 ((UTO_server->utc_time ()).time),
-                      (UTO_server->utc_time ()).inacclo,
-                      (UTO_server->utc_time ()).inacchi,
-                      (UTO_server->utc_time ()).tdf));
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n"
+                        "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
+                        ACE_U64_TO_U32 (UTO_server->time ()),
+                        ACE_U64_TO_U32 (UTO_server->inaccuracy ()),
+                        UTO_server->tdf (),
+                        ACE_U64_TO_U32 ((UTO_server->utc_time ()).time),
+                        (UTO_server->utc_time ()).inacclo,
+                        (UTO_server->utc_time ()).inacchi,
+                        (UTO_server->utc_time ()).tdf));
 
 #else
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n"
-                      "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
-                      UTO_server->time (),
-                      UTO_server->inaccuracy (),
-                      UTO_server->tdf (),
-                      (UTO_server->utc_time ()).time,
-                      (UTO_server->utc_time ()).inacclo,
-                      (UTO_server->utc_time ()).inacchi,
-                      (UTO_server->utc_time ()).tdf));
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n"
+                        "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
+                        UTO_server->time (),
+                        UTO_server->inaccuracy (),
+                        UTO_server->tdf (),
+                        (UTO_server->utc_time ()).time,
+                        (UTO_server->utc_time ()).inacclo,
+                        (UTO_server->utc_time ()).inacchi,
+                        (UTO_server->utc_time ()).tdf));
 #endif
 
           CORBA::ULongLong curr_server_time =
@@ -102,9 +104,10 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
         }
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nUpdated time from %d servers in the network",
-                  no_of_servers));
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "\nUpdated time from %d servers in the network",
+                    no_of_servers));
 
       // Return the average of the times retrieved from the various
       // servers.
@@ -137,8 +140,10 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in the handle_timeout ()\n");
+      if (TAO_debug_level > 0)
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "Exception in handle_timeout()\n");
+
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 164409ff886..85522220f10 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -18,9 +18,11 @@
 
 
 #ifndef TIMER_HELPER_H
-#include "ace/pre.h"
 #define	TIMER_HELPER_H
 
+#include "ace/pre.h"
+
+
 #include "ace/Event_Handler.h"
 #include "ace/Containers.h"
 #include "time_export.h"
@@ -70,4 +72,5 @@ protected:
 };
 
 #include "ace/post.h"
+
 #endif /* TIMER_HELPER_H */