Working on libACE-Utils

- Stopped at Stats.cpp

5 files changed, 23 insertions, 13 deletions

diff --git a/ace/Timer/High_Res_Timer.cpp b/ace/Timer/High_Res_Timer.cpp
index c589ab67abc..6f56448c569 100644
--- a/ace/Timer/High_Res_Timer.cpp
+++ b/ace/Timer/High_Res_Timer.cpp
@@ -7,13 +7,13 @@
 // anything.  It's operator/ only returns 32 bits not 64 bits, among
 // other things.
 
-#include "ace/High_Res_Timer.h"
+#include "ace/Timer/High_Res_Timer.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/High_Res_Timer.i"
+#include "ace/Timer/High_Res_Timer.i"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Stats.h"
+#include "ace/Utils/Stats.h"
 
 ACE_RCSID(ace, High_Res_Timer, "$Id$")
 
@@ -26,8 +26,8 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
      defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \
     !defined (ACE_HAS_HI_RES_TIMER)
 
-# include "ace/Synch.h"
-# include "ace/Object_Manager.h"
+# include "ace/Threads/Synch.h"
+# include "ace/Utils/Object_Manager.h"
 
   // Initialize the global_scale_factor_ to 1.  The first
   // ACE_High_Res_Timer instance construction will override this
diff --git a/ace/Timer/High_Res_Timer.h b/ace/Timer/High_Res_Timer.h
index cffa4c07da8..e3890b73d26 100644
--- a/ace/Timer/High_Res_Timer.h
+++ b/ace/Timer/High_Res_Timer.h
@@ -301,7 +301,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/High_Res_Timer.i"
+#include "ace/Timer/High_Res_Timer.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Stats.cpp b/ace/Utils/Stats.cpp
index f9d60fbcd78..0f735623835 100644
--- a/ace/Utils/Stats.cpp
+++ b/ace/Utils/Stats.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/Stats.h"
-#include "ace/High_Res_Timer.h"
+#include "ace/Utils/Stats.h"
+#include "ace/Timer/High_Res_Timer.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Stats.i"
+# include "ace/Utils/Stats.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Stats, "$Id$")
@@ -521,8 +521,10 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg,
 {
   if (this->samples_count () == 0u)
     {
+#ifdef ACE_SUBSET_0
       ACE_DEBUG ((LM_DEBUG,
                   ACE_LIB_TEXT ("%s : no data collected\n"), msg));
+#endif
       return;
     }
 
@@ -594,9 +596,11 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg,
   seconds /= ACE_HR_SCALE_CONVERSION; 
   double t_avg = samples_count / seconds;
 
+#ifdef ACE_SUBSET_0
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("%s throughput: %.2f (events/second)\n"),
               msg, t_avg));
+#endif
 }
 
 // ****************************************************************
diff --git a/ace/Utils/Stats.h b/ace/Utils/Stats.h
index 999fd6da7fa..5b3ca052e7f 100644
--- a/ace/Utils/Stats.h
+++ b/ace/Utils/Stats.h
@@ -21,9 +21,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Unbounded_Queue.h"
-#include "ace/Log_Msg.h"
-#include "ace/Basic_Stats.h"
+#include "ace/Utils/Unbounded_Queue.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
+
+#include "ace/Timer/Basic_Stats.h"
 
 /**
  * @class ACE_Stats_Value
@@ -263,7 +267,7 @@ private:
 
 
 #if defined (__ACE_INLINE__)
-# include "ace/Stats.i"
+# include "ace/Utils/Stats.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Utils/Stats.i b/ace/Utils/Stats.i
index c97c0d29ca6..29505e2e5f4 100644
--- a/ace/Utils/Stats.i
+++ b/ace/Utils/Stats.i
@@ -51,6 +51,7 @@ ACE_Stats_Value::scaled_value (ACE_UINT64 &sv) const
   sv = whole () * fractional_field ()  +  fractional ();
 }
 
+#ifdef ACE_SUBSET_0
 ACE_INLINE
 void
 ACE_Stats_Value::dump (void) const
@@ -59,6 +60,7 @@ ACE_Stats_Value::dump (void) const
               ACE_LIB_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"),
               precision_, whole_, fractional_));
 }
+#endif
 
 ACE_INLINE
 ACE_Stats::ACE_Stats (void)