X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/9f7f766a0e3ba735653da76c5564d3d182c12a6c..a4463e1ce99295ad665b9e45bb911e6e9f672ebb:/gw-tests/genhtml/genhtml.py

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 8a94dc8..94ca00e 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -5,15 +5,14 @@ import dircache;
 import sys;
 import urllib
 import traceback
+import glob
 
 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)
+            return super(DimValue, cls).__new__(cls)
     def __init__(self, dim, value):
 	self.dim = dim
 	self.value = value
@@ -117,6 +116,10 @@ class DimensionTest(Dimension):
     def htmlTableHeading(self, v):
 	return v+"<br><a href='%s.sh.html'>source</a>"%(urllib.quote(v))
 
+class DimensionLoad(Dimension):
+    def __init__(self):
+	Dimension.__init__(self, 'load', 'Load')
+
 class DimensionTraffic(Dimension):
     def __init__(self):
 	Dimension.__init__(self, 'traf', 'Traffic')
@@ -132,7 +135,7 @@ class DimensionTraffic(Dimension):
 class Test(object):
     @classmethod
     def isOnPath(cls, path):
-	f = os.path.join(path, '.results')
+	f = os.path.join(path, 'plot.sh')
 	return os.path.isfile(f)
     def __init__(self, path, values, tests=None):
 	self.path = path
@@ -140,14 +143,39 @@ class Test(object):
         self.values = values
         self.tests = tests
     def printThumbLink(self, file):
-        thumb = self.path+'/thumb'
-        try:
-            imgs = [img for img in dircache.listdir(thumb)]
-        except OSError:
-            imgs = [ self.name + ".png" ]
+#         try:
+#             imgs = [img for img in dircache.listdir(thumb)]
+#         except OSError:
+#             imgs = [ self.name + ".png" ]
+        imgs = [ 'tgraph.png' ]
         for img in imgs:
-            print >>file, "<a href='%s/results.html'><img src='%s/thumb/%s'></a>" % \
+            print >>file, "<a href='%s/results.html'><img src='%s/%s'></a>" % \
                   (urllib.quote(self.path), urllib.quote(self.path), img)
+    def fullImgLink(self, pngName):
+        return "<div><a href='%s'><img src='%s' /></a></div>" % \
+               (pngName[:-4]+".pdf", pngName)
+        
+    def htmlPrintStats(self, html):
+        cwd = os.getcwd()
+        os.chdir(self.path)
+        stats = glob.glob("*-stat.txt")
+        print >>html, "<h3>Statistics</h3>"
+        print >>html, "<table><tr>"
+        stats.sort()
+        for i in stats:
+            lines = open(i).readlines()
+            def fixupLine(l):
+                comment = l.find("#")
+                if comment >= 0:
+                    l = l[:comment-1]
+                if l.find("cmdline=") == 0:
+                    l = "<abbr title=%s>cmdline=...</abbr>" % str(l[8:])
+                return l
+            lines = [fixupLine(l) for l in lines]
+            print >>html, "<td><h4>%s</h4>%s</td>" % (i, "<br />".join(lines))
+        print >>html, "</tr></table>"
+        os.chdir(cwd)
+        
     def generateHtml(self):
         html = open(os.path.join(self.path, 'results.html'), "w")
 	title = "CAN gateway timing analysis"
@@ -163,26 +191,38 @@ class Test(object):
 <h1>%s</h1>"""  % (title, cdup, title)
         params = ["%s %s" % (v.dim, v) for v in self.values]
         print >>html, "Results for:", ", ".join(params)
-        print >>html, "<div class='box'><h4>Other results</h4>"
+        print >>html, "<div class='otherview'><h4>Other results</h4><table>"
 	for d in self.tests.space:
             links = []
             for v in d:
                 if v in self.values:
-                    print "XXX", repr(v)
-                    links.append(str(v))
+                    links.append("<span class='value current'>%s</span>"%str(v))
                 else:
                     vv = DimValues(self.values)
                     vv.replace(v)
-                    href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
-                    links.append("<a href='%s'>%s</a>"%(href, str(v)))
-            print >>html, "%s: " % d, " | ".join(links), "<br>"
+                    try:
+                        href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
+                        links.append("<span class='value other'><a href='%s'>%s</a></span>"%(href, str(v)))
+                    except KeyError:
+                        links.append("<span class='value missing'>%s</span>"%str(v))
+            print >>html, "<tr><th>%s</th><td>" % d, " ".join(links), "</td></tr>"
 
-        print >>html, "</div>"
-        print >>html, "<div><img src='%s' /></div>" % (self.name+".png")
+        print >>html, "</table></div>"
+        print >>html, self.fullImgLink("graph.png")
+        self.htmlPrintStats(html)
+        cwd = os.getcwd()
+        os.chdir(self.path)
+        additionalImgs = glob.glob("graph?*.png")
+        if additionalImgs: print >>html, "<h3>Additional graphs</h3>"
+        for i in additionalImgs:
+            print >>html, self.fullImgLink(i)
+        os.chdir(cwd)
+        
+        print >>html, "<hr />"
         print >>html, "<a href='./'>Raw data</a><br />"
         print >>html, "<a href='%s'>Script source</a><br />" % (cdup+self.name+".sh.html")
         print >>html, "<a href='%s'>Back to top</a><br />" % cdup
-        
+
         html.close()
 
 class Space(list):
@@ -272,7 +312,12 @@ class Tests(dict):
 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}
+.otherview { margin: 1ex 0}
+.otherview .value { color: black; padding: 0ex 1ex; -moz-border-radius: 1ex; border-radius: 1ex;}
+.otherview .value a { color: inherit; text-decoration: none; }
+.otherview .other:hover { background: #eee; }
+.otherview .missing { color: gray; }
+.otherview .current { background: #ccc; }
 """
         css.close()
         for test in self.values():
@@ -304,28 +349,26 @@ class Page(object):
 <h1>%s</h1>"""  % (title, title)
         params = ["%s %s" % (v.dim, v) for v in self.valsOther]
         print >>html, "<h3>Results for ", ", ".join(params), "</h3>"
-        print >>html, "<div class='box'><h4>Other views</h4>"
+        print >>html, "<div class='otherview'><h4>Other views</h4>"
+        print >>html, "<table><tr>"
 	for d in self.dimOther:
-            print >>html, "%s: " % d
-            print >>html, "<a href='%s'>X axis</a>, " % \
+            print >>html, "<th>%s</th>" % d
+            print >>html, "<td><a href='%s'>&rarr;</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;" % \
+            print >>html, "<a href='%s'>&darr;</a></td>" % \
                 Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
             links = []
+            print >>html, "<td>"
             for v in d:
                 if v in self.valsOther:
-                    links.append(str(v))
+                    links.append("<span class='value current'>%s</span>"%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, "</div>"
+                    links.append("<span class='value other'><a href='%s'>%s</a></span>"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
+            print >>html, " ".join(links)
+            print >>html, "</td></tr>"
+        print >>html, "</table></div>"
 
 	print >>html, "<table><thead><tr><td>%s &rarr; <br />%s &darr;</td>" % (self.dimx.name, self.dimy.name)
 	for x in self.dimx:
@@ -355,6 +398,6 @@ class Page(object):
 if __name__ == "__main__":
     os.chdir(sys.argv[1])
     os.system("rm *.html")
-    tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest()))
+    tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionLoad(), DimensionTest()))
     tests.generateHtml()
     sys.exit(0)