summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMac Mollison <mollison@cs.unc.edu>2010-03-26 17:01:40 -0400
committerMac Mollison <mollison@cs.unc.edu>2010-03-26 17:01:40 -0400
commit0dbfae10940c1c44bcf741e0cd096b1bfb761dc9 (patch)
treeb80de1b480b8fd1a3494ce3f159ba1305e6ab82f
parented309ed19e2ba5d4172e886b496ca3c40c3d3634 (diff)
Minor improvement to inversion stats module
- Check and print error if G-EDF test not enabled - Clean up output
-rwxr-xr-xunit-trace7
-rw-r--r--unit_trace/gedf_inversion_stat_printer.py9
2 files changed, 8 insertions, 8 deletions
diff --git a/unit-trace b/unit-trace
index 81b6c02..a146874 100755
--- a/unit-trace
+++ b/unit-trace
@@ -110,7 +110,12 @@ if options.stdout is True:
110 110
111# Print G_EDF inversion statistics 111# Print G_EDF inversion statistics
112if options.num_inversions > -1: 112if options.num_inversions > -1:
113 gedf_inversion_stat_printer.gedf_inversion_stat_printer(stream2,options.num_inversions) 113 if options.gedf is not True:
114 import sys
115 sys.stderr.write("You must enable the G-EDF test module to print" +
116 " G-EDF inversion statistics\n")
117 else:
118 gedf_inversion_stat_printer.gedf_inversion_stat_printer(stream2,options.num_inversions)
114 119
115# Call visualizer 120# Call visualizer
116if options.visualize is True: 121if options.visualize is True:
diff --git a/unit_trace/gedf_inversion_stat_printer.py b/unit_trace/gedf_inversion_stat_printer.py
index c314389..42a16f0 100644
--- a/unit_trace/gedf_inversion_stat_printer.py
+++ b/unit_trace/gedf_inversion_stat_printer.py
@@ -29,6 +29,8 @@ def gedf_inversion_stat_printer(stream,num):
29 min_inversion = length 29 min_inversion = length
30 sum_inversions += length 30 sum_inversions += length
31 if len(longest_inversions) == num: 31 if len(longest_inversions) == num:
32 if num==0:
33 continue
32 si = longest_inversions[0] 34 si = longest_inversions[0]
33 if length > (si.job.inversion_end - 35 if length > (si.job.inversion_end -
34 si.job.inversion_start): 36 si.job.inversion_start):
@@ -65,13 +67,6 @@ def gedf_inversion_stat_printer(stream,num):
65 inv.job.inversion_end - inv.job.inversion_start) 67 inv.job.inversion_end - inv.job.inversion_start)
66 print "Job: %d.%d" % (inv.job.pid,inv.job.job) 68 print "Job: %d.%d" % (inv.job.pid,inv.job.job)
67 print "Deadline: %d" % (inv.job.deadline) 69 print "Deadline: %d" % (inv.job.deadline)
68 print "Eligible: ",
69 for job in inv.eligible:
70 print str(job) + " ",
71 print
72 print "On CPU: ",
73 for job in inv.on_cpu:
74 print str(job) + " ",
75 print "" 70 print ""
76 71
77 72