* fix some problems with C++ protection in timer headers

* Make ompi_info list timer components
* Remove flag to display whether we have memory intercepts (components are
  already listed), until we can figure out how to do it *after* the
  components are opened.

This commit was SVN r6950.

ompi/tools/ompi_info/components.cc

@@ -33,6 +33,9 @@
 #include "opal/mca/paffinity/base/internal.h"
 #include "opal/mca/memory/memory.h"
 #include "opal/mca/memory/base/base.h"
+#include "opal/mca/timer/timer.h"
+#include "opal/mca/timer/base/base.h"
+
 
 #include "ompi/mca/allocator/allocator.h"
 #include "ompi/mca/allocator/base/base.h"
@@ -152,6 +155,10 @@ void ompi_info::open_components()
   opal_paffinity_base_open();
   component_map["paffinity"] = &opal_paffinity_base_components_opened;
 
+  opal_timer_base_open();
+  component_map["timer"] = &opal_timer_base_components_opened;
+
+
   // ORTE frameworks
 
   mca_oob_base_open();
@@ -261,6 +268,7 @@ void ompi_info::close_components()
     
         opal_memory_base_close();
         opal_paffinity_base_close();
+        opal_timer_base_close();
 
         component_map.clear();
     }

ompi/tools/ompi_info/ompi_info.cc

@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
 
   ompi_info::mca_types.push_back("memory");
   ompi_info::mca_types.push_back("paffinity");
+  ompi_info::mca_types.push_back("timer");
 
   ompi_info::mca_types.push_back("allocator");
   ompi_info::mca_types.push_back("coll");

ompi/tools/ompi_info/param.cc

@@ -330,7 +330,6 @@ void ompi_info::do_config(bool want_all)
   const string f90(OMPI_WANT_F90_BINDINGS ? "yes" : "no");
   const string memprofile(OMPI_ENABLE_MEM_PROFILE ? "yes" : "no");
   const string memdebug(OMPI_ENABLE_MEM_DEBUG ? "yes" : "no");
-  const string memhooks(opal_mem_free_is_supported() ? "yes" : "no");
   const string debug(OMPI_ENABLE_DEBUG ? "yes" : "no");
   const string cprofiling(OMPI_ENABLE_MPI_PROFILING ? "yes" : "no");
   const string cxxprofiling(OMPI_ENABLE_MPI_PROFILING ? "yes" : "no");
@@ -565,6 +564,5 @@ void ompi_info::do_config(bool want_all)
   out("MPI parameter check", "option:mpi-param-check", paramcheck);
   out("Memory profiling support", "option:mem-profile", memprofile);
   out("Memory debugging support", "option:mem-debug", memdebug);
-  out("Memory hook support", "option:mem-hook", memhooks);
   out("libltdl support", "option:dlopen", OMPI_WANT_LIBLTDL);
 }

opal/include/sys/timer.h

@@ -68,6 +68,10 @@
  *
  *********************************************************************/
 
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
 #if defined(DOXYGEN)
 /* don't include system-level gorp when generating doxygen files */ 
 #elif OMPI_ASSEMBLY_ARCH == OMPI_AMD64

opal/mca/timer/base/base.h

@@ -68,12 +68,12 @@ extern "C" {
     OMPI_DECLSPEC int opal_timer_base_close(void);
 
     extern opal_list_t opal_timer_base_components_opened;
-
-
-    /* include implementation to call */
-    #include "opal/mca/timer/base/base_impl.h"
     
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
+
+/* include implementation to call */
+#include "opal/mca/timer/base/base_impl.h"
+
 #endif /* OPAL_BASE_TIMER_H */