X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/d152c417dc3872185bdab7cccf00982831d87e9b..9f7f766a0e3ba735653da76c5564d3d182c12a6c:/gw-tests/genhtml/genhtml.py
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 3bc059c..8a94dc8 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -4,23 +4,44 @@ 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 str(self.value)
+ return self.dim.val2str(self.value)
def __repr__(self):
- return repr(self.value)
- def htmlLabel(self):
- return self.dim.htmlLabel(self.value)
+ return "DimValue(%s, %s)" % (repr(self.dim), repr(self.value))
+ def htmlTableHeading(self):
+ return self.dim.htmlTableHeading(self.value)
class DimValues(list):
def replace(self, val):
for i in xrange(len(self)):
if self[i].dim == val.dim:
self[i] = val
+ def __add__(self, val):
+ ret = DimValues(self)
+ ret.append(val)
+ return ret
+ def __sub__(self, dim):
+ result = DimValues(self)
+ for v in self:
+ if v.dim == dim:
+ result.remove(v)
+ return result
+ def key(self):
+ return tuple([v.value for v in self])
class Dimension(dict):
def __init__(self, atype, name=None):
@@ -29,28 +50,36 @@ class Dimension(dict):
self.name = name
else:
self.name = atype
+ self.sortedKeys = []
def __iter__(self):
- keys = self.keys()
- keys.sort()
- for k in keys:
- yield self[k]
-
- def addValue(self, *values):
- for value in values:
- if value not in self:
- self[value] = DimValue(self, value)
- def htmlLabel(self, v):
- return v
+ for i in xrange(len(self)):
+ yield self.getValue(i)
+ def getValue(self, index):
+ return self[self.sortedKeys[index]]
+
+ 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):
+ return self.val2str(v)
def __str__(self):
return self.name
def __repr__(self):
- return self.type
+ return "Dimension(%s)"%self.type
class DimensionKern(Dimension):
def __init__(self):
Dimension.__init__(self, 'gwkern', 'GW kernel')
- def htmlLabel(self, v):
+ def htmlTableHeading(self, v):
i=v.find(":")
if i>0: kver=v[:i]
else: kver=v
@@ -65,10 +94,12 @@ class DimensionKern(Dimension):
class DimensionHostKern(Dimension):
def __init__(self):
Dimension.__init__(self, 'hostkern', 'Host kernel')
- def htmlLabel(self, v):
+ def val2str(self, v):
if v.find("host-") == 0:
v = v[5:]
- # TODO: remove host- prefix
+ return v
+ def htmlTableHeading(self, v):
+ v = self.val2str(v)
i = v.find(":")
if i>0: kver = v[:i]
else: kver = v
@@ -83,108 +114,182 @@ class DimensionHostKern(Dimension):
class DimensionTest(Dimension):
def __init__(self):
Dimension.__init__(self, 'test', 'Test')
- def htmlLabel(self, v):
+ def htmlTableHeading(self, v):
return v+"
source"%(urllib.quote(v))
class DimensionTraffic(Dimension):
def __init__(self):
Dimension.__init__(self, 'traf', 'Traffic')
- def htmlLabel(self, v):
- return v
-
-class Test:
+ def val2str(self, v):
+ if v == "50":
+ return "50%"
+ elif v == "oneatatime":
+ return "one message at a time"
+ else:
+ return v
+ def htmlTableHeading(self, v):
+ return self.val2str(v)
+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'
- for img in dircache.listdir(thumb):
- print >>file, "" % \
- (urllib.quote(self.path), img, urllib.quote(self.path), img)
-
-def iterDimValues(dimensions):
- idx = [0 for i in xrange(len(dimensions))]
- done=False
- while not done:
- values=DimValues()
- for i in xrange(len(dimensions)):
- values.append(dimensions[i].values()[idx[i]])
- yield values
- done=True
- for i in xrange(len(dimensions)):
- idx[i] += 1
- if idx[i] < len(dimensions[i]):
- done=False
- break
- idx[i] = 0
+ try:
+ imgs = [img for img in dircache.listdir(thumb)]
+ except OSError:
+ imgs = [ self.name + ".png" ]
+ for img in imgs:
+ 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, """
+
+
" + print >>html, " |
%s → %s ↓ | " % (self.dimx.name, self.dimy.name)
for x in self.dimx:
- print >>html, "%s | " % x.htmlLabel() + print >>html, "%s | " % x.htmlTableHeading() print >>html, "
---|---|---|
%s | " % y.htmlLabel() + print >>html, "||
%s | " % y.htmlTableHeading() for x in self.dimx: print >>html, "" @@ -231,10 +340,7 @@ th, td { border: 1px solid lightgray; padding: 4px;} idx.extend(self.valsOther) try: test = tests.getTest(idx) - try: - test.printThumbLink(html) - except OSError: - print >>html, "No thumbnail :-(" + test.printThumbLink(html) except KeyError: print >>html, "N/A" print >>html, " | " @@ -249,6 +355,6 @@ th, td { border: 1px solid lightgray; padding: 4px;} if __name__ == "__main__": os.chdir(sys.argv[1]) os.system("rm *.html") - tests = Tests("./", DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest()) + tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest())) tests.generateHtml() sys.exit(0)