Merge pull request #186 from intel-innersource/184-implement-pid-option-for-additional-pcm-utilities

implement pid option for additional pcm utilities

Author: rdementi

src/pcm-numa.cpp

@@ -108,6 +108,7 @@ int main(int argc, char * argv[])
     cerr << "\n";
 
     double delay = -1.0;
+    int pid{ -1 };
     char * sysCmd = NULL;
     char ** sysArgv = NULL;
     bool csv = false;
@@ -116,10 +117,17 @@ int main(int argc, char * argv[])
 
     PCM * m = PCM::getInstance();
 
+    parsePID(argc, argv, pid);
+
     if (argc > 1) do
         {
             argv++;
             argc--;
+            if (*argv == nullptr)
+            {
+                continue;
+            }
+            else
             if (strncmp(*argv, "--help", 6) == 0 ||
                 strncmp(*argv, "-h", 2) == 0 ||
                 strncmp(*argv, "/h", 2) == 0)
@@ -141,6 +149,12 @@ int main(int argc, char * argv[])
                 }
                 continue;
             }
+            else if (isPIDOption(argv))
+            {
+                argv++;
+                argc--;
+                continue;
+            }
             else if (mainLoop.parseArg(*argv))
             {
                 continue;
@@ -198,7 +212,9 @@ int main(int argc, char * argv[])
     regs[1].fields.event_select = m->getOCREventNr(1, 0).first; // OFFCORE_RESPONSE 1 event
     regs[1].fields.umask =        m->getOCREventNr(1, 0).second;
 
-    PCM::ErrorCode status = m->program(PCM::EXT_CUSTOM_CORE_EVENTS, &conf);
+    print_pid_collection_message(pid);
+
+    PCM::ErrorCode status = m->program(PCM::EXT_CUSTOM_CORE_EVENTS, &conf, false, pid);
     m->checkError(status);
 
     print_cpu_details();

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-tsx.cpp

@@ -278,6 +278,7 @@ int main(int argc, char * argv[])
     cerr << "\n";
 
     double delay = -1.0;
+    int pid{ -1 };
     char * sysCmd = NULL;
     char ** sysArgv = NULL;
     int cur_event;
@@ -286,6 +287,8 @@ int main(int argc, char * argv[])
     MainLoop mainLoop;
     string program = string(argv[0]);
 
+    parsePID(argc, argv, pid);
+
     PCM * m = PCM::getInstance();
     const size_t numCtrSupported = m->getMaxCustomCoreEvents();
     switch (m->getCPUModel())
@@ -306,13 +309,24 @@ int main(int argc, char * argv[])
         {
             argv++;
             argc--;
+            if (*argv == nullptr)
+            {
+                continue;
+            }
+            else
             if (strncmp(*argv, "--help", 6) == 0 ||
                 strncmp(*argv, "-h", 2) == 0 ||
                 strncmp(*argv, "/h", 2) == 0)
             {
                 print_usage(program);
                 exit(EXIT_FAILURE);
             }
+            else if (isPIDOption(argv))
+            {
+                argv++;
+                argc--;
+                continue;
+            }
             else if (strncmp(*argv, "-csv", 4) == 0 ||
                      strncmp(*argv, "/csv", 4) == 0)
             {
@@ -442,7 +456,9 @@ int main(int argc, char * argv[])
         cerr << "No RTM support detected, but -F found as argument, running anyway.\n";
     }
 
-    PCM::ErrorCode status = m->program(PCM::EXT_CUSTOM_CORE_EVENTS, &conf);
+    print_pid_collection_message(pid);
+
+    PCM::ErrorCode status = m->program(PCM::EXT_CUSTOM_CORE_EVENTS, &conf, false, pid);
     m->checkError(status);
 
     print_cpu_details();

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