Skip to content

Commit 029d54d

Browse files
committed
timings: fixes to be usable again
The timing infrastructure introduced with commit dfb952f was broken by changes made via commit fe1c384 This patches restores the ability to build Open MPI with the --enable-timings config option set. Note the output generated wth env OMPI_TIMING_ENABLE=1 is a bit jumbled at the moment but that will be addressed as part of a solution to issue #11166 Related to #11213 Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent 0e51b7c commit 029d54d

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

opal/runtime/opal_init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ int opal_init(int *pargc, char ***pargv)
138138
{
139139
int ret;
140140

141+
OPAL_TIMING_ENV_INIT(otmng);
142+
141143
if (opal_initialized != 0) {
142144
if (opal_initialized < 0) {
143145
return OPAL_ERROR;

opal/util/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ libopalutil_core_la_SOURCES = \
125125
uri.c
126126

127127
if OPAL_COMPILE_TIMING
128-
libopalutil_la_SOURCES += timings.c
128+
libopalutil_core_la_SOURCES += timings.c
129129
endif
130130

131131
libopalutil_core_la_LIBADD = \

opal/util/timings.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type)
8585
return NULL;
8686
#endif // OPAL_TIMER_USEC_NATIVE
8787
default:
88-
if (!opal_initialized) {
89-
return get_ts_gettimeofday;
90-
}
9188
#if OPAL_TIMER_CYCLE_NATIVE
9289
return get_ts_cycle;
9390
#elif OPAL_TIMER_USEC_NATIVE

0 commit comments

Comments
 (0)