Skip to content
This repository
Browse code

Merge branch 'master' into blinded

  • Loading branch information...
commit bcfe71f280cd18eb10fa9ccf4a2d46111a715b44 2 parents f551f6c + e7cf92d
authored April 05, 2012
1  README.mkd
Source Rendered
@@ -32,6 +32,7 @@ Note:
32 32
  
33 33
 	$ cd /path/to/repository
34 34
 	$ source ./setup
  35
+	$ cabal-dev install
35 36
 	$ ./make
36 37
 
37 38
 # Running the evaluation
16  applications/contiki/coap/bench.results
... ...
@@ -1,11 +1,11 @@
1 1
 #                     	    loc	   text	    bss	   data	  stack	    cpu
2  
-#                  nat	    266	  43748	   8296	    288	    218	 715006
3  
-#                  gen	    232	  44768	   8370	    308	    220	 728974
4  
-#                   tl	    242	  45050	   8866	    294	    214	 798214
  2
+#                  nat	    266	  43748	   8296	    288	    218	 715460
  3
+#                  gen	    232	  44768	   8370	    308	    220	 728068
  4
+#                   tl	    242	  45050	   8866	    294	    214	 799092
5 5
 #                  pal	    nan	   1010	      0	     30	    nan	    nan
6  
-#          (nat)/(gen)	 -12.78	   2.33	   0.89	   6.94	   0.92	   1.95
  6
+#          (nat)/(gen)	 -12.78	   2.33	   0.89	   6.94	   0.92	   1.76
7 7
 #  (nat)/((gen)-(pal))	    nan	   0.02	   0.89	  -3.47	    nan	    nan
8  
-#           (gen)/(tl)	   4.31	   0.63	   5.93	  -4.55	  -2.73	   9.50
  8
+#           (gen)/(tl)	   4.31	   0.63	   5.93	  -4.55	  -2.73	   9.76
9 9
 (dp0
10 10
 (S'coap'
11 11
 p1
@@ -66,7 +66,7 @@ g2
66 66
 S'cpu'
67 67
 p19
68 68
 tp20
69  
-I798214
  69
+I799092
70 70
 s(g1
71 71
 g14
72 72
 g7
@@ -97,7 +97,7 @@ s(g1
97 97
 g9
98 98
 g19
99 99
 tp27
100  
-I728974
  100
+I728068
101 101
 s(g1
102 102
 g12
103 103
 g17
@@ -107,7 +107,7 @@ s(g1
107 107
 g12
108 108
 g19
109 109
 tp29
110  
-I715006
  110
+I715460
111 111
 s(g1
112 112
 g14
113 113
 g23
4  applications/contiki/plots/__init__.py
... ...
@@ -0,0 +1,4 @@
  1
+script_prolog = """
  2
+set terminal pngcairo mono size 640, 480 font "sans serif, 13"
  3
+set output '%(outfile)s.png'
  4
+"""
BIN  applications/contiki/plots/cpu.png
11  applications/contiki/plots/cpu.py
... ...
@@ -1,16 +1,13 @@
1 1
 import plotting
2 2
 import os
  3
+from plots import script_prolog
3 4
 
4  
-script = """
5  
-set terminal pngcairo mono size 640, 480
6  
-set output '%(outfile)s.png'
7  
-
  5
+script = script_prolog + """
8 6
 set style data histogram
9 7
 set style histogram cluster gap 1
  8
+set style fill pattern
10 9
 
11  
-set style fill pattern 1 border
12  
-
13  
-set key left
  10
+set key right
14 11
 set auto x
15 12
 set yrange [650000:820000]
16 13
 
BIN  applications/contiki/plots/loc.png
11  applications/contiki/plots/loc.py
... ...
@@ -1,17 +1,14 @@
1 1
 import plotting
2 2
 import StringIO
3 3
 import os
  4
+from plots import script_prolog
4 5
 
5  
-script = """
6  
-set terminal pngcairo mono size 640, 480
7  
-set output '%(outfile)s.png'
8  
-
  6
+script = script_prolog + """
9 7
 set style data histogram
10 8
 set style histogram cluster gap 1
  9
+set style fill pattern
11 10
 
12  
-set style fill pattern 1 border
13  
-
14  
-set key left
  11
+set key right
15 12
 set auto x
16 13
 set yrange [50:*]
17 14
 
4  applications/contiki/plots/number.txt
... ...
@@ -1,8 +1,8 @@
1 1
 
2 2
 cpu
3 3
 ===
4  
-overhead: tl: max: 11.64
5  
-overhead: gen: max: 1.95
  4
+overhead: tl: max: 11.69
  5
+overhead: gen: max: 1.76
6 6
 
7 7
 loc
8 8
 ===
BIN  applications/contiki/plots/pt_ram.png
12  applications/contiki/plots/pt_ram.py
... ...
@@ -1,11 +1,10 @@
1 1
 import plotting
2 2
 import os
  3
+from plots import script_prolog
3 4
 
4  
-script = """
5  
-set terminal pngcairo mono size 640, 480
6  
-set output '%(outfile)s.png'
7  
-
  5
+script = script_prolog + """
8 6
 set style data linespoints
  7
+set pointsize 2.0
9 8
 
10 9
 set key left
11 10
 set xrange [-0.5:3.5]
@@ -30,13 +29,14 @@ def plot(path, values_, (apps_, variants_, measurements_), numbers):
30 29
     values = {}
31 30
     for a in apps:
32 31
         for v in variants:
33  
-            values[(a, v, "ram")] = sum([values_[(a, v, m)] for m in ["data", "bss", "stack"]])
  32
+            values[(a[3], v, "ram")] = sum([values_[(a, v, m)] for m in ["data", "bss", "stack"]])
34 33
 
  34
+    apps = ["1", "2", "3", "4"]
35 35
     plotdata = plotting.linespoints(values, apps, variants, ["ram"])
36 36
 
37 37
     config = {'outfile': os.path.join(path, "pt_ram")}
38 38
     plotting.plot(script, config, plotdata)
39 39
 
40 40
     for v in variants:
41  
-        slope = 1.0 * (values[("rpc4", v, "ram")] - values[("rpc1", v, "ram")]) / 3
  41
+        slope = 1.0 * (values[("4", v, "ram")] - values[("1", v, "ram")]) / 3
42 42
         numbers.write("slope: %s: %.2f\n" % (v, slope))
BIN  applications/contiki/plots/pt_text.png
14  applications/contiki/plots/pt_text.py
... ...
@@ -1,11 +1,10 @@
1 1
 import plotting
2 2
 import os
  3
+from plots import script_prolog
3 4
 
4  
-script = """
5  
-set terminal pngcairo mono size 640, 480
6  
-set output '%(outfile)s.png'
7  
-
  5
+script = script_prolog + """
8 6
 set style data linespoints
  7
+set pointsize 2.0
9 8
 
10 9
 set key left
11 10
 set xrange [-0.5:3.5]
@@ -30,15 +29,16 @@ def plot(path, values_, (apps_, variants_, measurements_), numbers):
30 29
     values = {}
31 30
     for a in apps:
32 31
         for v in variants:
33  
-            values[(a,v,"text")] = values_[(a,v,"text")]
34  
-        values[(a,"gen_nopal", "text")] = values_[(a,"gen","text")] - values_[(a, "pal", "text")]
  32
+            values[(a[3],v,"text")] = values_[(a,v,"text")]
  33
+        values[(a[3],"gen_nopal", "text")] = values_[(a,"gen","text")] - values_[(a, "pal", "text")]
35 34
 
36 35
     variants.append("gen_nopal")
  36
+    apps = ["1", "2", "3", "4"]
37 37
     plotdata = plotting.linespoints(values, apps, variants, measurements)
38 38
 
39 39
     config = {'outfile': os.path.join(path, "pt_text")}
40 40
     plotting.plot(script, config, plotdata)
41 41
 
42 42
     for v in variants:
43  
-        slope = 1.0 * (values[("rpc4", v, "text")] - values[("rpc1", v, "text")]) / 3
  43
+        slope = 1.0 * (values[("4", v, "text")] - values[("1", v, "text")]) / 3
44 44
         numbers.write("slope: %s: %.2f\n" % (v, slope))
BIN  applications/contiki/plots/ram.png
9  applications/contiki/plots/ram.py
... ...
@@ -1,18 +1,17 @@
1 1
 import plotting
2 2
 import StringIO
3 3
 import os
  4
+from plots import script_prolog
4 5
 
5  
-script = """
6  
-set terminal pngcairo mono size 640, 480
7  
-set style fill pattern 1 border
8  
-set output '%(outfile)s.png'
9  
-         
  6
+script = script_prolog + """
10 7
 set style data histograms
11 8
 set style histogram columnstacked
  9
+set style fill pattern
12 10
 
13 11
 set key right
14 12
 set auto x
15 13
 set yrange [7000:9500]
  14
+
16 15
 set ylabel "RAM [byte]"
17 16
 set xlabel "dca                       coap                       rpc"
18 17
 
BIN  applications/contiki/plots/text.png
14  applications/contiki/plots/text.py
... ...
@@ -1,22 +1,20 @@
1 1
 import plotting
2 2
 import StringIO
3 3
 import os
  4
+from plots import script_prolog
4 5
 
5  
-script = """
6  
-set terminal pngcairo mono size 640, 480
7  
-set style fill pattern 1 border
8  
-set output '%(outfile)s.png'
9  
-         
  6
+script = script_prolog + """
10 7
 set style data histograms
11 8
 set style histogram columnstacked
12  
-
  9
+set style fill pattern
13 10
 
14 11
 set datafile missing '-'
15 12
 
16  
-set key right 
  13
+set key right
17 14
 set auto x
18 15
 set yrange [42000:47000]
19  
-set ylabel "text [bytes]"
  16
+
  17
+set ylabel "text [byte]"
20 18
 set xlabel "dca                       coap                       rpc"
21 19
 
22 20
 set xtics ("" 0, \\
2  ocram.cabal
@@ -16,7 +16,7 @@ Description: Translating cooperative threads into a semantically equivalent reac
16 16
 Cabal-version:       >=1.10
17 17
 
18 18
 Data-files:
19  
-  README,
  19
+  README.mkd,
20 20
   LICENSE
21 21
 
22 22
 Extra-source-files:  

0 notes on commit bcfe71f

Please sign in to comment.
Something went wrong with that request. Please try again.