July 2012 - tor-commits - lists.torproject.org

[tech-reports/master] Update bridge-stability graphs.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit 8ccae45ddb522083ef57811222454e07898ba5b2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:52:42 2012 +0200 Update bridge-stability graphs. --- 2011/bridge-stability/fwfu-sim.pdf | Bin 40046 -> 12268 bytes 2011/bridge-stability/requirements.pdf | Bin 38630 -> 11396 bytes 2011/bridge-stability/runningbridge-detail.pdf | Bin 122071 -> 13681 bytes 2011/bridge-stability/runningbridge.pdf | Bin 21675 -> 6582 bytes 2011/bridge-stability/stablebridge.pdf | Bin 34888 -> 10511 bytes 2011/bridge-stability/tosa-sim.pdf | Bin 40391 -> 12347 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/2011/bridge-stability/fwfu-sim.pdf b/2011/bridge-stability/fwfu-sim.pdf index 8565aba..5eac173 100755 Binary files a/2011/bridge-stability/fwfu-sim.pdf and b/2011/bridge-stability/fwfu-sim.pdf differ diff --git a/2011/bridge-stability/requirements.pdf b/2011/bridge-stability/requirements.pdf index 4871677..48939ba 100755 Binary files a/2011/bridge-stability/requirements.pdf and b/2011/bridge-stability/requirements.pdf differ diff --git a/2011/bridge-stability/runningbridge-detail.pdf b/2011/bridge-stability/runningbridge-detail.pdf index 32120e7..d4abfc7 100755 Binary files a/2011/bridge-stability/runningbridge-detail.pdf and b/2011/bridge-stability/runningbridge-detail.pdf differ diff --git a/2011/bridge-stability/runningbridge.pdf b/2011/bridge-stability/runningbridge.pdf index c0bac36..d693d82 100755 Binary files a/2011/bridge-stability/runningbridge.pdf and b/2011/bridge-stability/runningbridge.pdf differ diff --git a/2011/bridge-stability/stablebridge.pdf b/2011/bridge-stability/stablebridge.pdf index c20804e..7b9222c 100755 Binary files a/2011/bridge-stability/stablebridge.pdf and b/2011/bridge-stability/stablebridge.pdf differ diff --git a/2011/bridge-stability/tosa-sim.pdf b/2011/bridge-stability/tosa-sim.pdf index 9fea0b8..cee92ca 100755 Binary files a/2011/bridge-stability/tosa-sim.pdf and b/2011/bridge-stability/tosa-sim.pdf differ

1 0

[tech-reports/master] Update relay-stability graphs.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit b5eb43b9add3fc90748217123e39535bccd62187 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:54:01 2012 +0200 Update relay-stability graphs. --- 2011/relay-stability/advbw-frac-relays-sim.pdf | Bin 20434 -> 9109 bytes 2011/relay-stability/advbw-wb-sim.pdf | Bin 358595 -> 101316 bytes 2011/relay-stability/default-reqs.pdf | Bin 20121 -> 9011 bytes 2011/relay-stability/diff-sim-obs.pdf | Bin 28027 -> 11190 bytes 2011/relay-stability/relayflags.pdf | Bin 16284 -> 8081 bytes 2011/relay-stability/requirements.pdf | Bin 51526 -> 17773 bytes 2011/relay-stability/wfu-wfu-sim.pdf | Bin 358058 -> 73731 bytes 2011/relay-stability/wmtbf-tunf-sim.pdf | Bin 357667 -> 55646 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/2011/relay-stability/advbw-frac-relays-sim.pdf b/2011/relay-stability/advbw-frac-relays-sim.pdf index 2523a74..fa5422d 100755 Binary files a/2011/relay-stability/advbw-frac-relays-sim.pdf and b/2011/relay-stability/advbw-frac-relays-sim.pdf differ diff --git a/2011/relay-stability/advbw-wb-sim.pdf b/2011/relay-stability/advbw-wb-sim.pdf index be82838..f2a5654 100755 Binary files a/2011/relay-stability/advbw-wb-sim.pdf and b/2011/relay-stability/advbw-wb-sim.pdf differ diff --git a/2011/relay-stability/default-reqs.pdf b/2011/relay-stability/default-reqs.pdf index 49789ef..3bee9a4 100755 Binary files a/2011/relay-stability/default-reqs.pdf and b/2011/relay-stability/default-reqs.pdf differ diff --git a/2011/relay-stability/diff-sim-obs.pdf b/2011/relay-stability/diff-sim-obs.pdf index c6086e4..ae6ff09 100755 Binary files a/2011/relay-stability/diff-sim-obs.pdf and b/2011/relay-stability/diff-sim-obs.pdf differ diff --git a/2011/relay-stability/relayflags.pdf b/2011/relay-stability/relayflags.pdf index 88fc59e..7969ccb 100755 Binary files a/2011/relay-stability/relayflags.pdf and b/2011/relay-stability/relayflags.pdf differ diff --git a/2011/relay-stability/requirements.pdf b/2011/relay-stability/requirements.pdf index 54cc3d6..fa979c5 100755 Binary files a/2011/relay-stability/requirements.pdf and b/2011/relay-stability/requirements.pdf differ diff --git a/2011/relay-stability/wfu-wfu-sim.pdf b/2011/relay-stability/wfu-wfu-sim.pdf index d8b8dd3..8c3c2f8 100755 Binary files a/2011/relay-stability/wfu-wfu-sim.pdf and b/2011/relay-stability/wfu-wfu-sim.pdf differ diff --git a/2011/relay-stability/wmtbf-tunf-sim.pdf b/2011/relay-stability/wmtbf-tunf-sim.pdf index 0896dc5..2ec35c0 100755 Binary files a/2011/relay-stability/wmtbf-tunf-sim.pdf and b/2011/relay-stability/wmtbf-tunf-sim.pdf differ

1 0

[tech-reports/master] Add generated and renamed PDFs to .gitignore.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit 2d6a3bd00ccdf3e763b9e1e6d405698074386442 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:34:22 2012 +0200 Add generated and renamed PDFs to .gitignore. --- 2011/bridge-blockings/.gitignore | 2 ++ 2011/bridge-stability/.gitignore | 2 ++ 2011/censorship-detector/.gitignore | 2 ++ 2011/relay-stability/.gitignore | 2 ++ 2011/statistical-data/.gitignore | 2 ++ 5 files changed, 10 insertions(+), 0 deletions(-) diff --git a/2011/bridge-blockings/.gitignore b/2011/bridge-blockings/.gitignore index 787dd0b..82a057b 100644 --- a/2011/bridge-blockings/.gitignore +++ b/2011/bridge-blockings/.gitignore @@ -1 +1,3 @@ blocking.pdf +blocking-2011-09-15.pdf + diff --git a/2011/bridge-stability/.gitignore b/2011/bridge-stability/.gitignore index d481f99..f91ef20 100644 --- a/2011/bridge-stability/.gitignore +++ b/2011/bridge-stability/.gitignore @@ -1 +1,3 @@ report.pdf +bridge-stability-2011-10-31.pdf + diff --git a/2011/censorship-detector/.gitignore b/2011/censorship-detector/.gitignore index 7046539..0a88959 100644 --- a/2011/censorship-detector/.gitignore +++ b/2011/censorship-detector/.gitignore @@ -1 +1,3 @@ detector.pdf +detector-2011-09-09.pdf + diff --git a/2011/relay-stability/.gitignore b/2011/relay-stability/.gitignore index d481f99..407d62c 100644 --- a/2011/relay-stability/.gitignore +++ b/2011/relay-stability/.gitignore @@ -1 +1,3 @@ report.pdf +relay-stability-2011-06-30.pdf + diff --git a/2011/statistical-data/.gitignore b/2011/statistical-data/.gitignore index d02299e..3f3c1f0 100644 --- a/2011/statistical-data/.gitignore +++ b/2011/statistical-data/.gitignore @@ -1 +1,3 @@ data.pdf +data-2011-03-14.pdf +

1 0

[metrics-tasks/master] Update #2911 graphing code to ggplot2 0.9.0.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit c36a24508907287387accb6b30d69ed994c19661 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:29:24 2012 +0200 Update #2911 graphing code to ggplot2 0.9.0. --- task-2911/stability.R | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/task-2911/stability.R b/task-2911/stability.R index 5b40d67..63e1748 100644 --- a/task-2911/stability.R +++ b/task-2911/stability.R @@ -1,4 +1,5 @@ library(ggplot2) +library(scales) data <- read.csv("stability.csv", stringsAsFactors = FALSE) d <- data @@ -13,8 +14,8 @@ d <- rbind( variable = "Running + Guard")) ggplot(d, aes(x = as.Date(date), y = value, colour = variable)) + geom_line(size = 0.7) + -scale_x_date("", major = "3 months", minor = "1 month", - format = "%b %Y") + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_y_continuous("Number \nof relays ", limits = c(0, max(d$value, na.rm = TRUE))) + scale_colour_manual(name = "Assigned relay flags\n", @@ -41,9 +42,9 @@ d[d$x >= '2010-01-25' & d$x <= '2010-01-26', "y"] <- NA ggplot(d, aes(x = x, y = y, colour = variable, linetype = variable)) + geom_line() + scale_y_continuous(name = "Fraction of \nRunning relays ", - formatter = "percent", limits = c(0, max(d$y, na.rm = TRUE))) + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + + labels = percent, limits = c(0, max(d$y, na.rm = TRUE))) + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_colour_manual(name = "Assigned relay flags\n", values = c("Stable (observed)" = "grey50", "Stable (simulated)" = "grey50", @@ -79,8 +80,8 @@ ggplot(d, aes(x = x, y = y, linetype = variable)) + geom_line() + facet_grid(flag ~ ., scale = "free_y") + scale_y_continuous(name = "Number \nof relays ") + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_linetype_manual(name = "", values = c(4, 3, 1)) + opts(axis.title.x = theme_text(size = 12 * 0.8, face = "bold", hjust = 0.5), @@ -124,8 +125,8 @@ geom_ribbon(alpha = 0.3) + geom_hline(data = e, aes(yintercept = yintercept), colour = "gray30", linetype = 2) + facet_wrap(~ var, scales = "free_y") + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_y_continuous(name = "") ggsave(filename = "requirements.pdf", width = 8, height = 5, dpi = 100) @@ -157,7 +158,7 @@ scale_x_continuous(name = paste("\n10th percentile of time until next", limits = c(0, max(d$x, na.rm = TRUE))) + scale_y_continuous(name = paste("Cumulative fraction \nof", "consensuses \nfrom July to \nDecember 2010 "), - formatter = "percent", limits = c(0, 1)) + + labels = percent, limits = c(0, 1)) + scale_colour_manual(name = paste("WMTBF percentile\nfor", "assigning\nStable flag\n"), values = c("60th (simulated)" = "black", @@ -199,10 +200,10 @@ d <- rbind( ggplot(d, aes(x = x, y = y, colour = sim, linetype = sim)) + geom_line() + scale_x_continuous(name = "\n10th percentile of WFU in the future", - formatter = "percent") + + labels = percent) + scale_y_continuous(name = paste("Cumulative fraction \nof", "consensuses \nfrom July to \nDecember 2010 "), - formatter = "percent", limits = c(0, 1)) + + labels = percent, limits = c(0, 1)) + scale_colour_manual(name = paste("WFU percentile\nfor", "assigning\nGuard flag\n"), values = c("60th (simulated)" = "black", @@ -246,7 +247,7 @@ scale_x_continuous(name = paste("\n10th percentile of weighted bandwidth", "in KiB/s in the future")) + scale_y_continuous(name = paste("Cumulative fraction \nof", "consensuses \nfrom July to \nDecember 2010 "), - formatter = "percent", limits = c(0, 1)) + + labels = percent, limits = c(0, 1)) + scale_colour_manual(name = paste("Advertised\nbandwidth\npercentile\nfor", "assigning\nGuard flag\n"), values = c( @@ -279,9 +280,9 @@ d <- rbind( ggplot(d, aes(x = x, y = y, colour = variable, linetype = variable)) + geom_line() + scale_y_continuous(name = "Fraction of \nRunning relays ", - formatter = "percent", limits = c(0, max(d$y, na.rm = TRUE))) + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + + labels = percent, limits = c(0, max(d$y, na.rm = TRUE))) + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_colour_manual(name = paste("Advertised\nbandwidth\npercentile\nfor", "assigning\nGuard flag\n"), values = c(

1 0

[metrics-tasks/master] Update #4030 graphing code to ggplot2 0.9.0 and switch to .pdf.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit 3ff269f890d1476a4d9e0034b547ef586c536bec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:30:47 2012 +0200 Update #4030 graphing code to ggplot2 0.9.0 and switch to .pdf. --- task-4030/bridge-blockings.R | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/task-4030/bridge-blockings.R b/task-4030/bridge-blockings.R index da40186..4435354 100644 --- a/task-4030/bridge-blockings.R +++ b/task-4030/bridge-blockings.R @@ -1,4 +1,5 @@ library(ggplot2) +library(scales) u <- read.csv("bridge-users.csv", stringsAsFactors = FALSE) u <- u[u$date >= "2009-07-01" & u$date < "2011-08-01", c("date", "cn")] @@ -7,12 +8,12 @@ geom_line(size = 0.75) + geom_rect(aes(NULL, NULL, xmin = as.Date("2010-01-01"), xmax = as.Date("2010-06-30"), ymin = -Inf, ymax = Inf, fill = TRUE)) + scale_fill_manual(name = "", breaks = TRUE, - values = alpha("purple", 0.2)) + -scale_x_date(name = "", major = "6 months", minor = "1 month", - format = "%b %Y") + + values = alpha("purple", 0.005)) + +scale_x_date("", breaks = "6 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_y_continuous(name = "", limits = c(0, max(u$cn, na.rm = TRUE))) + opts(legend.position = "none") -ggsave("bridge-users.png", width = 8, height = 4, dpi = 150) +ggsave("bridge-users.pdf", width = 8, height = 4, dpi = 150) b <- read.csv("bridge-blockings.csv", stringsAsFactors = FALSE) b <- b[b$date >= '2010-01-01' & b$date <= '2010-06-30', ] @@ -33,10 +34,10 @@ d <- rbind(data.frame(date = u$date, value = u$cn, variable = "Users"), ggplot(d, aes(x = as.Date(date), y = value)) + geom_line(size = 0.75) + facet_grid(variable ~ ., scales = "free_y") + -scale_x_date(name = "", format = "%b %Y", major = "1 month", - minor = "months") + +scale_x_date("", breaks = "1 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_y_continuous(name = "") -ggsave("bridge-users-blockings.png", width = 8, height = 4, dpi = 150) +ggsave("bridge-users-blockings.pdf", width = 8, height = 4, dpi = 150) b <- data.frame(date = as.Date(b$date), ips = b$ips, fingerprint = substr(b$fingerprint, 1, 4), @@ -50,11 +51,11 @@ geom_point(size = 0.75) + geom_hline(yintercept = 32, linetype = 2, size = 0.25) + geom_point(data = bb, aes(x = date, y = ips), colour = "red", size = 3, alpha = 0.25) + -scale_x_date(name = "", format = "%b", major = "2 months", - minor = "months") + +scale_x_date("", breaks = "2 months", minor_breaks = "1 month", + labels = date_format("%b")) + scale_y_continuous(name = "", breaks = c(0, 500, 1000)) + scale_colour_manual(breaks = c("red", "black"), values = c("red", "black")) + opts(legend.position = "none") -ggsave("bridge-blockings.png", height = 9, width = 8) +ggsave("bridge-blockings.pdf", height = 9, width = 8)

1 0

[metrics-tasks/master] Update #6232 graphing code to ASes.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit a213be8ad0796edb4e9ffdfa470f17fe2671642e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:28:59 2012 +0200 Update #6232 graphing code to ASes. --- task-6232/plot-entropy.R | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/task-6232/plot-entropy.R b/task-6232/plot-entropy.R index ab57678..0ed4bac 100644 --- a/task-6232/plot-entropy.R +++ b/task-6232/plot-entropy.R @@ -4,18 +4,21 @@ library(scales) d <- read.csv("entropy.csv", header = FALSE, col.names = c("validafter", "all", "max_all", "exit", "max_exit", - "guard", "max_guard", "country", "max_country")) + "guard", "max_guard", "country", "max_country", "as", "max_as")) e <- aggregate( list(all = d$all / d$max_all, exit = d$exit / d$max_exit, - guard = d$guard / d$max_guard, country = d$country / d$max_country), + guard = d$guard / d$max_guard, country = d$country / d$max_country, + as = d$as / d$max_as), by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), FUN = median) e <- melt(e, "date") -e <- data.frame(date = e$date, variable = ifelse(e$variable == "all", - "All relays", ifelse(e$variable == "exit", "All exits", - ifelse(e$variable == "guard", "All guards", "All countries"))), - value = e$value) +e <- data.frame(date = e$date, variable = + ifelse(e$variable == "all", "All relays", + ifelse(e$variable == "exit", "All exits", + ifelse(e$variable == "guard", "All guards", + ifelse(e$variable == "country", "All countries", + "All ASes")))), value = e$value) ggplot(e, aes(x = date, y = value)) + geom_line() + facet_wrap(~ variable) + @@ -26,7 +29,8 @@ ggsave("degree-of-anonymity.png", width = 8, height = 6, dpi = 100) f <- aggregate(list(all = d$all, max_all = d$max_all, exit = d$exit, max_exit = d$max_exit, guard = d$guard, max_guard = d$max_guard, - country = d$country, max_country = d$max_country), + country = d$country, max_country = d$max_country, as = d$as, + max_as = d$max_as), by = list(date = as.Date(d$validafter, origin = "1970-01-01 00:00:00")), FUN = median) f <- rbind( @@ -37,7 +41,9 @@ f <- rbind( data.frame(date = f$date, entropy = f$guard, max = f$max_guard, type = "All guards"), data.frame(date = f$date, entropy = f$country, max = f$max_country, - type = "All countries")) + type = "All countries"), + data.frame(date = f$date, entropy = f$as, max = f$max_as, + type = "All ASes")) f <- melt(f, c("date", "type")) ggplot(f, aes(x = date, y = value, colour = variable)) + geom_line() +

1 0

[metrics-tasks/master] Update #4255 graphing code to ggplot2 0.9.0.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit ba24732e4d23671da527b45d0fb8e35c54470f95 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 12:31:38 2012 +0200 Update #4255 graphing code to ggplot2 0.9.0. --- task-4255/stability.R | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/task-4255/stability.R b/task-4255/stability.R index c46266e..b4f162e 100644 --- a/task-4255/stability.R +++ b/task-4255/stability.R @@ -1,4 +1,7 @@ library(ggplot2) +library(scales) +library(grid) +library(reshape) stability <- read.csv("stability.csv", stringsAsFactors = FALSE) d <- stability[stability$time > '2010-07' & stability$time < '2011-07', ] @@ -18,8 +21,8 @@ d <- rbind(d, y = NA, ymin = NA, ymax = NA)) ggplot(d, aes(x = as.Date(x), y = y, ymin = ymin, ymax = ymax)) + geom_line() + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_y_continuous(name = "Running \nbridges ", limits = c(0, max(d_mean$running, na.rm = TRUE))) + opts(axis.title.x = theme_text(size = 12 * 0.8, face = "bold", @@ -35,8 +38,8 @@ d <- stability[stability$time > '2010-07-10' & stability$time < '2010-07-31', ] a <- ggplot(d, aes(x = as.POSIXct(time), y = running)) + geom_point(size = 0.75) + -scale_x_datetime(name = "", major = "1 week", minor = "1 day", - format = "%b %d, %Y") + +scale_x_datetime(name = "", breaks = "1 week", minor_breaks = "1 day", + labels = date_format("%b %d, %Y")) + scale_y_continuous(name = "Running \nbridges ", limits = c(0, max(d$running, na.rm = TRUE))) + opts(axis.title.x = theme_text(size = 12 * 0.8, face = "bold", @@ -53,8 +56,8 @@ d <- rbind( data.frame(time = e$time, running = 687, colour = "grey")) b <- ggplot(d, aes(x = as.POSIXct(time), y = running, colour = colour)) + geom_point(size = 0.75) + -scale_x_datetime(name = "", major = "1 week", minor = "1 day", - format = "%b %d, %Y") + +scale_x_datetime(name = "", breaks = "1 week", minor_breaks = "1 day", + labels = date_format("%b %d, %Y")) + scale_y_continuous(name = "Running \nbridges ", limits = c(0, max(d$running, na.rm = TRUE))) + scale_colour_manual(values = c("black", "grey60")) + @@ -108,8 +111,8 @@ geom_line() +#colour = "grey30") + geom_hline(data = e, aes(yintercept = yintercept), colour = "gray40", linetype = 2) + facet_grid(var ~ ., scales = "free_y") + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_y_continuous(name = "") + opts(axis.title.x = theme_text(size = 12 * 0.8, face = "bold", hjust = 0.5), @@ -132,9 +135,9 @@ d <- melt(d, id = "date") ggplot(d, aes(x = date, y = value / 10000, linetype = variable)) + geom_line() + scale_y_continuous(name = paste("10th perc. \nWFU in \n", - "the future ", sep = ""), formatter = "percent", limits = c(0, 1)) + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + + "the future ", sep = ""), labels = percent, limits = c(0, 1)) + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_linetype_manual(name = paste("Requirements for\nconsidering", "a\nbridge as stable\n"), breaks = c("perc10wfu50wfu50wmtbac", "perc10wfu50wfu0wmtbac", "perc10wfu0wfu50wmtbac", @@ -166,8 +169,8 @@ scale_y_continuous(name = paste("10th perc. \ntime on \nthe same \n", breaks = seq(0, max(d$value / 86400, na.rm = TRUE), 7), minor = seq(0, max(d$value / 86400, na.rm = TRUE), 1), limits = c(0, max(d$value / 86400, na.rm = TRUE))) + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_linetype_manual(name = paste("Requirements for\nconsidering", "a\nbridge as stable\n"), breaks = c("perc10tosa50wfu50wmtbac", "perc10tosa0wfu50wmtbac", "perc10tosa50wfu0wmtbac", @@ -207,9 +210,9 @@ d <- rbind(d, ggplot(d, aes(x = x, y = y, linetype = variable)) + geom_line() + scale_y_continuous(name = "Fraction of \nRunning \nbridges ", - formatter = "percent", limits = c(0, max(d$y, na.rm = TRUE))) + -scale_x_date(name = "", major = "3 months", minor = "1 month", - format = "%b %Y") + + labels = percent, limits = c(0, max(d$y, na.rm = TRUE))) + +scale_x_date("", breaks = "3 months", minor_breaks = "1 month", + labels = date_format("%b %Y")) + scale_linetype_manual(name = paste("\nRequirements for\nconsidering", "a\nbridge as stable\n"), values = c(3, 2, 4)) + opts(axis.title.x = theme_text(size = 12 * 0.8, face = "bold",

1 0

[metrics-web/master] Close a few readers/streams, spotted by Eclipse.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit a12af627cdb812d0ef32fb99e5383b4993ee764e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 09:00:33 2012 +0200 Close a few readers/streams, spotted by Eclipse. --- .../ernie/cron/ExoneraTorDatabaseImporter.java | 1 + src/org/torproject/ernie/web/RObjectGenerator.java | 1 + .../torproject/ernie/web/ResearchDataServlet.java | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java index c87236e..c23b4eb 100755 --- a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java +++ b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java @@ -153,6 +153,7 @@ public class ExoneraTorDatabaseImporter { + "contains a corrupt entry in line " + lineNumber + ". Ignoring parse history file entirely."); lastImportHistory.clear(); + br.close(); return; } long lastModified = Long.parseLong(parts[0]); diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index 993bc59..1b56f31 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -410,6 +410,7 @@ public class RObjectGenerator implements ServletContextListener { while ((length = bis.read(buffer)) > 0) { baos.write(buffer, 0, length); } + bis.close(); this.result = baos.toByteArray(); } catch (IOException e) { return; diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index e8ae79d..8adb06c 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -54,6 +54,7 @@ public class ResearchDataServlet extends HttpServlet { dataFileUrls.add(line); } } + br.close(); } } catch (SecurityException e) { /* We're not permitted to read the file with URLs. Ignore. */

1 0

[metrics-db/master] Close a few readers/streams, spotted by Eclipse.
by karsten＠torproject.org 25 Jul '12

25 Jul '12

commit 7d2ec97550c468b20d8c653af72509ed7bfee206 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 25 08:58:29 2012 +0200 Close a few readers/streams, spotted by Eclipse. --- src/org/torproject/ernie/db/ArchiveWriter.java | 1 + .../torproject/ernie/db/BridgeSnapshotReader.java | 1 + .../ernie/db/SanitizedBridgesWriter.java | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/ArchiveWriter.java b/src/org/torproject/ernie/db/ArchiveWriter.java index 1d37edc..d1b9499 100644 --- a/src/org/torproject/ernie/db/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/ArchiveWriter.java @@ -317,6 +317,7 @@ public class ArchiveWriter { } } } + br.close(); sb.append(String.format("%nC, %s, %d/%d (%.1f%%), " + "%d/%d (%.1f%%), %d/%d (%.1f%%)", validAfterTime, foundVotes, allVotes, diff --git a/src/org/torproject/ernie/db/BridgeSnapshotReader.java b/src/org/torproject/ernie/db/BridgeSnapshotReader.java index 0de9d83..f21794d 100644 --- a/src/org/torproject/ernie/db/BridgeSnapshotReader.java +++ b/src/org/torproject/ernie/db/BridgeSnapshotReader.java @@ -174,6 +174,7 @@ public class BridgeSnapshotReader { descriptorImportHistory.add(fileDigest); parsedFiles++; } + bis.close(); } in.close(); diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 366da00..4f72c6a 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -109,6 +109,7 @@ public class SanitizedBridgesWriter { byte[] secret = Hex.decodeHex(parts[1].toCharArray()); this.secretsForHashingIPAddresses.put(month, secret); } + br.close(); if (!this.persistenceProblemWithSecrets) { this.logger.fine("Read " + this.secretsForHashingIPAddresses.size() + " secrets for "

1 0

[ooni-probe/master] Add wrapper scripts to avoid PYTHONPATH madness!
by art＠torproject.org 24 Jul '12

24 Jul '12

commit 5cfd7e7bff7728557a5a628f86c2922837f2b24d Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jul 24 22:41:45 2012 +0200 Add wrapper scripts to avoid PYTHONPATH madness! --- bin/oonib | 4 ++++ bin/ooniprobe | 4 ++++ oonib/lib/__init__.py | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/oonib b/bin/oonib new file mode 100755 index 0000000..df7c62f --- /dev/null +++ b/bin/oonib @@ -0,0 +1,4 @@ +#!/bin/sh +ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" +export PYTHONPATH=$PYTHONPATH:$ROOT +twistd -ny $ROOT/oonib/oonibackend.py diff --git a/bin/ooniprobe b/bin/ooniprobe new file mode 100755 index 0000000..505e1c2 --- /dev/null +++ b/bin/ooniprobe @@ -0,0 +1,4 @@ +#!/bin/sh +ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" +export PYTHONPATH=$PYTHONPATH:$ROOT +python $ROOT/ooni/ooniprobe.py diff --git a/oonib/lib/__init__.py b/oonib/lib/__init__.py index 2f1b6f9..5b4380a 100644 --- a/oonib/lib/__init__.py +++ b/oonib/lib/__init__.py @@ -1,6 +1,8 @@ from ooni.utils import Storage from ooni.utils.config import Config +import os +root = os.path.normpath(os.path.join(os.path.realpath(__file__), '../../')) config = Storage() -config.main = Config('main', 'oonibackend.conf') -config.daphn3 = Config('daphn3', 'oonibackend.conf') +config.main = Config('main', os.path.join(root, 'oonibackend.conf')) +config.daphn3 = Config('daphn3', os.path.join(root, 'oonibackend.conf'))

1 0