mpi_t events: convert to new profiling approach

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
open-mpi · Jan 18, 2022 · 9e35c26 · 9e35c26
1 parent 6cd087d
commit 9e35c26
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 72 deletions.
diff --git a/ompi/mpi/tool/event_callback_get_info.c b/ompi/mpi/tool/event_callback_get_info.c
@@ -14,14 +14,15 @@
  * $HEADER$
  */
 
+
+#include "ompi_config.h"
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_callback_get_info = PMPI_T_event_callback_get_info
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_callback_get_info PMPI_T_event_callback_get_info
 #endif
 
 

diff --git a/ompi/mpi/tool/event_callback_set_info.c b/ompi/mpi/tool/event_callback_set_info.c
@@ -14,17 +14,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_callback_set_info = PMPI_T_event_callback_set_info
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_callback_set_info PMPI_T_event_callback_set_info
 #endif
 
-
 int MPI_T_event_callback_set_info (MPI_T_event_registration event_registration,
                                    MPI_T_cb_safety cb_safety, MPI_Info info)
 {

diff --git a/ompi/mpi/tool/event_copy.c b/ompi/mpi/tool/event_copy.c
@@ -11,14 +11,15 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_copy = PMPI_T_event_copy
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_copy PMPI_T_event_copy
 #endif
 
 

diff --git a/ompi/mpi/tool/event_get_index.c b/ompi/mpi/tool/event_get_index.c
@@ -10,17 +10,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_get_index = PMPI_T_event_get_index
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_get_index PMPI_T_event_get_index
 #endif
 
-
 int MPI_T_event_get_index (const char *name, int *event_index)
 {
     mca_base_event_t *event = NULL;

diff --git a/ompi/mpi/tool/event_get_info.c b/ompi/mpi/tool/event_get_info.c
@@ -13,18 +13,18 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
 /* needed to convert between opal and ompi datatypes until a function is provided */
 #include "ompi/datatype/ompi_datatype_internal.h"
 
-#if OMPI_PROFILING_DEFINES
-
+#if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_get_info = PMPI_T_event_get_info
 #endif
-
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_get_info PMPI_T_event_get_info
 #endif
 
 int MPI_T_event_get_info (int event_index, char *name, int *name_len,

diff --git a/ompi/mpi/tool/event_get_num.c b/ompi/mpi/tool/event_get_num.c
@@ -10,17 +10,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_get_num = PMPI_T_event_get_num
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_get_num PMPI_T_event_get_num
 #endif
 
-
 int MPI_T_event_get_num (int *num_event)
 {
     if (!mpit_is_initialized ()) {

diff --git a/ompi/mpi/tool/event_get_source.c b/ompi/mpi/tool/event_get_source.c
@@ -11,17 +11,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_get_source = PMPI_T_event_get_source
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_get_source PMPI_T_event_get_source
 #endif
 
-
 int MPI_T_event_get_source (MPI_T_event_instance event, int *source_index)
 {
     if (!mpit_is_initialized ()) {

diff --git a/ompi/mpi/tool/event_get_timestamp.c b/ompi/mpi/tool/event_get_timestamp.c
@@ -11,19 +11,17 @@
  * $HEADER$
  */
 
-#include "ompi/mpi/tool/mpit-internal.h"
+#include "ompi_config.h"
 
-#if OMPI_PROFILING_DEFINES
+#include "ompi/mpi/tool/mpit-internal.h"
 
+#if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_get_timestamp = PMPI_T_event_get_timestamp
 #endif
-
-#include "ompi/mpi/tool/profile/defines.h"
-
+#define MPI_T_event_get_timestamp PMPI_T_event_get_timestamp
 #endif
 
-
 int MPI_T_event_get_timestamp (MPI_T_event_instance event, MPI_Count *event_time)
 {
     uint64_t mca_time;

diff --git a/ompi/mpi/tool/event_handle_alloc.c b/ompi/mpi/tool/event_handle_alloc.c
@@ -13,17 +13,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_handle_alloc = PMPI_T_event_handle_alloc
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_handle_alloc PMPI_T_event_handle_alloc
 #endif
 
-
 int MPI_T_event_handle_alloc (int event_index, void *obj_handle, MPI_Info info,
                               MPI_T_event_registration *event_registration)
 {

diff --git a/ompi/mpi/tool/event_handle_free.c b/ompi/mpi/tool/event_handle_free.c
@@ -13,17 +13,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_handle_free = PMPI_T_event_handle_free
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_handle_free PMPI_T_event_handle_free
 #endif
 
-
 int MPI_T_event_handle_free (MPI_T_event_registration event_registration,
                              void *user_data,
                              MPI_T_event_free_cb_function free_cb_function)

diff --git a/ompi/mpi/tool/event_handle_get_info.c b/ompi/mpi/tool/event_handle_get_info.c
@@ -14,17 +14,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_handle_get_info = PMPI_T_event_handle_get_info
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_handle_get_info PMPI_T_event_handle_get_info
 #endif
 
-
 int MPI_T_event_handle_get_info (MPI_T_event_registration event_registration,
                                  MPI_Info *info_used)
 {

diff --git a/ompi/mpi/tool/event_handle_set_info.c b/ompi/mpi/tool/event_handle_set_info.c
@@ -14,17 +14,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_handle_set_info = PMPI_T_event_handle_set_info
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_handle_set_info PMPI_T_event_handle_set_info
 #endif
 
-
 int MPI_T_event_handle_set_info (MPI_T_event_registration event_registration,
                                  MPI_Info info)
 {

diff --git a/ompi/mpi/tool/event_read.c b/ompi/mpi/tool/event_read.c
@@ -11,17 +11,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_read = PMPI_T_event_read
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_read PMPI_T_event_read
 #endif
 
-
 int MPI_T_event_read (MPI_T_event_instance event, int element_index, void *buffer)
 {
     int ret;

diff --git a/ompi/mpi/tool/event_register_callback.c b/ompi/mpi/tool/event_register_callback.c
@@ -13,17 +13,17 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_register_callback = PMPI_T_event_register_callback
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_register_callback PMPI_T_event_register_callback
 #endif
 
-
 int MPI_T_event_register_callback (MPI_T_event_registration event_registration,
                                    MPI_T_cb_safety cb_safety, MPI_Info info, void *user_data,
                                    MPI_T_event_cb_function event_cb_function)

diff --git a/ompi/mpi/tool/event_set_dropped_handler.c b/ompi/mpi/tool/event_set_dropped_handler.c
@@ -11,14 +11,15 @@
  * $HEADER$
  */
 
+#include "ompi_config.h"
+
 #include "ompi/mpi/tool/mpit-internal.h"
 
-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_set_dropped_handler = PMPI_T_event_set_dropped_handler
 #endif
-
-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/tool/profile/defines.h"
+#define MPI_T_event_set_dropped_handler PMPI_T_event_set_dropped_handler
 #endif
 
 int MPI_T_event_set_dropped_handler (MPI_T_event_registration handle, MPI_T_event_dropped_cb_function dropped_cb_function)