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

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index cd4985b..fd5940c 100755
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -23,6 +23,8 @@ class DimValue(object):
 	return "DimValue(%s, %s)" % (repr(self.dim), repr(self.value))
     def htmlTableHeading(self):
 	return self.dim.htmlTableHeading(self.value)
+    def index(self):
+        return self.dim.sortedKeys.index(self.value)
 
 class DimValues(list):
     def replace(self, val):
@@ -152,8 +154,32 @@ class Test(object):
             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)
+        if 'NO_PDF' in os.environ:
+            return "<div><img src='%s' /></div>" % pngName
+        else:
+            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")
@@ -188,20 +214,21 @@ class Test(object):
 
         print >>html, "</table></div>"
         print >>html, self.fullImgLink("graph.png")
-        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
-
+        self.htmlPrintStats(html)
         cwd = os.getcwd()
         os.chdir(self.path)
         additionalImgs = glob.glob("graph?*.png")
-        if additionalImgs:
-            print "XXX"
-            print >>html, "<h2>Additional graphs</h2>"
+        if additionalImgs: print >>html, "<h3>Additional graphs</h3>"
         for i in additionalImgs:
+            print >>html, "<h4>%s</h4>" % i[5:-4]
             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):
@@ -313,7 +340,7 @@ class Page(object):
 	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]))
+                                       "-".join(["%02d"%v.index() for v in self.valsOther]))
     def generate(self):
 	html = open(self.getName(), "w")
 	title = "CAN gateway timing analysis"