refactor

Author: rdementi

src/pcm.cpp

@@ -170,42 +170,10 @@ void print_output(PCM * m,
     const bool show_partial_core_output,
     const bool show_socket_output,
     const bool show_system_output,
-    const int metricVersion,
-    const bool color
+    const int metricVersion
     )
 {
     cout << "\n";
-    auto setColor = [&color](const char * colorStr)
-    {
-        return color ? colorStr : "";
-    };
-    std::vector<const char *> colorTable = {
-            ASCII_GREEN,
-            ASCII_YELLOW,
-            ASCII_MAGENTA,
-            ASCII_CYAN,
-            ASCII_BRIGHT_GREEN,
-            ASCII_BRIGHT_YELLOW,
-            ASCII_BRIGHT_BLUE,
-            ASCII_BRIGHT_MAGENTA,
-            ASCII_BRIGHT_CYAN,
-            ASCII_BRIGHT_WHITE
-    };
-    size_t currentColor = 0;
-    auto setNextColor = [&setColor,&currentColor,colorTable]()
-    {
-        const auto result = setColor(colorTable[currentColor++]);
-        if (currentColor == colorTable.size())
-        {
-            currentColor = 0;
-        }
-        return result;
-    };
-    auto resetColor = [&setColor, &currentColor]()
-    {
-        currentColor = 0;
-        return setColor(ASCII_RESET_COLOR);
-    };
 
     switch (metricVersion)
     {
@@ -1336,7 +1304,6 @@ int mainThrows(int argc, char * argv[])
     bool disable_JKT_workaround = false; // as per http://software.intel.com/en-us/articles/performance-impact-when-sampling-certain-llc-events-on-snb-ep-with-vtune
     bool enforceFlush = false;
     int metricVersion = 2;
-    bool color = false;
 
     parsePID(argc, argv, pid);
 
@@ -1418,7 +1385,7 @@ int mainThrows(int argc, char * argv[])
         }
         else if (check_argument_equals(*argv, {"--color"}))
         {
-            color = true;
+            setColorEnabled();
             continue;
         }
         else if (check_argument_equals(*argv, {"-csv", "/csv"}))
@@ -1575,7 +1542,7 @@ int mainThrows(int argc, char * argv[])
         else
             print_output(m, cstates1, cstates2, sktstate1, sktstate2, ycores, sstate1, sstate2,
                 cpu_model, show_core_output, show_partial_core_output, show_socket_output, show_system_output,
-                metricVersion, color);
+                metricVersion);
 
         std::swap(sstate1, sstate2);
         std::swap(sktstate1, sktstate2);

src/utils.cpp

@@ -46,6 +46,48 @@ void exit_cleanup(void)
     }
 }
 
+bool colorEnabled = false;
+
+void setColorEnabled(bool value)
+{
+    colorEnabled = value;
+}
+
+const char * setColor (const char * colorStr)
+{
+    return colorEnabled ? colorStr : "";
+}
+
+std::vector<const char *> colorTable = {
+        ASCII_GREEN,
+        ASCII_YELLOW,
+        ASCII_MAGENTA,
+        ASCII_CYAN,
+        ASCII_BRIGHT_GREEN,
+        ASCII_BRIGHT_YELLOW,
+        ASCII_BRIGHT_BLUE,
+        ASCII_BRIGHT_MAGENTA,
+        ASCII_BRIGHT_CYAN,
+        ASCII_BRIGHT_WHITE
+};
+
+size_t currentColor = 0;
+const char * setNextColor()
+{
+    const auto result = setColor(colorTable[currentColor++]);
+    if (currentColor == colorTable.size())
+    {
+        currentColor = 0;
+    }
+    return result;
+}
+
+const char * resetColor()
+{
+    currentColor = 0;
+    return setColor(ASCII_RESET_COLOR);
+}
+
 void print_cpu_details()
 {
     const auto m = PCM::getInstance();

src/utils.h

@@ -163,6 +163,11 @@ constexpr const char* ASCII_BRIGHT_CYAN = "\033[1;36m";
 constexpr const char* ASCII_BRIGHT_WHITE = "\033[1;37m";
 constexpr const char* ASCII_RESET_COLOR = "\033[0m";
 
+void setColorEnabled(bool value = true);
+const char * setColor(const char * colorStr);
+const char * setNextColor();
+const char * resetColor();
+
 template <class IntType>
 inline std::string unit_format(IntType n)
 {