Merge pull request #3943 from anagainaru/revert-perfstub

Revert "Fix printing issue in perfstub thirdparty code"
ornladios · Nov 28, 2023 · 32c3c11 · 32c3c11
2 parents 515db03 + 91ab7eb
commit 32c3c11
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/source/adios2/core/ADIOS.cpp b/source/adios2/core/ADIOS.cpp
@@ -115,7 +115,7 @@ ADIOS::ADIOS(const std::string configFile, helper::Comm comm, const std::string
         static bool perfstubsInit(false);
         if (!perfstubsInit)
         {
-            PERFSTUBS_INITIALIZE(m_Comm.Rank());
+            PERFSTUBS_INITIALIZE();
             perfstubsInit = true;
             atexit(ps_finalize_);
         }

diff --git a/thirdparty/perfstubs/adios2-perfstubs-interface.h.in b/thirdparty/perfstubs/adios2-perfstubs-interface.h.in
@@ -6,7 +6,7 @@
 
 #else
 
-#define PERFSTUBS_INITIALIZE(rank)
+#define PERFSTUBS_INITIALIZE()
 #define PERFSTUBS_FINALIZE()
 #define PERFSTUBS_PAUSE_MEASUREMENT()
 #define PERFSTUBS_RESUME_MEASUREMENT()

diff --git a/thirdparty/perfstubs/perfstubs/perfstubs_api/timer.c b/thirdparty/perfstubs/perfstubs/perfstubs_api/timer.c
@@ -102,16 +102,15 @@ PS_WEAK_PRE void ps_tool_free_counter_data(ps_tool_counter_data_t *) PS_WEAK_POS
 PS_WEAK_PRE void ps_tool_free_metadata(ps_tool_metadata_t *) PS_WEAK_POST;
 #endif
 
-void initialize_library(const int rank) {
+void initialize_library() {
 #ifdef PERFSTUBS_USE_STATIC
     /* The initialization function is the only required one */
     initialize_functions[0] = &ps_tool_initialize;
     if (initialize_functions[0] == NULL) {
         perfstubs_initialized = PERFSTUBS_FAILURE;
         return;
     }
-    if (rank == 0)
-        printf("Found ps_tool_initialize(), registering tool\n");
+    printf("Found ps_tool_initialize(), registering tool\n");
     finalize_functions[0] = &ps_tool_finalize;
     pause_measurement_functions[0] = &ps_tool_pause_measurement;
     resume_measurement_functions[0] = &ps_tool_resume_measurement;
@@ -219,13 +218,13 @@ static inline void ps_register_thread_internal(void) {
 }
 
 /* Initialization */
-void ps_initialize_(const int rank) {
+void ps_initialize_(void) {
     int i;
     /* Only do this once */
     if (perfstubs_initialized != PERFSTUBS_UNKNOWN) {
         return;
     }
-    initialize_library(rank);
+    initialize_library();
     for (i = 0 ; i < num_tools_registered ; i++) {
         initialize_functions[i]();
     }

diff --git a/thirdparty/perfstubs/perfstubs/perfstubs_api/timer.h b/thirdparty/perfstubs/perfstubs/perfstubs_api/timer.h
@@ -49,7 +49,7 @@ extern int perfstubs_initialized;
 extern "C" {
 #endif
 
-void  ps_initialize_(const int rank);
+void  ps_initialize_(void);
 void  ps_finalize_(void);
 void  ps_pause_measurement_(void);
 void  ps_resume_measurement_(void);
@@ -93,7 +93,7 @@ char* ps_make_timer_name_(const char * file, const char * func, int line);
  * line or in a config.h file, however your project does it
  */
 
-#define PERFSTUBS_INITIALIZE(rank) ps_initialize_(rank);
+#define PERFSTUBS_INITIALIZE() ps_initialize_();
 
 #define PERFSTUBS_FINALIZE() ps_finalize_();
 
@@ -170,7 +170,7 @@ char* ps_make_timer_name_(const char * file, const char * func, int line);
 
 #else // defined(PERFSTUBS_USE_TIMERS)
 
-#define PERFSTUBS_INITIALIZE(rank)
+#define PERFSTUBS_INITIALIZE()
 #define PERFSTUBS_FINALIZE()
 #define PERFSTUBS_PAUSE_MEASUREMENT()
 #define PERFSTUBS_RESUME_MEASUREMENT()