X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/5771218ca1808e1c07e4013493e454f5a694a428..8340d0e1199ab3ce2750d2d705b34c7a70f589a2:/gw-tests/genhtml/genhtml.py

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 70e918f..1ba9f7f 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -9,10 +9,28 @@ class DimValue:
     def __init__(self, dim, value):
 	self.dim = dim
 	self.value = value
+    def __str__(self):
+        return self.dim.val2str(self.value)
     def __repr__(self):
-	return repr(self.value)
-    def htmlLabel(self):
-	return self.dim.htmlLabel(self.value)
+	return "DimValue("+str(self.dim.__class__.__name__) + ", "+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):
+        return DimValues(self).append(val)
+    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):
@@ -21,24 +39,33 @@ 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]
+	for i in xrange(len(self)):
+	    yield self.getValue(i)
+    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)
-    def htmlLabel(self, v):
-	return v
+	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 "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
@@ -53,10 +80,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
@@ -71,66 +100,95 @@ class DimensionHostKern(Dimension):
 class DimensionTest(Dimension):
     def __init__(self):
 	Dimension.__init__(self, 'test', 'Test')
-    def htmlLabel(self, v):
+    def htmlTableHeading(self, v):
 	return v+"<br><a href='%s.sh.html'>source</a>"%(urllib.quote(v))
 
 class DimensionTraffic(Dimension):
     def __init__(self):
 	Dimension.__init__(self, 'traf', 'Traffic')
-    def htmlLabel(self, v):
-	return v
-
+    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:
     @classmethod
     def isOnPath(cls, path):
-	f = os.path.join(path, 'plot.gp')
+	f = os.path.join(path, '.results')
 	return os.path.isfile(f)
     def __init__(self, path):
 	self.path = path
+        self.name = os.path.basename(path)
     def printThumbLink(self, file):
-	for img in dircache.listdir(self.path+'/thumb'):
-	    print >>file, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % \
-		(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=[]
-	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
+        thumb = self.path+'/thumb'
+        try:
+            imgs = [img for img in dircache.listdir(thumb)]
+        except OSError:
+            imgs = [ self.name + ".png" ]
+        for img in imgs:
+            print >>file, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % \
+                  (urllib.quote(self.path), img, urllib.quote(self.path), img)
+
+class Space(list):
+    """List of Dimensions()s (order matters)"""
+    def __init__(self, *dimensions):
+        self.extend(list(dimensions))
+    def iterValues(self):
+        idx = [0 for i in xrange(len(self))]
+        done=False
+        while not done:
+            values=DimValues()
+            for i in xrange(len(self)):
+                values.append(self[i].values()[idx[i]])
+            yield values
+            done=True
+            for i in xrange(len(self)):
+                idx[i] += 1
+                if idx[i] < len(self[i]):
+                    done=False
+                    break
+                idx[i] = 0
+    def reorder(self, dimValues):
+        reordered = DimValues()
+        for d in self:
+	    for v in dimValues:
+		if v.dim == d:
+		    reordered.append(v)
+        return reordered
+    def iterDimensionPairs(self):
+	for i in xrange(len(self)):
+	    for j in xrange(i+1, len(self)):
+		yield (self[i], self[j])
+		yield (self[j], self[i])
+    def iterRemainingDimensions(self, dimensionPair):
+	for d in self:
+	    if d not in dimensionPair:
+		yield d
+
 
 class Tests(dict):
     """Represents all tests organized along several dimensions"""
-    def __init__(self, rootpath, *dimensions):
+    def __init__(self, rootpath, space):
 	dict.__init__(self)
-	self.dimensions = dimensions
+	self.space = space
 	if (rootpath):
 	    self.populate(rootpath)
     def getTest(self, key):
-	realkey=[]
-	for d in self.dimensions:
-	    for i in key:
-		if i.dim == d:
-		    realkey.append(i.value)
-	if len(realkey) != len(self.dimensions):
-	    raise KeyError("The coordinates in key do not match dimensions")
-	return self[tuple(realkey)]
+	if len(key) != len(self.space):
+	    raise KeyError("The coordinates in key do not match the dimension of the space")
+        realkey = self.space.reorder(key)
+	return self[realkey.key()]
 
     def addTest(self, test, coordinates):
-	if len(coordinates) != len(self.dimensions):
+	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.dimensions[i].addValue(coordinates[i])
+	    self.space[i].addValue(coordinates[i])
 
     def populate(self, rootpath):
 	for root, dirs, files in os.walk(rootpath):
@@ -140,27 +198,18 @@ class Tests(dict):
 		coordinates = rootpath
 	    if Test.isOnPath(root):
 		self.addTest(Test(root), coordinates.split("/"))
-    def iterDimensionPairs(self):
-	for i in xrange(len(self.dimensions)):
-	    for j in xrange(i+1, len(self.dimensions)):
-		yield (self.dimensions[i], self.dimensions[j])
-		yield (self.dimensions[j], self.dimensions[i])
-    def iterRemainingDimensions(self, dimensionPair):
-	for d in self.dimensions:
-	    if d not in dimensionPair:
-		yield d
     def generateHtml(self):
-	for pair in self.iterDimensionPairs():
-	    remdims = [d for d in self.iterRemainingDimensions(pair)]
-	    for vals in iterDimValues(remdims):
-		page = Page(pair, remdims, vals, 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.generate()
 	try:
 	    os.remove("index.html")
 	except OSError: pass
 	os.symlink(page.getName(), "index.html")
 
-	os.system("source-highlight -d --output-dir=. ../*.sh")
+	#os.system("source-highlight -d --output-dir=. ../*.sh")
 
 class Page:
     def __init__(self, dimPair, dimOther, valsOther, tests):
@@ -168,13 +217,16 @@ class Page:
 	self.dimOther = dimOther
 	self.valsOther = valsOther
 	self.tests = tests
-    def getName(self):
-	return "%s-vs-%s-%s.html"%(self.dimy.type, self.dimx.type, "-".join([v.value for v in self.valsOther]))
+    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 generate(self):
 	html = open(self.getName(), "w")
-	title = "CAN gateway timing analysis" + ", ".join([v.dim.name+" "+v.value for v in self.valsOther])
-	print >> html, """<html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	title = "CAN gateway timing analysis" 
+	print >> html, """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>%s</title>
 <style>
@@ -185,31 +237,46 @@ th, td { border: 1px solid lightgray; padding: 4px;}
 </head>
 <body>
 <h1>%s</h1>"""  % (title, title)
+        params = ["%s %s" % (v.dim, v) for v in self.valsOther]
+        print >>html, "Results for:", ", ".join(params), "<hr />"
 	for d in self.dimOther:
-	    pass
-#             print >>html, "View for %s: " % str(ps.pageclass.name)
-#             for v in ps.values:
-#                 print >>html, "<a href='%s-%s.html'>%s</a> | "%(ps.values.type, urllib.quote(v), v)
-#             print >>html, "<br>"
-#             try:
-#                 print >>html, d.htmlPreamble()
-#             except Exception:
-#                 pass
-
-	print >>html, "<table><thead><tr><td> </td>"
+            print >>html, "%s: " % d
+            print >>html, "<a href='%s'>X axis</a>, " % \
+                self.getName(dimx=d,
+                             valsOther=self.valsOther - d + self.dimx.getValue(0))
+            print >>html, "<a href='%s'>Y axis</a>;&nbsp;&nbsp;" % self.getName(dimy=d)
+            links = []
+            for v in d.values():
+                if v in self.valsOther:
+                    links.append(str(v))
+                else:
+                    vv = DimValues(self.valsOther)
+                    vv.replace(v)
+                    links.append("<a href='%s'>%s</a>"%(urllib.quote(self.getName(valsOther=vv)), str(v)))
+            print >>html, " | ".join(links)
+            print >>html, "<br>"
+            try:
+                print >>html, d.htmlPreamble()
+            except Exception:
+                pass
+
+	print >>html, "<table><thead><tr><td>%s &rarr; <br />%s &darr;</td>" % (self.dimx.name, self.dimy.name)
 	for x in self.dimx:
-	    print >>html, "<th>%s</th>" % x.htmlLabel()
+	    print >>html, "<th>%s</th>" % x.htmlTableHeading()
 	print >>html, "</tr></thead>"
 	for y in self.dimy:
-	    print >>html, "<tr><th>%s</th>" % y.htmlLabel()
+	    print >>html, "<tr><th>%s</th>" % y.htmlTableHeading()
 
 	    for x in self.dimx:
 		print >>html, "<td>"
 		idx = [x,y]
 		idx.extend(self.valsOther)
-		test = tests.getTest(idx)
-		test.printThumbLink(html)
-		print >>html, "</td>"
+                try:
+                    test = tests.getTest(idx)
+                    test.printThumbLink(html)
+                except KeyError:
+                    print >>html, "N/A"
+                print >>html, "</td>"
 	    print >>html, "</tr>"
 	print >> html, """
 </table>
@@ -220,6 +287,7 @@ th, td { border: 1px solid lightgray; padding: 4px;}
 
 if __name__ == "__main__":
     os.chdir(sys.argv[1])
-    tests = Tests("./", DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest())
+    os.system("rm *.html")
+    tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest()))
     tests.generateHtml()
     sys.exit(0)