X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/0d9e2708eb788e26fb0bf0159cffeb5c803d7e3c..9f7f766a0e3ba735653da76c5564d3d182c12a6c:/gw-tests/genhtml/genhtml.py
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 558ef4b..8a94dc8 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -4,8 +4,16 @@ import os;
import dircache;
import sys;
import urllib
+import traceback
-class DimValue:
+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)
def __init__(self, dim, value):
self.dim = dim
self.value = value
@@ -50,16 +58,15 @@ class Dimension(dict):
def getValue(self, index):
return self[self.sortedKeys[index]]
- def addValue(self, *values):
- for value in values:
- if value not in self:
- if isinstance(value, DimValue):
- self[value.value] = value
- else:
- raise Exception("Unsupported usage of addValue")
- #self[value] = DimValue(self, value)
- self.sortedKeys = self.keys()
- self.sortedKeys.sort()
+ def addValue(self, value):
+ if value not in self:
+ if isinstance(value, DimValue):
+ self[value.value] = value
+ else:
+ raise Exception("Unsupported usage of addValue")
+ #self[value] = DimValue(self, value)
+ self.sortedKeys = self.keys()
+ self.sortedKeys.sort()
def val2str(self, v):
return str(v)
def htmlTableHeading(self, v):
@@ -122,15 +129,16 @@ class DimensionTraffic(Dimension):
return v
def htmlTableHeading(self, v):
return self.val2str(v)
-class Test:
+class Test(object):
@classmethod
def isOnPath(cls, path):
f = os.path.join(path, '.results')
return os.path.isfile(f)
- def __init__(self, path, values):
+ def __init__(self, path, values, tests=None):
self.path = path
self.name = os.path.basename(path)
self.values = values
+ self.tests = tests
def printThumbLink(self, file):
thumb = self.path+'/thumb'
try:
@@ -141,39 +149,39 @@ class Test:
print >>file, "" % \
(urllib.quote(self.path), urllib.quote(self.path), img)
def generateHtml(self):
- html = open(os.path.join(path, 'results.html'), "w")
+ html = open(os.path.join(self.path, 'results.html'), "w")
+ title = "CAN gateway timing analysis"
+ cdup = "../"*len(self.values)
print >> html, """
%s
-
+
-
%s
""" % (title, title)
- params = ["%s %s" % (v.dim, v) for v in self.vals]
- print >>html, "Results for:", ", ".join(params), ""
- for d in self.dimOther:
- print >>html, "%s: " % d
- print >>html, "X axis, " % \
- Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
- print >>html, "Y axis; " % \
- Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
+
%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
"
+ for d in self.tests.space:
links = []
- for v in d.values():
- if v in self.valsOther:
+ for v in d:
+ if v in self.values:
+ print "XXX", repr(v)
links.append(str(v))
else:
- vv = DimValues(self.valsOther)
+ vv = DimValues(self.values)
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
+ href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
+ links.append("%s"%(href, str(v)))
+ print >>html, "%s: " % d, " | ".join(links), " "
+ print >>html, "
"
+ print >>html, "" % (self.name+".png")
+ print >>html, "Raw data "
+ print >>html, "Script source " % (cdup+self.name+".sh.html")
+ print >>html, "Back to top " % cdup
html.close()
@@ -181,6 +189,15 @@ class Space(list):
"""List of Dimensions()s (order matters)"""
def __init__(self, *dimensions):
self.extend(list(dimensions))
+ def path2dimValues(self, path):
+ coordinates = path.split("/")
+ if len(coordinates) != len(self):
+ raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates))
+
+ dv = DimValues([DimValue(self[i], coordinates[i]) \
+ for i in xrange(len(coordinates))])
+ return dv
+
def iterValues(self):
idx = [0 for i in xrange(len(self))]
done=False
@@ -233,19 +250,18 @@ class Tests(dict):
def populate(self, rootpath):
for root, dirs, files in os.walk(rootpath):
if (root.find(rootpath) == 0):
- coordinates = root[len(rootpath):].split("/")
+ path = root[len(rootpath):]
else:
- coordinates = rootpath.split("/")
+ path = rootpath
if Test.isOnPath(root):
- if len(coordinates) != len(self.space):
- raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates))
- dv = DimValues([DimValue(self.space[i], coordinates[i]) for i in xrange(len(coordinates))])
- self.addTest(Test(root, dv))
+ dv = self.space.path2dimValues(path)
+ self.addTest(Test(root, dv, self))
def generateHtml(self):
for pair in self.space.iterDimensionPairs():
remDims = Space(*tuple([d for d in self.space.iterRemainingDimensions(pair)]))
for vals in remDims.iterValues():
page = Page(pair, vals, self)
+ print page.getName()
page.generate()
try:
os.remove("index.html")
@@ -259,10 +275,13 @@ h4 { margin: 0; }
.box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
"""
css.close()
+ for test in self.values():
+ print test.path
+ test.generateHtml()
- #os.system("source-highlight -d --output-dir=. ../*.sh")
+ os.system("source-highlight -d --output-dir=. ../*.sh > /dev/null")
-class Page:
+class Page(object):
def __init__(self, dimPair, valsOther, tests):
self.dimy, self.dimx = dimPair
self.dimOther = [v.dim for v in valsOther]
@@ -293,7 +312,7 @@ class Page:
print >>html, "Y axis; " % \
Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
links = []
- for v in d.values():
+ for v in d:
if v in self.valsOther:
links.append(str(v))
else: