Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into blinded

  • Loading branch information...
commit bcfe71f280cd18eb10fa9ccf4a2d46111a715b44 2 parents f551f6c + e7cf92d
Alexander Bernauer authored
View
1  README.mkd
@@ -32,6 +32,7 @@ Note:
$ cd /path/to/repository
$ source ./setup
+ $ cabal-dev install
$ ./make
# Running the evaluation
View
16 applications/contiki/coap/bench.results
@@ -1,11 +1,11 @@
# loc text bss data stack cpu
-# nat 266 43748 8296 288 218 715006
-# gen 232 44768 8370 308 220 728974
-# tl 242 45050 8866 294 214 798214
+# nat 266 43748 8296 288 218 715460
+# gen 232 44768 8370 308 220 728068
+# tl 242 45050 8866 294 214 799092
# pal nan 1010 0 30 nan nan
-# (nat)/(gen) -12.78 2.33 0.89 6.94 0.92 1.95
+# (nat)/(gen) -12.78 2.33 0.89 6.94 0.92 1.76
# (nat)/((gen)-(pal)) nan 0.02 0.89 -3.47 nan nan
-# (gen)/(tl) 4.31 0.63 5.93 -4.55 -2.73 9.50
+# (gen)/(tl) 4.31 0.63 5.93 -4.55 -2.73 9.76
(dp0
(S'coap'
p1
@@ -66,7 +66,7 @@ g2
S'cpu'
p19
tp20
-I798214
+I799092
s(g1
g14
g7
@@ -97,7 +97,7 @@ s(g1
g9
g19
tp27
-I728974
+I728068
s(g1
g12
g17
@@ -107,7 +107,7 @@ s(g1
g12
g19
tp29
-I715006
+I715460
s(g1
g14
g23
View
4 applications/contiki/plots/__init__.py
@@ -0,0 +1,4 @@
+script_prolog = """
+set terminal pngcairo mono size 640, 480 font "sans serif, 13"
+set output '%(outfile)s.png'
+"""
View
BIN  applications/contiki/plots/cpu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
11 applications/contiki/plots/cpu.py
@@ -1,16 +1,13 @@
import plotting
import os
+from plots import script_prolog
-script = """
-set terminal pngcairo mono size 640, 480
-set output '%(outfile)s.png'
-
+script = script_prolog + """
set style data histogram
set style histogram cluster gap 1
+set style fill pattern
-set style fill pattern 1 border
-
-set key left
+set key right
set auto x
set yrange [650000:820000]
View
BIN  applications/contiki/plots/loc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
11 applications/contiki/plots/loc.py
@@ -1,17 +1,14 @@
import plotting
import StringIO
import os
+from plots import script_prolog
-script = """
-set terminal pngcairo mono size 640, 480
-set output '%(outfile)s.png'
-
+script = script_prolog + """
set style data histogram
set style histogram cluster gap 1
+set style fill pattern
-set style fill pattern 1 border
-
-set key left
+set key right
set auto x
set yrange [50:*]
View
4 applications/contiki/plots/number.txt
@@ -1,8 +1,8 @@
cpu
===
-overhead: tl: max: 11.64
-overhead: gen: max: 1.95
+overhead: tl: max: 11.69
+overhead: gen: max: 1.76
loc
===
View
BIN  applications/contiki/plots/pt_ram.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
12 applications/contiki/plots/pt_ram.py
@@ -1,11 +1,10 @@
import plotting
import os
+from plots import script_prolog
-script = """
-set terminal pngcairo mono size 640, 480
-set output '%(outfile)s.png'
-
+script = script_prolog + """
set style data linespoints
+set pointsize 2.0
set key left
set xrange [-0.5:3.5]
@@ -30,13 +29,14 @@ def plot(path, values_, (apps_, variants_, measurements_), numbers):
values = {}
for a in apps:
for v in variants:
- values[(a, v, "ram")] = sum([values_[(a, v, m)] for m in ["data", "bss", "stack"]])
+ values[(a[3], v, "ram")] = sum([values_[(a, v, m)] for m in ["data", "bss", "stack"]])
+ apps = ["1", "2", "3", "4"]
plotdata = plotting.linespoints(values, apps, variants, ["ram"])
config = {'outfile': os.path.join(path, "pt_ram")}
plotting.plot(script, config, plotdata)
for v in variants:
- slope = 1.0 * (values[("rpc4", v, "ram")] - values[("rpc1", v, "ram")]) / 3
+ slope = 1.0 * (values[("4", v, "ram")] - values[("1", v, "ram")]) / 3
numbers.write("slope: %s: %.2f\n" % (v, slope))
View
BIN  applications/contiki/plots/pt_text.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
14 applications/contiki/plots/pt_text.py
@@ -1,11 +1,10 @@
import plotting
import os
+from plots import script_prolog
-script = """
-set terminal pngcairo mono size 640, 480
-set output '%(outfile)s.png'
-
+script = script_prolog + """
set style data linespoints
+set pointsize 2.0
set key left
set xrange [-0.5:3.5]
@@ -30,15 +29,16 @@ def plot(path, values_, (apps_, variants_, measurements_), numbers):
values = {}
for a in apps:
for v in variants:
- values[(a,v,"text")] = values_[(a,v,"text")]
- values[(a,"gen_nopal", "text")] = values_[(a,"gen","text")] - values_[(a, "pal", "text")]
+ values[(a[3],v,"text")] = values_[(a,v,"text")]
+ values[(a[3],"gen_nopal", "text")] = values_[(a,"gen","text")] - values_[(a, "pal", "text")]
variants.append("gen_nopal")
+ apps = ["1", "2", "3", "4"]
plotdata = plotting.linespoints(values, apps, variants, measurements)
config = {'outfile': os.path.join(path, "pt_text")}
plotting.plot(script, config, plotdata)
for v in variants:
- slope = 1.0 * (values[("rpc4", v, "text")] - values[("rpc1", v, "text")]) / 3
+ slope = 1.0 * (values[("4", v, "text")] - values[("1", v, "text")]) / 3
numbers.write("slope: %s: %.2f\n" % (v, slope))
View
BIN  applications/contiki/plots/ram.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
9 applications/contiki/plots/ram.py
@@ -1,18 +1,17 @@
import plotting
import StringIO
import os
+from plots import script_prolog
-script = """
-set terminal pngcairo mono size 640, 480
-set style fill pattern 1 border
-set output '%(outfile)s.png'
-
+script = script_prolog + """
set style data histograms
set style histogram columnstacked
+set style fill pattern
set key right
set auto x
set yrange [7000:9500]
+
set ylabel "RAM [byte]"
set xlabel "dca coap rpc"
View
BIN  applications/contiki/plots/text.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
14 applications/contiki/plots/text.py
@@ -1,22 +1,20 @@
import plotting
import StringIO
import os
+from plots import script_prolog
-script = """
-set terminal pngcairo mono size 640, 480
-set style fill pattern 1 border
-set output '%(outfile)s.png'
-
+script = script_prolog + """
set style data histograms
set style histogram columnstacked
-
+set style fill pattern
set datafile missing '-'
-set key right
+set key right
set auto x
set yrange [42000:47000]
-set ylabel "text [bytes]"
+
+set ylabel "text [byte]"
set xlabel "dca coap rpc"
set xtics ("" 0, \\
View
2  ocram.cabal
@@ -16,7 +16,7 @@ Description: Translating cooperative threads into a semantically equivalent reac
Cabal-version: >=1.10
Data-files:
- README,
+ README.mkd,
LICENSE
Extra-source-files:
Please sign in to comment.
Something went wrong with that request. Please try again.