Put back detection for simultaneouswip-kernthreads-nv-trace

3 files changed, 244 insertions, 231 deletions

diff --git a/unit-trace b/unit-trace
index 002625a..52fad4e 100755
--- a/unit-trace
+++ b/unit-trace
@@ -111,7 +111,7 @@ if options.progress is True:
 #    stream = gedf_test.gedf_test(stream)
 
 # Produce C-EDF error records
-if options.cedf is True:
+if options.cedf is True and options.maxnum > 0:
     from unit_trace import cedf_test
     stream = cedf_test.cedf_test(stream,options.csize,options.maxnum)
 
@@ -165,10 +165,10 @@ if options.dist is True:
         #cedf_stat_printer.cedf_stat_printer(stream9,options.cdf_unit,False,1,"Work_Item_inversion",options.out_file)
 
         
-        #cedf_stat_printer.cedf_stat_printer(stream5,options.cdf_unit,False,0,"Tasklet_simultaneous",options.out_file) 
+        cedf_stat_printer.cedf_stat_printer(stream5,options.cdf_unit,False,0,"Tasklet_simultaneous",options.out_file) 
         #cedf_stat_printer.cedf_stat_printer(stream12,options.cdf_unit,False,1,"Tasklet_simultaneous",options.out_file)
 
-        #cedf_stat_printer.cedf_stat_printer(stream6,options.cdf_unit,False,0,"Work_Item_simultaneous",options.out_file)
+        cedf_stat_printer.cedf_stat_printer(stream6,options.cdf_unit,False,0,"Work_Item_simultaneous",options.out_file)
         #cedf_stat_printer.cedf_stat_printer(stream15,options.cdf_unit,False,1,"Work_Item_simultaneous",options.out_file)
 
         
diff --git a/unit_trace/cedf_test.py b/unit_trace/cedf_test.py
index d09d001..7d9cc77 100644
--- a/unit_trace/cedf_test.py
+++ b/unit_trace/cedf_test.py
@@ -66,12 +66,7 @@ def cedf_test(stream,csize,number):
         # All records with when ==0 are garbage 
         if record.when == 0:
             continue
-        #if processing count reach number(maximum) start to process
-        if number > 0:
-                number -= 1
-        elif number == 0:
-            break  
-            
+                   
         #yield record
         #continue  
         
@@ -83,7 +78,7 @@ def cedf_test(stream,csize,number):
         if last_time is not None and last_time != record.when:  
             
             # check PI for tasklet 
-            errors = _cedf_check_irq(
+            errors = _cedf_check_irq_inversion(
                 off_cpu,on_cpu,
                 tasklet_on_cpu,work_on_cpu,
                 tasklet_off_cpu,tasklet_on_cpu,
@@ -91,15 +86,19 @@ def cedf_test(stream,csize,number):
                 first_event_this_timestamp, "Tasklet")
             for error in errors:
                 yield error
-            # check Simultaneous execution of tasklet and owner
-            #errors = _cedf_check_tasklet_simultaneous(off_cpu,on_cpu,
-            #    tasklet_off_cpu,tasklet_on_cpu,last_time,csize,
-            #    first_event_this_timestamp)
-            #for error in errors:
-            #    yield error
+                
+            # check Simultaneous for tasklet    
+            errors = _cedf_check_irq_simultaneous(
+                off_cpu,on_cpu,
+                tasklet_on_cpu,work_on_cpu,
+                tasklet_off_cpu,tasklet_on_cpu,
+                last_time,csize,
+                first_event_this_timestamp, "Tasklet")            
+            for error in errors:
+                yield error
             
             # check PI for work item    
-            errors = _cedf_check_irq(
+            errors = _cedf_check_irq_inversion(
                 off_cpu,on_cpu,
                 tasklet_on_cpu,work_on_cpu,
                 work_off_cpu,work_on_cpu,
@@ -108,12 +107,16 @@ def cedf_test(stream,csize,number):
             for error in errors:
                 yield error
             
-            # check Simultaneous execution of work item and owner
-            #errors = _cedf_check_work_simultaneous(off_cpu,on_cpu,
-            #    work_off_cpu,work_on_cpu,last_time,csize,
-            #    first_event_this_timestamp)            
-            #for error in errors:
-            #    yield error
+            # check Simultaneous for work item    
+            errors = _cedf_check_irq_simultaneous(
+                off_cpu,on_cpu,
+                tasklet_on_cpu,work_on_cpu,
+                work_off_cpu,work_on_cpu,
+                last_time,csize,
+                first_event_this_timestamp, "Work_Item")            
+            for error in errors:
+                yield error
+
             
             # check PI for task
             for c in range(0,int(m/csize)):
@@ -178,6 +181,7 @@ def cedf_test(stream,csize,number):
                     msg = msg % (record.id,record.pid)
                     print msg
                     #sys.stderr.write(msg)
+                    yield record
                     #exit()
                     continue
                     
@@ -204,7 +208,7 @@ def cedf_test(stream,csize,number):
                         " that was not running\n")
                     msg = msg % (record.id, record.pid)
                     print msg
-                    #sys.stderr.write(msg)
+                    #sys.stderr.write(msg)             
                     #exit()
                     yield record
                     continue
@@ -229,6 +233,7 @@ def cedf_test(stream,csize,number):
                     msg = msg % (record.id,record.pid)
                     print msg
                     #sys.stderr.write(msg)
+                    yield record
                     #exit()
                     continue
                 off_cpu[pos].is_blocked =True
@@ -248,6 +253,7 @@ def cedf_test(stream,csize,number):
                     msg = msg % (record.id,record.pid)
                     print msg
                     #sys.stderr.write(msg)
+                    yield record
                     #exit()
                     continue
             off_cpu[pos].is_blocked = False
@@ -303,6 +309,7 @@ def cedf_test(stream,csize,number):
                 msg = msg % (record.id, record.pid)
                 print msg
                 #sys.stderr.write(msg)
+                yield record
                 #exit() #Continue see if anything wrong
                 continue
             job = tasklet_off_cpu[pos]
@@ -320,6 +327,7 @@ def cedf_test(stream,csize,number):
                 msg = msg % (record.id, record.pid)
                 print msg
                 #sys.stderr.write(msg)
+                yield record
                 #exit() #Continue see if anything wrong
                 continue
             job = work_off_cpu[pos]
@@ -335,6 +343,7 @@ def cedf_test(stream,csize,number):
                        " that was not running\n")
                 msg = msg % (record.id, record.pid)
                 print msg
+                yield record
                 #sys.stderr.write(msg)
                 pos = _find_job(record,tasklet_off_cpu)
                 if pos is not None:
@@ -359,6 +368,7 @@ def cedf_test(stream,csize,number):
                        " that was not running\n")
                 msg = msg % (record.id, record.pid)
                 print msg
+                yield record
                 #sys.stderr.write(msg)
                 pos = _find_job(record,work_off_cpu)
                 if pos is not None:
@@ -374,34 +384,38 @@ def cedf_test(stream,csize,number):
                 del work_on_cpu[pos]
             
         # a Task has Priority inheritance 
-        #elif record.type_name == 'eff_prio_change':
-        #    inh_pos = _find_inh_job(record,off_cpu)
-        #    if inh_pos is None:
-        #        inh_pos = _find_inh_job(record,on_cpu)
-        #        if inh_pos is not None:
-        #            inh_job = on_cpu[inh_pos]
-        #    else:
+        elif record.type_name == 'eff_prio_change':
+            inh_pos = _find_inh_job(record,off_cpu)
+            if inh_pos is None:
+                inh_pos = _find_inh_job(record,on_cpu)
+                if inh_pos is not None:
+                    inh_job = on_cpu[inh_pos]
+            else: