X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/1ed5a652b9a7a2379d2eee072eaa38a9db6f005d..606fa78f2b870a5a55e2763d398d70298d2f7d21:/gw-tests/genhtml/genhtml.py

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
old mode 100644
new mode 100755
index 3a90ab5..76eee7b
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -1,158 +1,239 @@
 #!/usr/bin/env python
-
+# -*- coding: utf-8 -*-
 import os;
 import dircache;
 import sys;
 import urllib
 
-if __name__ == "__main__":
-    os.chdir(sys.argv[1])
-else:
-    from wvtest import *
-
 class DimValue:
     def __init__(self, dim, value):
-        self.dim = dim
-        self.value = value
+	self.dim = dim
+	self.value = value
+        self.dim.addValue(self)
+    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(%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):
-        self.type = atype
-        if (name):
-            self.name = name
-        else:
-            self.name = atype            
+	self.type = atype
+	if (name):
+	    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
-
-@wvtest
-def Dimension_and_DimValue():
-    d = Dimension('kern', 'Kernel')
-    d.addValue('2.6.31')
-    d.addValue('2.6.30')
-    l=[]
-    for v in d:
-        WVPASSEQ(v.__class__, DimValue)
-        l.append(v.value)
-    lsorted = ['2.6.30', '2.6.31']
-    WVPASSEQ(l, lsorted)
-    WVPASSEQ(v.htmlLabel(), '2.6.31')
-    WVPASSEQ(d['2.6.31'].value, '2.6.31')
-    
+	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 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, 'kern', 'Kernel')
-    def htmlLabel(self, v):
-        i=v.find(":")
-        if i>0: kver=v[:i]
-        else: kver=v
-        return v+"<br><a href='config-%s'>config</a>"%(urllib.quote(kver))
+	Dimension.__init__(self, 'gwkern', 'GW kernel')
+    def htmlTableHeading(self, v):
+	i=v.find(":")
+	if i>0: kver=v[:i]
+	else: kver=v
+	return v+"<br><a href='config-%s'>config</a>"%(urllib.quote(kver))
+    def versions(self):
+	for v in self.values:
+	    i=v.find(":")
+	    if i>0: kver=v[:i]
+	    else: kver=v
+	    yield kver
+
+class DimensionHostKern(Dimension):
+    def __init__(self):
+	Dimension.__init__(self, 'hostkern', 'Host kernel')
+    def val2str(self, v):
+        if v.find("host-") == 0:
+            v = v[5:]
+        return v
+    def htmlTableHeading(self, v):
+        v = self.val2str(v)
+	i = v.find(":")
+	if i>0: kver = v[:i]
+        else: kver = v
+	return v+"<br><a href='config-%s'>config</a>"%(urllib.quote(kver))
     def versions(self):
-        for v in self.values:
-            i=v.find(":")
-            if i>0: kver=v[:i]
-            else: kver=v
-            yield kver
-        
+	for v in self.values:
+	    i=v.find(":")
+	    if i>0: kver=v[:i]
+	    else: kver=v
+	    yield kver
+
 class DimensionTest(Dimension):
     def __init__(self):
-        Dimension.__init__(self, 'test', 'Test')
-    def htmlLabel(self, v):
-        return v+"<br><a href='%s.sh.html'>source</a>"%(urllib.quote(v))
+	Dimension.__init__(self, 'test', 'Test')
+    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 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')
-        return os.path.isfile(f)
+	f = os.path.join(path, '.results')
+	return os.path.isfile(f)
     def __init__(self, path):
-        self.path = path
+	self.path = path
+        self.name = os.path.basename(path)
+    def printThumbLink(self, file):
+        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
 
-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
 
 class Tests(dict):
     """Represents all tests organized along several dimensions"""
-    def __init__(self, rootpath, *dimensions):
-        dict.__init__(self)
-        self.dimensions = dimensions
-        if (rootpath):
-            self.populate(rootpath)
+    def __init__(self, rootpath, space):
+	dict.__init__(self)
+	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):
-            raise KeyError("The number coordinates do not match the number of dimensions")
-        self[tuple(coordinates)] = test
-        for i in xrange(len(coordinates)):
-            self.dimensions[i].addValue(coordinates[i])
+	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)):
+            DimValue(self.space[i], coordinates[i])
 
     def populate(self, rootpath):
-        for root, dirs, files in os.walk(rootpath):
-            if (root.find(rootpath) == 0):
-                coordinates = root[len(rootpath):]
-            else:
-                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
+	for root, dirs, files in os.walk(rootpath):
+	    if (root.find(rootpath) == 0):
+		coordinates = root[len(rootpath):]
+	    else:
+		coordinates = rootpath
+	    if Test.isOnPath(root):
+		self.addTest(Test(root), coordinates.split("/"))
     def generateHtml(self):
-        for pair in self.iterDimensionPairs():
-            remdims = self.iterRemainingDimensions(pair)
-            for vals in iterDimValues(remdims):
-                self.generatePage(pair, remdims, vals)
-
-    def generatePage(self, dimpair, dimother, valsother):
-        dimy, dimx = dimpair
-        html = open("%s-vs-%s-%s.html"%(dimy.type, dimx.type, "-".join([v.value for v in valsother])), "w")
-        title = "CAN gateway benchmark for " + ", ".join([v.dim.name+" "+v.value for v in valsother])
-        print >> html, """<html>
+	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)
+		page.generate()
+	try:
+	    os.remove("index.html")
+	except OSError: pass
+	os.symlink(page.getName(), "index.html")
+
+	#os.system("source-highlight -d --output-dir=. ../*.sh")
+
+class Page:
+    def __init__(self, dimPair, valsOther, tests):
+	self.dimy, self.dimx = dimPair
+	self.dimOther = [v.dim for v in valsOther]
+	self.valsOther = tests.space.reorder(valsOther)
+	self.tests = tests
+    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" 
+	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>
 img { border: 0; }
@@ -162,146 +243,57 @@ th, td { border: 1px solid lightgray; padding: 4px;}
 </head>
 <body>
 <h1>%s</h1>"""  % (title, title)
-        for d in 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>"
-        for x in dimx.values():
-            print >>html, "<th>%s</th>" % x.htmlLabel()
-        print >>html, "</tr></thead>"
-        for y in dimy.values():
-            print >>html, "<tr><th>%s</th>" % y.htmlLabel()
-
-            for x in dimx.values():
-                print >>html, "<td>"
-                idx = valsother
-                idx.extend([x,y])
-                test = self.getTest(idx)
-                
-                d="by-%s/%s/%s/%s/" % (self.prefix, self.value, y, x)
-                dthumb = d+"thumb"
+        params = ["%s %s" % (v.dim, v) for v in self.valsOther]
+        print >>html, "Results for:", ", ".join(params), "<hr />"
+	for d in self.dimOther:
+            print >>html, "%s: " % d
+            print >>html, "<a href='%s'>X axis</a>, " % \
+                Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
+            print >>html, "<a href='%s'>Y axis</a>;&nbsp;&nbsp;" % \
+                Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
+            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(Page((self.dimy, self.dimx), vv, self.tests).getName()), 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.htmlTableHeading()
+	print >>html, "</tr></thead>"
+	for y in self.dimy:
+	    print >>html, "<tr><th>%s</th>" % y.htmlTableHeading()
+
+	    for x in self.dimx:
+		print >>html, "<td>"
+		idx = [x,y]
+		idx.extend(self.valsOther)
                 try:
-                    for img in dircache.listdir(dthumb):
-                        print >>html, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % (urllib.quote(d), img, urllib.quote(d), img)
-                except OSError:
-                    print "warning: no images in %s?"%dthumb
+                    test = tests.getTest(idx)
+                    test.printThumbLink(html)
+                except KeyError:
+                    print >>html, "N/A"
                 print >>html, "</td>"
-            print >>html, "</tr>"
-        print >> html, """
+	    print >>html, "</tr>"
+	print >> html, """
 </table>
+<div style="font-size: small; color: gray; margin-top: 1em;">Authors: Michal Sojka, Pavel Píša, Copyright © 2010 Czech Technical University in Prague</div>
 </body>
 """
 
-@wvtest                
-def Two_Dimensions_in_Tests():
-    t = Tests(None, DimensionTest(), DimensionKern())
-    WVPASSEQ([(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()],
-             [('DimensionTest', 'DimensionKern'), ('DimensionKern', 'DimensionTest')])
-@wvtest                
-def Three_Dimensions_in_Tests():
-    dt = DimensionTest()
-    dk = DimensionKern()
-    dd = Dimension('tmp', "Tmp")
-    t = Tests(None, dt, dk, dd)
-    pairs = [(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()]
-    WVPASSEQ(pairs[0], ('DimensionTest', 'DimensionKern'))
-    WVPASSEQ(pairs[1], ('DimensionKern', 'DimensionTest'))
-    WVPASSEQ(pairs[2], ('DimensionTest', 'Dimension'))
-    WVPASSEQ(pairs[3], ('Dimension', 'DimensionTest'))
-    WVPASSEQ(pairs[4], ('DimensionKern', 'Dimension'))
-    WVPASSEQ(pairs[5], ('Dimension', 'DimensionKern'))
-    WVPASSEQ(len(pairs), 6)
-    WVEXCEPT(KeyError, t.addTest, None, [1, 2])
-    WVEXCEPT(KeyError, t.addTest, None, [1, 2, 3, 4])
-
-    class MyTest(Test):
-        pass
 
-    t.addTest(MyTest, [1, 'a', 'A']);
-
-    WVPASSEQ(dt.keys(), [1])
-    WVPASSEQ(dk.keys(), ['a'])
-    WVPASSEQ(dd.keys(), ['A'])
-
-    v1 = dt[1]
-    v2 = dk['a']
-    v3 = dd['A']
-
-    WVPASSEQ(t.getTest((v1, v2, v3)), MyTest)
-    WVPASSEQ(t.getTest((v1, v3, v2)), MyTest)
-    WVPASSEQ(t.getTest((v3, v2, v1)), MyTest)
-    WVEXCEPT(KeyError, t.getTest, (v1, v1, v1))
-    WVEXCEPT(KeyError, t.getTest, (v1, v2))
-    WVEXCEPT(TypeError, t.getTest, v1)
-
-    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt])], ['DimensionKern', 'Dimension']) 
-    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt, dd])], ['DimensionKern'])
-
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1,'a']]))
-    dt.addValue(2)
-    dk.addValue('b')
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1, 'a'], [2, 'a'], [1, 'b'], [2, 'b']]))
-
-
-# tests = Tests("by-kern/", DimensionKern(), DimensionTest())
-    
-# sys.exit(0)
-
-
-
-# class Page:
-#     def __init__(self, tests, yaxis, xaxis=None):
-
-# class PageKern(Page):
-#     prefix = 'kern'
-#     name = 'kernel'
-#     def __init__(self, value, xvals, yvals):
-#         Page.__init__(self, value, xvals, yvals)
-#     def getPreambule(self):
-#         i=self.value.find(":")
-#         if i>0: kver=self.value[:i]
-#         else: kver=self.value
-#         return "<p><a href='config-%s'>Kernel config</a></p>"%kver
-
-# class PageClck(Page):
-#     prefix = 'clck'
-#     name = 'CPU clock'
-#     def __init__(self, value, xvals, yvals):
-#         Page.__init__(self, value, xvals, yvals)
-
-# class PageTest(Page):
-#     prefix = 'test'
-#     name = 'test'
-#     def __init__(self, value, xvals, yvals):
-#         Page.__init__(self, value, xvals, yvals)
-#     def getPreambule(self):
-#         return "<p><a href='%s.sh.html'>Test source</a></p>"%(urllib.quote(self.value))
-
-
-
-# pagesets = [ PageSet(PageKern, kernels, clocks, tests),
-#              PageSet(PageTest, tests, clocks, kernels)]
-
-# for ps in pagesets:
-#     for p in ps.getPages():
-#         p.generate(pagesets)
-
-# try:
-#     os.remove("index.html")
-# except OSError: pass
-
-# os.symlink("%s-%s.html"%(clocks.type, clocks[0]), "index.html")
-
-# os.system("source-highlight -d --output-dir=. ../*.sh")
-    
-
-# for v in kernels.versions():
-#     os.system("cp /boot/config-%s ."%v)
+if __name__ == "__main__":
+    os.chdir(sys.argv[1])
+    os.system("rm *.html")
+    tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest()))
+    tests.generateHtml()
+    sys.exit(0)