Merge branch 'develop' into multiple-parents

UO-OACISS · Oct 16, 2024 · eb2c215 · eb2c215
2 parents 07d7343 + fbd4d84
commit eb2c215
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/apex/apex_preload.cpp b/src/apex/apex_preload.cpp
@@ -56,9 +56,11 @@ int apex_preload_main(int argc, char** argv, char** envp) {
         size_t needle_len{strlen(needle)};
         if (len > needle_len &&
             (strncmp(argv[0] + (len - needle_len), needle, needle_len)) == 0) {
-            fputs("apex: skipping ", stderr);
-            fputs(argv[0], stderr);
-            fputs("!\n", stderr);
+            if (apex::apex_options::use_verbose()) {
+                fputs("apex: skipping ", stderr);
+                fputs(argv[0], stderr);
+                fputs("\n", stderr);
+            }
             return true;
         }
         return false;
@@ -93,9 +95,11 @@ int apex_preload_main(int argc, char** argv, char** envp) {
     if (apex::apex_options::use_otf2() && apex::apex_options::use_mpi()) {
         ret = main_real(argc, argv, envp);
     } else {
-        fputs("apex: executing ", stderr);
-        fputs(argv[0], stderr);
-        fputs("\n", stderr);
+        if (apex::apex_options::use_verbose()) {
+            fputs("apex: executing ", stderr);
+            fputs(argv[0], stderr);
+            fputs("\n", stderr);
+        }
         apex::init("APEX Preload", 0, 1);
         const std::string timerName{__APEX_FUNCTION__};
         auto t = apex::new_task(timerName);

diff --git a/src/apex/otf2_listener.cpp b/src/apex/otf2_listener.cpp
@@ -489,7 +489,7 @@ namespace apex {
     }
 
     bool otf2_listener::create_archive(void) {
-        printf("Enter %s\n", __func__);
+        //printf("Enter %s\n", __func__);
         /* only one thread per process allowed in here, ever! */
         write_lock_type lock(_archive_mutex);
         /* only open once! */
@@ -535,7 +535,7 @@ namespace apex {
         /* open the event files for this archive */
         OTF2_EC(OTF2_Archive_OpenEvtFiles( archive ));
         created = true;
-        printf("Exit %s\n", __func__);
+        //printf("Exit %s\n", __func__);
         return created;
      }