Merge branch 'master' of https://gitlab.inria.fr/qdufour/donar

.gitignore

@@ -1,6 +1,7 @@
 *.pub
 onion_services.txt
 *.csv
+!r/*.csv
 *.out
 *.raw
 *.emitted

r/thunder_configure.R

@@ -5,7 +5,7 @@ library(cowplot)
 
 thunder_ms <- read.csv("thunder_configure_15.csv")
 
-thunder_ms <- sqldf("select run,jmax,links,latency, CAST(latency as real) / 1000. as lat_ms from thunder_ms")
+thunder_ms <- sqldf("select run,ident,jmax,links,latency, CAST(latency as real) / 1000. as lat_ms from thunder_ms")
 thunder_ms$links <- as.factor(thunder_ms$links)
 thunder_ms$jmax <- as.factor(thunder_ms$jmax)
 
@@ -127,5 +127,19 @@ v7 <- ggplot(data = downtime_group, aes(x=down_link_count, y=dur)) +
 t2 <- plot_grid(v4, v5, v6, v7, labels = c('A', 'B', 'C', 'D'), ncol=2)
 t2 + ggsave("thunder_links.png", dpi=300, dev='png', height=12, width=15, units="cm")
 
+latency_evol <- sqldf(
+"
+select sorting,lat_ms,ident,tm.jmax,tm.links
+from 
+  thunder_ms as tm,
+  (select run,jmax,links,row_number () OVER (ORDER BY links DESC) sorting from thunder_ms group by run,jmax,links ORDER BY links DESC  limit 0,1) as sel_run
+where
+  tm.run = sel_run.run and tm.jmax = sel_run.jmax and tm.links = sel_run.links
+")
+
+latency_evol$sorting <- as.factor(latency_evol$sorting)
+ggplot(data=latency_evol, aes(x=ident,y=lat_ms)) +
+  geom_line() +
+  theme_classic()
 
 

r/thunder_configure_15_bw.csv

@@ -0,0 +1,29 @@
+run,jmax,links,udp_sent,udp_rcv,cells_sent,cells_rcv
+NdTagQwY9eZOOUVL,50,2,6606,9971,10452,7991
+NdTagQwY9eZOOUVL,150,2,8917,9979,10259,9453
+NdTagQwY9eZOOUVL,200,2,9776,9987,10020,9979
+NdTagQwY9eZOOUVL,250,2,5472,9938,10628,11511
+NdTagQwY9eZOOUVL,350,2,9899,10028,9923,9909
+NdTagQwY9eZOOUVL,450,2,9905,9912,9912,9908
+NdTagQwY9eZOOUVL,550,2,9898,9926,9911,9902
+NdTagQwY9eZOOUVL,50,4,5724,9909,14779,7646
+NdTagQwY9eZOOUVL,150,4,9076,9909,10397,10379
+NdTagQwY9eZOOUVL,200,4,9728,9969,9924,15849
+NdTagQwY9eZOOUVL,250,4,9314,9995,10553,15598
+NdTagQwY9eZOOUVL,350,4,9863,9968,10061,10571
+NdTagQwY9eZOOUVL,450,4,9873,9920,10060,15227
+NdTagQwY9eZOOUVL,550,4,9909,9971,9919,9920
+NdTagQwY9eZOOUVL,50,6,8240,9918,18821,16632
+NdTagQwY9eZOOUVL,150,6,7856,9910,10960,11897
+NdTagQwY9eZOOUVL,200,6,8303,9925,10691,12092
+NdTagQwY9eZOOUVL,250,6,9872,9914,9976,10320
+NdTagQwY9eZOOUVL,350,6,9793,9907,9935,9919
+NdTagQwY9eZOOUVL,450,6,9851,9911,9931,9920
+NdTagQwY9eZOOUVL,550,6,9885,9909,9909,9906
+NdTagQwY9eZOOUVL,50,8,4106,9966,21765,12422
+NdTagQwY9eZOOUVL,150,8,9207,9907,10690,10689
+NdTagQwY9eZOOUVL,200,8,9448,9920,10451,20147
+NdTagQwY9eZOOUVL,250,8,8806,9911,10361,10289
+NdTagQwY9eZOOUVL,350,8,9828,9909,9959,9964
+NdTagQwY9eZOOUVL,450,8,9893,9910,9911,9961
+NdTagQwY9eZOOUVL,550,8,8008,10031,9917,23757

scripts/parse_lib.sh

@@ -7,7 +7,7 @@ is_measurement_done() {
 }
 
 extract_us() {
-  grep -Po '\d+µs' ./out/$1-$2/res/*.csv | grep -Po '\d+'
+  cat ./out/$1-$2/res/*.csv | grep -P "Packet (\d+) latency (\d+)" | perl -i -pe's/^.*Packet (\d+) latency (\d+).*$/$2,$1/'
 }
 
 parse_latency() {
@@ -22,7 +22,7 @@ parse_latency() {
 }
 
 parse_thunder() {
-  echo "run,jmax,links,latency"
+  echo "run,jmax,links,latency,ident"
   get_xp $1 | while read r; do 
     for i in $(seq 0 1 $2); do 
           links=$(grep -Po "thunder-server \d+" out/$r-$i/info.txt|grep -Po "\d+$")