Plotting reworked

[can-benchmark.git] / gw-tests / genhtml / genhtml.py
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py

index 08a6dac442fea3839e9cd45b019bb62bbb4d04f9..83995bc660a184b5d2551c97918957282a2688ad 100755 (executable)
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -34,10 +34,14 @@ class Dimension(dict):
                 self[value] = DimValue(self, value)
      def htmlLabel(self, v):
         return v
+    def __str__(self):
+        return self.name
+    def __repr__(self):
+        return self.type
  
  class DimensionKern(Dimension):
      def __init__(self):
-       Dimension.__init__(self, 'kern', 'Kernel')
+       Dimension.__init__(self, 'gwkern', 'GW kernel')
      def htmlLabel(self, v):
         i=v.find(":")
         if i>0: kver=v[:i]
@@ -50,20 +54,45 @@ class DimensionKern(Dimension):
             else: kver=v
             yield kver
  
+class DimensionHostKern(Dimension):
+    def __init__(self):
+       Dimension.__init__(self, 'hostkern', 'Host kernel')
+    def htmlLabel(self, v):
+        if v.find("host-") == 0:
+            v = v[5:]
+        # TODO: remove host- prefix
+       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 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))
  
+class DimensionTraffic(Dimension):
+    def __init__(self):
+       Dimension.__init__(self, 'traf', 'Traffic')
+    def htmlLabel(self, v):
+       return 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
      def printThumbLink(self, file):
+        print self.path
         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)
@@ -103,7 +132,7 @@ class Tests(dict):
  
      def addTest(self, test, coordinates):
         if len(coordinates) != len(self.dimensions):
-           raise KeyError("The number coordinates do not match the number of dimensions")
+           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])
@@ -127,16 +156,17 @@ class Tests(dict):
                 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)
+           remDims = [d for d in self.iterRemainingDimensions(pair)]
+            print pair, remDims
+           for vals in iterDimValues(remDims):
+               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):
@@ -149,8 +179,9 @@ class Page:
      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">
+       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>
@@ -196,6 +227,6 @@ th, td { border: 1px solid lightgray; padding: 4px;}
  
  if __name__ == "__main__":
      os.chdir(sys.argv[1])
-    tests = Tests("by-kern/", DimensionKern(), DimensionTest())
+    tests = Tests("./", DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionTest())
      tests.generateHtml()
      sys.exit(0)