ompi/timings: fixed the error of opal timings env import

Signed-off-by: Boris Karasev <karasev.b@gmail.com>

ompi/Makefile.am

@@ -192,6 +192,7 @@ include mpiext/Makefile.am
 include patterns/net/Makefile.am
 include patterns/comm/Makefile.am
 include mca/Makefile.am
+include util/Makefile.am
 
 # Ensure that the man page directory exists before we try to make man
 # page files (because ompi/mpi/man/man3 has no config.status-generated

ompi/util/Makefile.am

@@ -0,0 +1,13 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2017      Mellanox Technologies Ltd. All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# Source code files
+headers += \
+	util/timings.h

ompi/util/timings.h

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2017      Mellanox Technologies Ltd. All rights reserved.
+ * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
 #ifndef OMPI_UTIL_TIMING_H
 #define OMPI_UTIL_TIMING_H
 
@@ -115,10 +125,8 @@ typedef struct ompi_timing_t {
         }                                                                          \
         OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].prefix = func;    \
         OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].file = filename;  \
-        OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use++].ts =            \
-            OMPI_TIMING.get_ts() - OMPI_TIMING.ts;                                 \
+        OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use++].ts = ts;        \
         OMPI_TIMING.cnt++;                                                         \
-        OMPI_TIMING.ts = OMPI_TIMING.get_ts();                                     \
     } while(0)
 
 #define OMPI_TIMING_IMPORT_OPAL_PREFIX(_prefix, func)                              \
@@ -138,9 +146,7 @@ typedef struct ompi_timing_t {
     } while(0)
 
 #define OMPI_TIMING_IMPORT_OPAL(func)                                              \
-    OMPI_TIMING_IMPORT_OPAL_PREFIX("", func)
-
-
+        OMPI_TIMING_IMPORT_OPAL_PREFIX("", func);
 
 #define OMPI_TIMING_OUT                                                           \
     do {                                                                          \

opal/util/timings.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2014      Artem Polyakov <artpol84@gmail.com>
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
+ * Copyright (c) 2017      Mellanox Technologies Ltd. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow

opal/util/timings.h

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2014      Artem Polyakov <artpol84@gmail.com>
  * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2017      Mellanox Technologies Ltd. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -80,6 +81,7 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type);
     opal_timing_env_t name ## _val, *name = &(name ## _val);                      \
     OPAL_TIMING_ENV_START_TYPE(__func__, name, OPAL_TIMING_AUTOMATIC_TIMER, "");
 
+
 /* We use function names for identification
  * however this might be a problem for the private
  * functions declared as static as their names may