From 1fcba34749c6d6aedd43a722466aeb0759f0f193 Mon Sep 17 00:00:00 2001
From: Kevin Huck <khuck@cs.uoregon.edu>
Date: Wed, 13 Nov 2019 13:15:06 -0800
Subject: [PATCH] Splitting screen_output into verbose for environent variables

---
 src/apex/apex.cpp              | 8 ++++++--
 src/apex/apex_types.h          | 1 +
 src/apex/profiler.hpp          | 2 +-
 src/apex/profiler_listener.cpp | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/apex/apex.cpp b/src/apex/apex.cpp
index 5bfdd535..78b825bc 100644
--- a/src/apex/apex.cpp
+++ b/src/apex/apex.cpp
@@ -424,7 +424,7 @@ uint64_t init(const char * thread_name, uint64_t comm_rank,
             top_level_timer = start("OS Thread");
         }
     }
-    if (apex_options::use_screen_output() && instance->get_node_id() == 0) {
+    if (apex_options::use_verbose() && instance->get_node_id() == 0) {
       std::cout << version() << std::endl;
       apex_options::print_options();
     }
@@ -1283,9 +1283,9 @@ void finalize_plugins(void) {
 std::string dump(bool reset) {
     // if APEX is disabled, do nothing.
     if (apex_options::disable() == true) { return(std::string("")); }
-    bool old_screen_output = apex_options::use_screen_output();
 #ifdef APEX_WITH_JUPYTER_SUPPORT
     // force output in the Jupyter notebook
+    bool old_screen_output = apex_options::use_screen_output();
     apex_options::use_screen_output(true);
 #endif
 
@@ -1299,10 +1299,14 @@ std::string dump(bool reset) {
         for (unsigned int i = 0 ; i < instance->listeners.size() ; i++) {
             instance->listeners[i]->on_dump(data);
         }
+#ifdef APEX_WITH_JUPYTER_SUPPORT
         apex_options::use_screen_output(old_screen_output);
+#endif
         return(data.output);
     }
+#ifdef APEX_WITH_JUPYTER_SUPPORT
     apex_options::use_screen_output(old_screen_output);
+#endif
     return(std::string(""));
 }
 
diff --git a/src/apex/apex_types.h b/src/apex/apex_types.h
index 216890f9..3aa14241 100644
--- a/src/apex/apex_types.h
+++ b/src/apex/apex_types.h
@@ -254,6 +254,7 @@ inline unsigned int sc_nprocessors_onln()
     macro (APEX_MEASURE_CONCURRENCY, use_concurrency, int, 0) \
     macro (APEX_MEASURE_CONCURRENCY_PERIOD, concurrency_period, int, 1000000) \
     macro (APEX_SCREEN_OUTPUT, use_screen_output, bool, false) \
+    macro (APEX_VERBOSE, use_verbose, bool, false) \
     macro (APEX_PROFILE_OUTPUT, use_profile_output, int, false) \
     macro (APEX_CSV_OUTPUT, use_csv_output, int, false) \
     macro (APEX_TASKGRAPH_OUTPUT, use_taskgraph_output, bool, false) \
diff --git a/src/apex/profiler.hpp b/src/apex/profiler.hpp
index 9a3007f2..0f6ae25e 100644
--- a/src/apex/profiler.hpp
+++ b/src/apex/profiler.hpp
@@ -230,7 +230,7 @@ class profiler {
             //<< " Seconds? seen." << std::endl;
             ticks_per_period = CycleB(t1b-t0b)/CycleA(t1a-t0a);
             /*
-            if (apex_options::use_screen_output()) {
+            if (apex_options::use_verbose()) {
                 std::cout << "CPU is " << (1.0/ticks_per_period) << " Hz." <<
                 std::endl;
             }
diff --git a/src/apex/profiler_listener.cpp b/src/apex/profiler_listener.cpp
index 0d834a62..40dcf912 100644
--- a/src/apex/profiler_listener.cpp
+++ b/src/apex/profiler_listener.cpp
@@ -318,7 +318,7 @@ std::unordered_set<profile*> free_profiles;
                           throttled_tasks.insert(*(p->get_task_id()));
                       }
                   }
-                  if (apex_options::use_screen_output()) {
+                  if (apex_options::use_verbose()) {
                       cout << "APEX: disabling lightweight timer "
                            << p->get_task_id()->get_name()
                             << endl;