Update showst2.cpp to count forced job completions.wip-mc-glenn

used to correlate non-forced job completions with the
job ID of the job that is actually completing.

1 files changed, 18 insertions, 2 deletions

diff --git a/src/showst2.cpp b/src/showst2.cpp
index 98f5c39..ec9b1b3 100644
--- a/src/showst2.cpp
+++ b/src/showst2.cpp
@@ -77,6 +77,7 @@ struct Task
 };
 
 map<Task, set<Job> > traceData;
+map<Task, int> forcedCompletionCount;
 
 template <class T>
 double stddev(const T& arr)
@@ -161,6 +162,7 @@ int main(int argc, char** argv)
                         if(iter == traceData.end())
                         {
                                 traceData[tsk] = set<Job>();
+                                forcedCompletionCount[tsk] = 0;
                         }
                         else
                         {
@@ -181,13 +183,14 @@ int main(int argc, char** argv)
                                 traceData[srch] = set<Job>();
                                 iter = traceData.find(srch);
                                 iter->first.period = rec->data.release.release - rec->data.release.deadline;
+                                forcedCompletionCount[srch] = 0;
                         }
 
                         if(iter != traceData.end())
                         {
                                 Job jsrch;
                                 jsrch.jid = rec->hdr.job;
-
+                                
                                 set<Job>::iterator jter = iter->second.find(jsrch);
                                 if(jter == iter->second.end())
                                 {
@@ -223,12 +226,25 @@ int main(int argc, char** argv)
                                 traceData[srch] = set<Job>();
                                 iter = traceData.find(srch);
                                 iter->first.period = 0;
+                                
+                                forcedCompletionCount[srch] = 0;
                         }   
 
+                        
+                        if(rec->data.completion.forced)
+                        {
+                                forcedCompletionCount[srch] += 1;  // increment # for forced completions
+                                continue;                                                  // move onto next record
+                        }                       
+                        
+                        // we're processing a regular (non-forced) completion
                         if(iter != traceData.end())
                         {
                                 Job jsrch;
-                                jsrch.jid = rec->hdr.job;
+                                //jsrch.jid = rec->hdr.job;
+                                // subtract off the number of forced completions to correlate the
+                                // job ID with the job that has actually completed
+                                jsrch.jid = rec->hdr.job - forcedCompletionCount[srch];
                                 set<Job>::iterator j = iter->second.find(jsrch);