1 files changed, 53 insertions, 30 deletions

diff --git a/unit_trace/stdout_printer.py b/unit_trace/stdout_printer.py
index 2e4c783..111e0d1 100644
--- a/unit_trace/stdout_printer.py
+++ b/unit_trace/stdout_printer.py
@@ -25,16 +25,14 @@ def stdout_printer(stream,csize):
         elif record.record_type == "error" and record.type_name == 'Work_Item_inversion_end':
                 _print_inversion_end(csize,record,"Work_Item_")
         
-        #elif record.record_type == "error" and record.type_name == 'Tasklet_simultaneous_start':
-        #       _print_simultaneous_start(csize,record,"Tasklet_")
-        #elif record.record_type == "error" and record.type_name == 'Tasklet_simultaneous_end':
-        #       _print_simultaneous_end(csize,record,"Tasklet_")
-        #elif record.record_type == "error" and record.type_name == 'Work_Item_simultaneous_start':
-        #       _print_simultaneous_start(csize,record,"Work_Item_")
-        #elif record.record_type == "error" and record.type_name == 'Work_Item_simultaneous_end':
-        #       _print_simultaneous_end(csize,record,"Work_Item_")      
-                
-                
+        elif record.record_type == "error" and record.type_name == 'Tasklet_simultaneous_start':
+                _print_simultaneous_start(csize,record,"Tasklet_")
+        elif record.record_type == "error" and record.type_name == 'Tasklet_simultaneous_end':
+                _print_simultaneous_end(csize,record,"Tasklet_")
+        elif record.record_type == "error" and record.type_name == 'Work_Item_simultaneous_start':
+                _print_simultaneous_start(csize,record,"Work_Item_")
+        elif record.record_type == "error" and record.type_name == 'Work_Item_simultaneous_end':
+                _print_simultaneous_end(csize,record,"Work_Item_")                      
         else:
             continue
         print ""
@@ -103,25 +101,50 @@ def _print_inversion_end(csize,record,pi_type):
             print str(job) + " ",
     print #newline
         
-#def _print_simultaneous_start(csize,record,irq_type):
-#    print "Type: %s" % (irq_type+"Simultaneous start")
-#    print "Inversion Record IDs: (%d, U)" % (record.id)
-#    print "Triggering Event IDs: (%d, U)" % (record.triggering_event_id)
-#    print "Time: %d" % (record.job.simultaneous_start)
-#    print "Job: %d.%d" % (record.job.pid,record.job.job)
+def _print_simultaneous_start(csize,record,irq_type):
+    print "Type: %s" % (irq_type+"Simultaneous start")
+    print "Inversion Record IDs: (%d, U)" % (record.id)
+    print "Triggering Event IDs: (%d, U)" % (record.triggering_event_id)
+    print "Time: %d" % (record.job.simultaneous_start)
+    print "Job: %d.%d" % (record.job.pid,record.job.job)
+    print "Deadline: %d" % (record.job.deadline)
+    print "Cluster: %d" % (record.job.cluster)
+    print "Handling Klit thread: %d" % (record.job.exe_pid)
+    print "Off CPU: ",
+    for job in record.off_cpu:
+        if job.cluster==record.job.cluster :
+            print str(job) + " ",
+    print
+    print "On CPU: ",
+    for job in record.on_cpu:
+        if job.cluster==record.job.cluster :    
+            print str(job) + " ",
+    print #newline
     
 
-#def _print_simultaneous_end(csize,record,irq_type):
-#    print "Type: %s" % (irq_type+"Simultaneous end")
-#    print "Inversion record IDs: (%d, %d)" % (record.simultaneous_start_id,
-#        record.id)
-#    print("Triggering Event IDs: (%d, %d)" %
-#        (record.simultaneous_start_triggering_event_id,
-#        record.triggering_event_id))
-#    print "Time: %d" % (record.job.simultaneous_end)
-#    # NOTE: Here, we assume nanoseconds as the time unit.
-#    # May have to be changed in the future.
-#    print "Duration: %f ms" % (
-#        float(record.job.simultaneous_end - record.job.simultaneous_start)/1000000)
-#    print "Job: %d.%d" % (record.job.pid,record.job.job)
-
+def _print_simultaneous_end(csize,record,irq_type):
+    print "Type: %s" % (irq_type+"Simultaneous end")
+    print "Inversion record IDs: (%d, %d)" % (record.simultaneous_start_id,
+        record.id)
+    print("Triggering Event IDs: (%d, %d)" %
+        (record.simultaneous_start_triggering_event_id,
+        record.triggering_event_id))
+    print "Time: %d" % (record.job.simultaneous_end)
+    # NOTE: Here, we assume nanoseconds as the time unit.
+    # May have to be changed in the future.
+    print "Duration: %f ms" % (
+        float(record.job.simultaneous_end - record.job.simultaneous_start)/1000000)
+    print "Job: %d.%d" % (record.job.pid,record.job.job)
+    print "Deadline: %d" % (record.job.deadline)
+    print "Cluster: %d" % (record.job.cluster)
+    print "Handling Klit thread: %d" % (record.job.exe_pid)
+    print "Off CPU: ",
+    for job in record.off_cpu:
+        if job.cluster==record.job.cluster :
+            print str(job) + " ",
+    print
+    print "On CPU: ",
+    for job in record.on_cpu:
+        if job.cluster==record.job.cluster :    
+            print str(job) + " ",
+    print #newline