Merge pull request #11267 from hppritcha/fixes_for_timings

timings: fixes to be usable again

Author: hppritcha

opal/runtime/opal_init.c

@@ -138,6 +138,8 @@ int opal_init(int *pargc, char ***pargv)
 {
     int ret;
 
+    OPAL_TIMING_ENV_INIT(otmng);
+
     if (opal_initialized != 0) {
         if (opal_initialized < 0) {
             return OPAL_ERROR;

opal/util/Makefile.am

@@ -125,7 +125,7 @@ libopalutil_core_la_SOURCES = \
         uri.c
 
 if OPAL_COMPILE_TIMING
-libopalutil_la_SOURCES += timings.c
+libopalutil_core_la_SOURCES += timings.c
 endif
 
 libopalutil_core_la_LIBADD = \

opal/util/timings.c

@@ -85,9 +85,6 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type)
         return NULL;
 #endif // OPAL_TIMER_USEC_NATIVE
     default:
-        if (!opal_initialized) {
-            return get_ts_gettimeofday;
-        }
 #if OPAL_TIMER_CYCLE_NATIVE
         return get_ts_cycle;
 #elif OPAL_TIMER_USEC_NATIVE