X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/8340d0e1199ab3ce2750d2d705b34c7a70f589a2..9f7f766a0e3ba735653da76c5564d3d182c12a6c:/gw-tests/genhtml/genhtml.py
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 1ba9f7f..8a94dc8 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -4,15 +4,24 @@ 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
+ self.dim.addValue(self)
def __str__(self):
return self.dim.val2str(self.value)
def __repr__(self):
- return "DimValue("+str(self.dim.__class__.__name__) + ", "+repr(self.value)+")"
+ return "DimValue(%s, %s)" % (repr(self.dim), repr(self.value))
def htmlTableHeading(self):
return self.dim.htmlTableHeading(self.value)
@@ -22,7 +31,9 @@ class DimValues(list):
if self[i].dim == val.dim:
self[i] = val
def __add__(self, val):
- return DimValues(self).append(val)
+ ret = DimValues(self)
+ ret.append(val)
+ return ret
def __sub__(self, dim):
result = DimValues(self)
for v in self:
@@ -47,12 +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:
- 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):
@@ -115,14 +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):
+ 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:
@@ -130,13 +146,58 @@ class Test:
except OSError:
imgs = [ self.name + ".png" ]
for img in imgs:
- print >>file, "" % \
- (urllib.quote(self.path), img, urllib.quote(self.path), img)
+ print >>file, "" % \
+ (urllib.quote(self.path), urllib.quote(self.path), img)
+ def generateHtml(self):
+ html = open(os.path.join(self.path, 'results.html'), "w")
+ title = "CAN gateway timing analysis"
+ cdup = "../"*len(self.values)
+ print >> html, """
+
+
+
+%s
+
+
+
+%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:
+ if v in self.values:
+ print "XXX", repr(v)
+ links.append(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), "
"
+
+ 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()
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
@@ -183,44 +244,52 @@ class Tests(dict):
realkey = self.space.reorder(key)
return self[realkey.key()]
- def addTest(self, test, coordinates):
- if len(coordinates) != len(self.space):
- raise KeyError("The number coordinates do not match the number of dimensions: " + str(coordinates))
- self[tuple(coordinates)] = test
- for i in xrange(len(coordinates)):
- self.space[i].addValue(coordinates[i])
-
+ def addTest(self, test):
+ self[test.values.key()] = test
+
def populate(self, rootpath):
for root, dirs, files in os.walk(rootpath):
if (root.find(rootpath) == 0):
- coordinates = root[len(rootpath):]
+ path = root[len(rootpath):]
else:
- coordinates = rootpath
+ path = rootpath
if Test.isOnPath(root):
- self.addTest(Test(root), coordinates.split("/"))
+ 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, remDims, vals, self)
+ page = Page(pair, vals, self)
+ print page.getName()
page.generate()
try:
os.remove("index.html")
except OSError: pass
os.symlink(page.getName(), "index.html")
+ css = open("style.css", "w")
+ print >>css, """img { border: 0; }
+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}
+"""
+ 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:
- def __init__(self, dimPair, dimOther, valsOther, tests):
+class Page(object):
+ def __init__(self, dimPair, valsOther, tests):
self.dimy, self.dimx = dimPair
- self.dimOther = dimOther
- self.valsOther = valsOther
+ self.dimOther = [v.dim for v in valsOther]
+ self.valsOther = tests.space.reorder(valsOther)
self.tests = tests
- def getName(self, dimy=None, dimx=None, valsOther=None):
- return "%s-vs-%s-for-%s.html"%(dimx or self.dimy.type,
- dimy or self.dimx.type,
- "-".join([v.value for v in valsOther or self.valsOther]))
+ def getName(self):
+ return "%s-vs-%s-for-%s.html"%(self.dimy.type, self.dimx.type,
+ "-".join([v.value for v in self.valsOther]))
def generate(self):
html = open(self.getName(), "w")
title = "CAN gateway timing analysis"
@@ -229,36 +298,34 @@ class Page:
%s
-
+
%s
""" % (title, title)
params = ["%s %s" % (v.dim, v) for v in self.valsOther]
- print >>html, "Results for:", ", ".join(params), "
"
+ print >>html, "Results for ", ", ".join(params), "
"
+ print >>html, "Other views
"
for d in self.dimOther:
print >>html, "%s: " % d
print >>html, "
X axis, " % \
- self.getName(dimx=d,
- valsOther=self.valsOther - d + self.dimx.getValue(0))
- print >>html, "
Y axis; " % self.getName(dimy=d)
+ 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()
links = []
- for v in d.values():
+ for v in d:
if v in self.valsOther:
links.append(str(v))
else:
vv = DimValues(self.valsOther)
vv.replace(v)
- links.append("
%s"%(urllib.quote(self.getName(valsOther=vv)), str(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, "
"
print >>html, "%s → %s ↓ | " % (self.dimx.name, self.dimy.name)
for x in self.dimx: