aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Wei <me@fwei.tk>2018-09-29 22:13:08 -0400
committerFranklin Wei <me@fwei.tk>2018-09-29 22:13:08 -0400
commit43d0952e09ee0e9f1ec48575e789523ed6225c88 (patch)
tree91eac59927a91bd76333d4a694e62f9b2be9dba3
parent9e463d0b2f16b3e32c53e3d3922e5e147952b917 (diff)
downloadcsaa-43d0952e09ee0e9f1ec48575e789523ed6225c88.zip
csaa-43d0952e09ee0e9f1ec48575e789523ed6225c88.tar.gz
csaa-43d0952e09ee0e9f1ec48575e789523ed6225c88.tar.bz2
csaa-43d0952e09ee0e9f1ec48575e789523ed6225c88.tar.xz
Change graphs a little bit
Labels are now modified in the text file (not code).
-rw-r--r--dummy_labels_0_create.txt1
-rw-r--r--dummy_labels_1_modify.txt1
-rw-r--r--dummy_labels_2_retrieve.txt1
-rwxr-xr-xgraph.gnu77
-rw-r--r--labels_0_create.txt5
-rw-r--r--labels_1_modify.txt5
-rw-r--r--labels_2_retrieve.txt8
7 files changed, 73 insertions, 25 deletions
diff --git a/dummy_labels_0_create.txt b/dummy_labels_0_create.txt
new file mode 100644
index 0000000..a6a9baf
--- /dev/null
+++ b/dummy_labels_0_create.txt
@@ -0,0 +1 @@
+end
diff --git a/dummy_labels_1_modify.txt b/dummy_labels_1_modify.txt
new file mode 100644
index 0000000..a6a9baf
--- /dev/null
+++ b/dummy_labels_1_modify.txt
@@ -0,0 +1 @@
+end
diff --git a/dummy_labels_2_retrieve.txt b/dummy_labels_2_retrieve.txt
new file mode 100644
index 0000000..a6a9baf
--- /dev/null
+++ b/dummy_labels_2_retrieve.txt
@@ -0,0 +1 @@
+end
diff --git a/graph.gnu b/graph.gnu
index bd1b9b6..63c1274 100755
--- a/graph.gnu
+++ b/graph.gnu
@@ -1,12 +1,13 @@
#!/usr/bin/gnuplot
set key inside
set xlabel "log(leaves)"
-set ylabel "average server CPU time per last 500 ops (μs)"
+set ylabel "mean CPU time per operation, last 500 ops (μs)"
set yrange [0:2000]
set style line 1 lc rgb '#0060ad' lt 1 lw 2 pt -1 ps 0
+set ytics 200
#set style line 3 pt -1 ps 0
-set terminal eps size 5in,7in font "LinuxLibertine"
+set terminal eps size 2.5in,2.25in font "LinuxLibertine,8"
create_times = "`wc -l labels_0_create.txt`"
modify_times = "`wc -l labels_1_modify.txt`"
@@ -26,64 +27,90 @@ dummy_retrieve_labels = "`cat dummy_labels_2_retrieve.txt | tr "\n" " "`"
-set output "graphs_pg1.eps"
+set output "graph_create.eps"
#set terminal qt 0
-set multiplot layout 2, 2 title "Server Performance"
+#set multiplot layout 2, 2 title "Server Performance"
-set title "Authenticated Create"
+#set title "Authenticated Create"
-plot for[i=3 * create_times - 1:2:-3] '< paste results/final_data_0_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Create '.word(create_labels, (i+1) / 3) w yerrorlines ls (create_times - (i-2)/3);
+plot for[i=3 * create_times - 1:2:-3] '< paste results/final_data_0_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Create: '.system("cat labels_0_create.txt | sed '".sprintf("%d", (i+1) / 3)."q;d'") w yerrorlines ls (create_times - (i-2)/3);
-set title "Dummy Create"
-plot for[i=3 * dummy_create_times - 1:2:-3] '< paste results/final_dummy_data_0_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Dummy Create '.word(dummy_create_labels, (i+1) / 3) w yerrorlines ls (dummy_create_times - (i-2)/3);
-#set output "graph_modify.eps"
+set output "graph_dummycreate.eps"
+
+#set title "Dummy Create"
+
+plot for[i=3 * dummy_create_times - 1:2:-3] '< paste results/final_dummy_data_0_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Dummy Create: '.system("cat dummy_labels_0_create.txt | sed '".sprintf("%d", (i+1) / 3)."q;d'") w yerrorlines ls (dummy_create_times - (i-2)/3);
+
+
+
+
+set output "graph_modify.eps"
#set terminal qt 1
#set multiplot layout 2, 1 title "Modify Performance"
-set title "Authenticated Modify (unencrypted)"
+#set title "Authenticated Modify (unencrypted)"
+
+plot for[i=3 * modify_times - 1:2:-3] '< paste results/final_data_1_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Modify: '.system("cat labels_1_modify.txt | sed '".sprintf("%d", (i+1) / 3)."q;d'") w yerrorlines ls (modify_times - (i-2)/3);
+
+
+
+set output "graph_dummymodify.eps"
+
+#set title "Dummy Modify (unencrypted)"
+
+plot for[i=3 * dummy_modify_times - 1:2:-3] '< paste results/final_dummy_data_1_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Dummy Modify: '.system("cat dummy_labels_1_modify.txt | sed '".sprintf("%d", (i+1) / 3)."q;d'") w yerrorlines ls (dummy_modify_times - (i-2)/3);
-plot for[i=3 * modify_times - 1:2:-3] '< paste results/final_data_1_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Modify '.word(modify_labels, (i+1) / 3) w yerrorlines ls (modify_times - (i-2)/3);
-set title "Dummy Modify (unencrypted)"
-plot for[i=3 * dummy_modify_times - 1:2:-3] '< paste results/final_dummy_data_1_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Dummy Modify '.word(dummy_modify_labels, (i+1) / 3) w yerrorlines ls (dummy_modify_times - (i-2)/3);
+#unset multiplot
+
-unset multiplot
-set output "graphs_pg2.eps"
+set output "graph_retrieve.eps"
#set terminal qt 2
-set multiplot layout 2, 2 title "Server Performance"
+#set multiplot layout 2, 2 title "Server Performance"
#set multiplot layout 2, 1 title "Retrieve Performance"
-set title "Authenticated Retrieve (unencrypted)"
+#set title "Authenticated Retrieve (unencrypted)"
+
+plot for[i=3 * retrieve_times - 1:2:-3] '< paste results/final_data_2_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Retrieve: '.system("cat labels_2_retrieve.txt | sed '".sprintf("%d", (i+1) / 3)."q;d'") w yerrorlines ls (retrieve_times - (i-2)/3);
+
+
+set output "graph_dummyretrieve.eps"
+
-plot for[i=3 * retrieve_times - 1:2:-3] '< paste results/final_data_2_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Retrieve '.word(retrieve_labels, (i+1) / 3) w yerrorlines ls (retrieve_times - (i-2)/3);
-set title "Dummy Retrieve (unencrypted)"
-plot for[i=3 * dummy_retrieve_times - 1:2:-3] '< paste results/final_data_2_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Dummy Retrieve '.word(dummy_retrieve_labels, (i+1) / 3) w yerrorlines ls (dummy_retrieve_times - (i-2)/3);
+#set title "Dummy Retrieve (unencrypted)"
+
+plot for[i=3 * dummy_retrieve_times - 1:2:-3] '< paste results/final_data_2_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Dummy Retrieve: '.system("cat dummy_labels_2_retrieve.txt | sed '".sprintf("%d", (i+1) / 3)."q;d'") w yerrorlines ls (dummy_retrieve_times - (i-2)/3);
#unset multiplot
-#set terminal eps size 3in,2.5in font "LiberationSerif"
+
+###### We don't use these ######
+
#set output "graph_modifyenc.eps"
#set terminal qt 3
-set title "Authenticated Modify (encrypted)"
+#set title "Authenticated Modify (encrypted)"
+
+#plot for[i=3 * modify_times - 1:2:-3] '< paste results/final_data_3_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Modify '.word(modify_labels, (i+1) / 3) w yerrorlines ls (modify_times - (i-2)/3);
+
+
-plot for[i=3 * modify_times - 1:2:-3] '< paste results/final_data_3_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Modify '.word(modify_labels, (i+1) / 3) w yerrorlines ls (modify_times - (i-2)/3);
#set output "graph_retrieveenc.eps"
#set terminal qt 4
-set title "Authenticated Retrieve (encrypted)"
+#set title "Authenticated Retrieve (encrypted)"
-plot for[i=3 * retrieve_times - 1:2:-3] '< paste results/final_data_4_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Retrieve '.word(retrieve_labels, (i+1) / 3) w yerrorlines ls (retrieve_times - (i-2)/3);
+#plot for[i=3 * retrieve_times - 1:2:-3] '< paste results/final_data_4_*.txt' u 1:(sum [col=0:(i-2)/3] column(3 * col + 2)):i+1 title 'Retrieve '.word(retrieve_labels, (i+1) / 3) w yerrorlines ls (retrieve_times - (i-2)/3);
diff --git a/labels_0_create.txt b/labels_0_create.txt
new file mode 100644
index 0000000..cfd32d1
--- /dev/null
+++ b/labels_0_create.txt
@@ -0,0 +1,5 @@
+Obtain EQ certificate
+Insert placeholder
+Obtain RU certificate
+Module request
+Database update
diff --git a/labels_1_modify.txt b/labels_1_modify.txt
new file mode 100644
index 0000000..8da5162
--- /dev/null
+++ b/labels_1_modify.txt
@@ -0,0 +1,5 @@
+Record lookup
+Calculate λ value
+Obtain RU, RV certificates
+Module request
+Database update
diff --git a/labels_2_retrieve.txt b/labels_2_retrieve.txt
new file mode 100644
index 0000000..a7e3963
--- /dev/null
+++ b/labels_2_retrieve.txt
@@ -0,0 +1,8 @@
+Record lookup
+Obtain RV certificates
+Retrieve secret (only if encrypted)
+End retrieve
+Begin verify
+Verify: record lookup
+Verify: obtain RV certificates
+Verify: module verification