X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/151cc32b933d28ddbd15d5ce264d12805a169f01..a4463e1ce99295ad665b9e45bb911e6e9f672ebb:/gw-tests/genhtml/genhtml.py
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 3dbb4f0..94ca00e 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -5,15 +5,14 @@ import dircache;
import sys;
import urllib
import traceback
+import glob
class DimValue(object):
def __new__(cls, dim, value):
if value in dim:
- print "OLD", value
return dim[value]
else:
- print "NEW", value
- return super(DimValue, cls).__new__(cls, dim, value)
+ return super(DimValue, cls).__new__(cls)
def __init__(self, dim, value):
self.dim = dim
self.value = value
@@ -136,7 +135,7 @@ class DimensionTraffic(Dimension):
class Test(object):
@classmethod
def isOnPath(cls, path):
- f = os.path.join(path, '.results')
+ f = os.path.join(path, 'plot.sh')
return os.path.isfile(f)
def __init__(self, path, values, tests=None):
self.path = path
@@ -144,14 +143,39 @@ class Test(object):
self.values = values
self.tests = tests
def printThumbLink(self, file):
- thumb = self.path+'/thumb'
- try:
- imgs = [img for img in dircache.listdir(thumb)]
- except OSError:
- imgs = [ self.name + ".png" ]
+# try:
+# imgs = [img for img in dircache.listdir(thumb)]
+# except OSError:
+# imgs = [ self.name + ".png" ]
+ imgs = [ 'tgraph.png' ]
for img in imgs:
- print >>file, "" % \
+ print >>file, "" % \
(urllib.quote(self.path), urllib.quote(self.path), img)
+ def fullImgLink(self, pngName):
+ return "
" % \
+ (pngName[:-4]+".pdf", pngName)
+
+ def htmlPrintStats(self, html):
+ cwd = os.getcwd()
+ os.chdir(self.path)
+ stats = glob.glob("*-stat.txt")
+ print >>html, "Statistics
"
+ print >>html, ""
+ stats.sort()
+ for i in stats:
+ lines = open(i).readlines()
+ def fixupLine(l):
+ comment = l.find("#")
+ if comment >= 0:
+ l = l[:comment-1]
+ if l.find("cmdline=") == 0:
+ l = "cmdline=..." % str(l[8:])
+ return l
+ lines = [fixupLine(l) for l in lines]
+ print >>html, "%s%s | " % (i, "
".join(lines))
+ print >>html, "
"
+ os.chdir(cwd)
+
def generateHtml(self):
html = open(os.path.join(self.path, 'results.html'), "w")
title = "CAN gateway timing analysis"
@@ -167,25 +191,38 @@ class Test(object):
%s
""" % (title, cdup, title)
params = ["%s %s" % (v.dim, v) for v in self.values]
print >>html, "Results for:", ", ".join(params)
- print >>html, "Other results
"
+ print >>html, "
Other results
"
for d in self.tests.space:
links = []
for v in d:
if v in self.values:
- links.append(str(v))
+ links.append("%s"%str(v))
else:
vv = DimValues(self.values)
vv.replace(v)
- href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
- links.append("%s"%(href, str(v)))
- print >>html, "%s: " % d, " | ".join(links), "
"
+ try:
+ href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
+ links.append("%s"%(href, str(v)))
+ except KeyError:
+ links.append("%s"%str(v))
+ print >>html, "%s | " % d, " ".join(links), " |
"
- print >>html, ""
- print >>html, "" % (self.name+".png")
+ print >>html, "
"
+ print >>html, self.fullImgLink("graph.png")
+ self.htmlPrintStats(html)
+ cwd = os.getcwd()
+ os.chdir(self.path)
+ additionalImgs = glob.glob("graph?*.png")
+ if additionalImgs: print >>html, "
Additional graphs
"
+ for i in additionalImgs:
+ print >>html, self.fullImgLink(i)
+ os.chdir(cwd)
+
+ print >>html, "
"
print >>html, "
Raw data"
print >>html, "
Script source" % (cdup+self.name+".sh.html")
print >>html, "
Back to top" % cdup
-
+
html.close()
class Space(list):
@@ -275,7 +312,12 @@ class Tests(dict):
table { border-collapse: collapse; }
th, td { border: 1px solid lightgray; padding: 4px;}
h4 { margin: 0; }
-.box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
+.otherview { margin: 1ex 0}
+.otherview .value { color: black; padding: 0ex 1ex; -moz-border-radius: 1ex; border-radius: 1ex;}
+.otherview .value a { color: inherit; text-decoration: none; }
+.otherview .other:hover { background: #eee; }
+.otherview .missing { color: gray; }
+.otherview .current { background: #ccc; }
"""
css.close()
for test in self.values():
@@ -307,28 +349,26 @@ class Page(object):
%s
""" % (title, title)
params = ["%s %s" % (v.dim, v) for v in self.valsOther]
print >>html, "
Results for ", ", ".join(params), "
"
- print >>html, "
Other views
"
+ print >>html, "
Other views
"
+ print >>html, "
"
for d in self.dimOther:
- print >>html, "%s: " % d
- print >>html, "X axis, " % \
+ print >>html, "%s | " % d
+ print >>html, "→ " % \
Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
- print >>html, "Y axis; " % \
+ print >>html, "↓ | " % \
Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
links = []
+ print >>html, ""
for v in d:
if v in self.valsOther:
- links.append(str(v))
+ links.append("%s"%str(v))
else:
vv = DimValues(self.valsOther)
vv.replace(v)
- links.append("%s"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
- print >>html, " | ".join(links)
- print >>html, " "
- try:
- print >>html, d.htmlPreamble()
- except Exception:
- pass
- print >>html, ""
+ links.append("%s"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
+ print >>html, " ".join(links)
+ print >>html, " |
"
+ print >>html, "
"
print >>html, "
%s → %s ↓ | " % (self.dimx.name, self.dimy.name)
for x in self.dimx: