refactor PID option parsing

Change-Id: I7d8caaa3080e722d132213ef44d9aa4243e401d7

Author: rdementi

src/pcm-raw.cpp

@@ -1810,7 +1810,7 @@ int main(int argc, char* argv[])
     bool reset_pmu = false;
     PCM* m = PCM::getInstance();
 
-    parseParam(argc, argv, "pid", [&pid](const char* p) { if (p) pid = atoi(p); });
+    parsePID(argc, argv, pid);
 
 #ifdef PCM_SIMDJSON_AVAILABLE
     parseParam(argc, argv, "ep", [](const char* p) { eventFileLocationPrefix = p;});
@@ -1844,7 +1844,7 @@ int main(int argc, char* argv[])
         {
             continue;
         }
-        else if (strncmp(*argv, "-pid", 4) == 0 || strncmp(*argv, "/pid", 4) == 0)
+        else if (isPIDOption(argv))
         {
             argv++;
             argc--;

src/pcm.cpp

@@ -1167,7 +1167,7 @@ int main(int argc, char * argv[])
     bool reset_pmu = false;
     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
 
-    parseParam(argc, argv, "pid", [&pid](const char* p) { if (p) pid = atoi(p); });
+    parsePID(argc, argv, pid);
 
     MainLoop mainLoop;
     std::bitset<MAX_CORES> ycores;
@@ -1267,7 +1267,7 @@ int main(int argc, char * argv[])
             }
             continue;
         }
-        else if (strncmp(*argv, "-pid", 4) == 0 || strncmp(*argv, "/pid", 4) == 0)
+        else if (isPIDOption(argv))
         {
             argv++;
             argc--;

src/utils.h

@@ -498,4 +498,15 @@ void check_and_set_silent(int argc, char * argv[], null_stream &nullStream2);
 
 void print_pid_collection_message(int pid);
 
+inline bool isPIDOption(char * argv [])
+{
+    return strncmp(*argv, "-pid", 4) == 0 || strncmp(*argv, "/pid", 4) == 0;
+}
+
+inline void parsePID(int argc, char* argv[], int& pid)
+{
+    parseParam(argc, argv, "pid", [&pid](const char* p) { if (p) pid = atoi(p); });
+}
+
+
 } // namespace pcm