Updated Timeprobe code for removal of Boeing specific vme functions

3 files changed, 9 insertions, 32 deletions

diff --git a/ace/Makefile.ace b/ace/Makefile.ace
index 9ae769d91e1..c1cc1dd03e4 100644
--- a/ace/Makefile.ace
+++ b/ace/Makefile.ace
@@ -249,8 +249,9 @@ OTHER_FILES = \
   Name_Space \
   Naming_Context \
   Registry_Name_Space \
-  Remote_Name_Space \
-
+  Remote_Name_Space
+METRICS_FILES = \
+  Metrics_Cache
 TEMPLATE_FILES = \
            Acceptor \
            Active_Map_Manager_T \
@@ -295,6 +296,7 @@ TEMPLATE_FILES = \
            Map_T \
            Message_Block_T \
            Message_Queue_T \
+	   Metrics_Cache_T \
            Module \
 	   Obstack_T \
            Pair_T \
@@ -356,6 +358,7 @@ ifndef ACE_COMPONENTS
     Timer \
     Token \
     Codecs \
+    Metrics \
     Other
 endif # ACE_COMPONENTS
 
@@ -449,6 +452,10 @@ else  # ! Other
   FILES += $(OTHER_FILES)
 endif # ! Other
 
+ifneq (,$(findstring Metrics,$(ACE_COMPONENTS)))
+  FILES += $(METRICS_FILES)
+endif # Metrics
+
 ifeq ($(AIX_TEMPLATE_HACK),1)
   FILES = 0_ACE_All_Src
   TEMPLATE_FILES = 0_ACE_All_Tmp
diff --git a/ace/Timeprobe_T.cpp b/ace/Timeprobe_T.cpp
index 163b9cecfdb..2c18490e3b6 100644
--- a/ace/Timeprobe_T.cpp
+++ b/ace/Timeprobe_T.cpp
@@ -33,12 +33,6 @@ ACE_Timeprobe<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe (u_long size)
                         this->max_size_);
   this->timeprobes_ = temp;
 
-#if defined (VXWORKS)
-  if (sysProcNumGet () == 0)
-    this->current_slot_vme_address_ = (u_int *) 0xDa010000;
-  else
-    this->current_slot_vme_address_ = (u_int *) 0xD8010000;
-#endif /* VXWORKS */
 }
 
 template <class ACE_LOCK, class ALLOCATOR>
@@ -60,12 +54,6 @@ ACE_Timeprobe (ALLOCATOR *allocator,
                         this->max_size_);
   this->timeprobes_ = temp;
 
-#if defined (VXWORKS)
-  if (sysProcNumGet () == 0)
-    this->current_slot_vme_address_ = (u_int *) 0xDa010000;
-  else
-    this->current_slot_vme_address_ = (u_int *) 0xD8010000;
-#endif /* VXWORKS */
 }
 
 template <class ACE_LOCK, class ALLOCATOR>
@@ -121,11 +109,6 @@ ACE_Timeprobe<ACE_LOCK, ALLOCATOR>::timeprobe (u_long event)
 
   this->current_size_++;
 
-#if defined (VMETRO_TIME_TEST) && (VXWORKS)
-  // If we are using the VMETRO board to get time samples, then write
-  // to the other boards VME address.
-  *this->current_slot_vme_address_ = event;
-#endif /* VMETRO_TIME_TEST && VXWORKS */
 }
 
 template <class ACE_LOCK, class ALLOCATOR> void
@@ -212,12 +195,6 @@ ACE_Timeprobe<ACE_LOCK, ALLOCATOR>::sorted_event_descriptions (void)
   return this->sorted_event_descriptions_;
 }
 
-template <class ACE_LOCK, class ALLOCATOR> u_int *
-ACE_Timeprobe<ACE_LOCK, ALLOCATOR>::current_slot_vme_address (void)
-{
-  return this->current_slot_vme_address_;
-}
-
 template <class ACE_LOCK, class ALLOCATOR> ACE_timeprobe_t *
 ACE_Timeprobe<ACE_LOCK, ALLOCATOR>::timeprobes (void)
 {
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index d3ba678a08b..2d7ef3dd032 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -109,9 +109,6 @@ public:
   /// Sorted Event Descriptions.
   ACE_Unbounded_Set<ACE_Event_Descriptions> &sorted_event_descriptions (void);
 
-  /// VME slot address.
-  u_int *current_slot_vme_address (void);
-
   /// Find description of event \<i\>
   const char *find_description_i (u_long i);
 
@@ -142,10 +139,6 @@ protected:
   /// Sorted Event Descriptions.
   EVENT_DESCRIPTIONS sorted_event_descriptions_;
 
-  /// Added sections below here to make compatible with the VMETRO
-  /// board test.
-  u_int *current_slot_vme_address_;
-
   /// Time probe slots
   ACE_timeprobe_t *timeprobes_;