Finished Timer sub-directory

17 files changed, 125 insertions, 43 deletions

diff --git a/ace/Timer/Makefile b/ace/Timer/Makefile
new file mode 100755
index 00000000000..b127131cc25
--- /dev/null
+++ b/ace/Timer/Makefile
@@ -0,0 +1,69 @@
+# $Id$
+
+#----------------------------------------------------------------------------
+#       Makefile for the libACE_Timer
+#----------------------------------------------------------------------------
+
+MAKEFILE = Makefile
+LIB_NAME   = libACE_Timer
+LIB      = $(LIB_NAME).a
+SHLIB    = $(LIB_NAME).$(SOEXT)
+
+
+FILES = \
+	Basic_Stats\
+	High_Res_Timer\
+	Profile_Timer\
+	System_Time\
+	Timeprobe\
+	Timeprobe_T\
+	Time_Request_Reply\
+	Timer_Hash\
+	Timer_Hash_T\
+	Timer_Heap\
+	Timer_Heap_T\
+	Timer_List\
+	Timer_List_T\
+	Timer_Queue_Adapters\
+	Timer_Queue\
+	Timer_Queue_T\
+	Timer_Wheel\
+	Timer_Wheel_T
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+####
+#### ACE_COMPONENTS support.
+####
+
+LSRC  = $(addsuffix .cpp,$(FILES))
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+INSTALL =
+
+clean:
+	$(RM) -f $(LIB_NAME).a $(LIB_NAME).so
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+
diff --git a/ace/Timer/Profile_Timer.cpp b/ace/Timer/Profile_Timer.cpp
index 2f4ef9f8f87..0439c7a4cb6 100644
--- a/ace/Timer/Profile_Timer.cpp
+++ b/ace/Timer/Profile_Timer.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
-#include "ace/Profile_Timer.h"
-#include "ace/Log_Msg.h"
+#include "ace/Timer/Profile_Timer.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 #if !defined (__ACE_INLINE__)
-# include "ace/Profile_Timer.i"
+# include "ace/Timer/Profile_Timer.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Profile_Timer, "$Id$")
diff --git a/ace/Timer/Profile_Timer.h b/ace/Timer/Profile_Timer.h
index 8bdacb52fbf..1fdd347f827 100644
--- a/ace/Timer/Profile_Timer.h
+++ b/ace/Timer/Profile_Timer.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Time_Value.h"
-#include "ace/High_Res_Timer.h"
+#include "ace/Timer/Time_Value.h"
+#include "ace/Timer/High_Res_Timer.h"
 
 /**
  * @class ACE_Profile_Timer
@@ -126,7 +126,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/Profile_Timer.i"
+# include "ace/Timer/Profile_Timer.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/ace/Timer/System_Time.cpp b/ace/Timer/System_Time.cpp
index 9e2f2b69380..a632ea71fd8 100644
--- a/ace/Timer/System_Time.cpp
+++ b/ace/Timer/System_Time.cpp
@@ -1,7 +1,7 @@
 // System_Time.cpp
 // $Id$
 
-#include "ace/System_Time.h"
+#include "ace/Timer/System_Time.h"
 
 ACE_RCSID(ace, System_Time, "$Id$")
 
diff --git a/ace/Timer/System_Time.h b/ace/Timer/System_Time.h
index 3374d031cac..aaa6388c663 100644
--- a/ace/Timer/System_Time.h
+++ b/ace/Timer/System_Time.h
@@ -17,14 +17,14 @@
 #define ACE_SYSTEM_TIME_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Memory_Pool.h"
-#include "ace/Malloc_T.h"
+#include "ace/Memory/Memory_Pool.h"
+#include "ace/Memory/Malloc_T.h"
 
 /**
  * @class ACE_System_Time
diff --git a/ace/Timer/Time_Request_Reply.cpp b/ace/Timer/Time_Request_Reply.cpp
index 79a17254de2..68e56f4c1ff 100644
--- a/ace/Timer/Time_Request_Reply.cpp
+++ b/ace/Timer/Time_Request_Reply.cpp
@@ -1,7 +1,10 @@
 // $Id$
 
-#include "ace/Time_Request_Reply.h"
-#include "ace/Log_Msg.h"
+#include "ace/Timer/Time_Request_Reply.h"
+
+#ifdef ACE_SUBSET_0
+#include "ace/Logging/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace, Time_Request_Reply, "$Id$")
 
@@ -154,6 +157,7 @@ ACE_Time_Request::decode (void)
 
 // Print out the current values of the ACE_Time_Request.
 
+#ifdef ACE_SUBSET_0
 void
 ACE_Time_Request::dump (void) const
 {
@@ -186,3 +190,4 @@ ACE_Time_Request::dump (void) const
               this->time ()));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("+++++++\n")));
 }
+#endif
diff --git a/ace/Timer/Time_Request_Reply.h b/ace/Timer/Time_Request_Reply.h
index e50f96b0182..e718abfff04 100644
--- a/ace/Timer/Time_Request_Reply.h
+++ b/ace/Timer/Time_Request_Reply.h
@@ -17,13 +17,13 @@
 #define ACE_TIME_REQUEST_REPLY_H
 #include "ace/pre.h"
 
-#include "ace/Time_Value.h"
+#include "ace/Timer/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
+#include "ace/Utils/SString.h"
 
 /**
  * @class ACE_Time_Request
diff --git a/ace/Timer/Timeprobe_T.cpp b/ace/Timer/Timeprobe_T.cpp
index 988565ccee1..a59bdf6d8e7 100644
--- a/ace/Timer/Timeprobe_T.cpp
+++ b/ace/Timer/Timeprobe_T.cpp
@@ -3,7 +3,7 @@
 #ifndef ACE_TIMEPROBE_T_C
 #define ACE_TIMEPROBE_T_C
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -13,8 +13,8 @@ ACE_RCSID(ace, Timeprobe_T, "$Id$")
 
 #if defined (ACE_COMPILE_TIMEPROBES)
 
-#include "ace/Timeprobe.h"
-#include "ace/High_Res_Timer.h"
+#include "ace/Timer/Timeprobe.h"
+#include "ace/Timer/High_Res_Timer.h"
 
 template <class ACE_LOCK>
 ACE_Timeprobe<ACE_LOCK>::ACE_Timeprobe (u_long size)
diff --git a/ace/Timer/Timeprobe_T.h b/ace/Timer/Timeprobe_T.h
index 52740f6456f..1e423ce6d0e 100644
--- a/ace/Timer/Timeprobe_T.h
+++ b/ace/Timer/Timeprobe_T.h
@@ -15,7 +15,7 @@
 #define ACE_TIMEPROBE_T_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +23,7 @@
 
 #if defined (ACE_COMPILE_TIMEPROBES)
 
-#include "ace/Unbounded_Set.h"
+#include "ace/Utils/Unbounded_Set.h"
 
 /**
  * @class ACE_Timeprobe
@@ -176,7 +176,7 @@ protected:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Timeprobe_T.cpp"
+#include "ace/Timer/Timeprobe_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Timer/Timer_Hash.cpp b/ace/Timer/Timer_Hash.cpp
index a37df2e2fb4..abddc439abb 100644
--- a/ace/Timer/Timer_Hash.cpp
+++ b/ace/Timer/Timer_Hash.cpp
@@ -5,10 +5,10 @@
 #if !defined (ACE_TIMER_HASH_C)
 #define ACE_TIMER_HASH_C
 
-#include "ace/Timer_Hash.h"
+#include "ace/Timer/Timer_Hash.h"
 
 #if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
-#include "ace/Timer_Hash_T.cpp"
+#include "ace/Timer/Timer_Hash_T.cpp"
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
 ACE_RCSID(ace, Timer_Hash, "$Id$")
diff --git a/ace/Timer/Timer_Hash.h b/ace/Timer/Timer_Hash.h
index 189fbb7bace..98960056292 100644
--- a/ace/Timer/Timer_Hash.h
+++ b/ace/Timer/Timer_Hash.h
@@ -15,14 +15,14 @@
 #define ACE_TIMER_HASH_H
 #include "ace/pre.h"
 
-#include "ace/Timer_Hash_T.h"
+#include "ace/Timer/Timer_Hash_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Timer_Heap_T.h"
-#include "ace/Timer_List_T.h"
+#include "ace/Timer/Timer_Heap_T.h"
+#include "ace/Timer/Timer_List_T.h"
 
 // The following typedef are here for ease of use
 
diff --git a/ace/Timer/Timer_Hash_T.cpp b/ace/Timer/Timer_Hash_T.cpp
index ac303cca469..71a1ca65dc1 100644
--- a/ace/Timer/Timer_Hash_T.cpp
+++ b/ace/Timer/Timer_Hash_T.cpp
@@ -3,14 +3,17 @@
 #ifndef ACE_TIMER_HASH_T_C
 #define ACE_TIMER_HASH_T_C
 
-#include "ace/Timer_Hash_T.h"
+#include "ace/Timer/Timer_Hash_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/High_Res_Timer.h"
+#include "ace/Timer/High_Res_Timer.h"
+
+#ifdef ACE_SUBSET_0
 #include "ace/Log_Msg.h"
+#endif
 
 ACE_RCSID(ace,
           Timer_Hash_T,
@@ -301,6 +304,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::earliest_time (void) const
   return this->table_[this->earliest_position_]->earliest_time ();
 }
 
+#ifdef ACE_SUBSET_0
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> void
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const
 {
@@ -316,6 +320,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif
 
 // Reschedule a periodic timer.  This function must be called with the
 // mutex lock held.
diff --git a/ace/Timer/Timer_Hash_T.h b/ace/Timer/Timer_Hash_T.h
index 36efdb169d5..fc2d9bdcc6a 100644
--- a/ace/Timer/Timer_Hash_T.h
+++ b/ace/Timer/Timer_Hash_T.h
@@ -14,13 +14,13 @@
 #define ACE_TIMER_HASH_T_H
 #include "ace/pre.h"
 
-#include "ace/Timer_Queue_T.h"
+#include "ace/Timer/Timer_Queue_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Free_List.h"
+#include "ace/Utils/Templates/Free_List.h"
 
 // Forward declaration.
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
@@ -272,7 +272,7 @@ private:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HAS_BROKEN_HPUX_TEMPLATES)
-#include "ace/Timer_Hash_T.cpp"
+#include "ace/Timer/Timer_Hash_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Timer/Timer_Heap.cpp b/ace/Timer/Timer_Heap.cpp
index 8132c874f10..2179b9513c8 100644
--- a/ace/Timer/Timer_Heap.cpp
+++ b/ace/Timer/Timer_Heap.cpp
@@ -3,13 +3,13 @@
 #if !defined (ACE_TIMER_HEAP_C)
 #define ACE_TIMER_HEAP_C
 
-#include "ace/Timer_Heap.h"
+#include "ace/Timer/Timer_Heap.h"
 
 ACE_RCSID(ace, Timer_Heap, "$Id$")
 
 #if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
-#include "ace/Timer_Hash.h"
-#include "ace/Timer_Heap_T.cpp"
+#include "ace/Timer/Timer_Hash.h"
+#include "ace/Timer/Timer_Heap_T.cpp"
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class
     ACE_Timer_Heap_T<
diff --git a/ace/Timer/Timer_Queue.cpp b/ace/Timer/Timer_Queue.cpp
index cfcfcd13ae6..fd7d6e8dd96 100644
--- a/ace/Timer/Timer_Queue.cpp
+++ b/ace/Timer/Timer_Queue.cpp
@@ -3,14 +3,14 @@
 #if !defined (ACE_TIMER_QUEUE_C)
 #define ACE_TIMER_QUEUE_C
 
-#include "ace/Containers.h"
-#include "ace/Timer_Queue.h"
+#include "ace/Utils/Containers.h"
+#include "ace/Timer/Timer_Queue.h"
 
 ACE_RCSID(ace, Timer_Queue, "$Id$")
 
 #if defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
-#include "ace/Timer_Hash.h"
-#include "ace/Timer_Queue_T.cpp"
+#include "ace/Timer/Timer_Hash.h"
+#include "ace/Timer/Timer_Queue_T.cpp"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class
diff --git a/ace/Timer/Timer_Queue_Adapters.cpp b/ace/Timer/Timer_Queue_Adapters.cpp
index 237e7349cbc..6b510a68864 100644
--- a/ace/Timer/Timer_Queue_Adapters.cpp
+++ b/ace/Timer/Timer_Queue_Adapters.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Timer_Queue_Adapters.h"
+#include "ace/Timer/Timer_Queue_Adapters.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -12,7 +12,7 @@
 ACE_RCSID(ace, Timer_Queue_Adapters, "$Id$")
 
 # if !defined (__ACE_INLINE__)
-#  include "ace/Timer_Queue_Adapters.i"
+#  include "ace/Timer/Timer_Queue_Adapters.i"
 # endif /* __ACE_INLINE__ */
 
 template <class TQ> TQ &
diff --git a/ace/Timer/Timer_Queue_Adapters.h b/ace/Timer/Timer_Queue_Adapters.h
index ef05e7f79f4..9f1189e258a 100644
--- a/ace/Timer/Timer_Queue_Adapters.h
+++ b/ace/Timer/Timer_Queue_Adapters.h
@@ -15,13 +15,13 @@
 #define ACE_TIMER_QUEUE_ADAPTERS_H
 #include "ace/pre.h"
 
-#include "ace/Task.h"
+#include "ace/Streams/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Signal.h"
+#include "ace/IPC/Signal.h"
 
 /**
  * @class ACE_Async_Timer_Queue_Adapter
@@ -215,11 +215,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "ace/Timer_Queue_Adapters.i"
+# include "ace/Timer/Timer_Queue_Adapters.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "ace/Timer_Queue_Adapters.cpp"
+# include "ace/Timer/Timer_Queue_Adapters.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)