- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
by nickm＠torproject.org 09 Nov '11

09 Nov '11

commit 8adec8705014ef7e788a1dcf5d3a4a2d85a328ed Merge: 0cc7a63 56546324 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 11:03:20 2011 -0500 Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2 changes/bug4426 | 8 ++++++++ src/or/rendservice.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/master] Don't warn when compiling with --disable-threads
by nickm＠torproject.org 09 Nov '11

09 Nov '11

commit 0cc7a63fc0f8e23e0dc01a36de9a369671bdd4d5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 8 08:09:40 2011 +0100 Don't warn when compiling with --disable-threads STMT_VOID semantics suggested by nick, thanks! --- changes/bug4437 | 5 +++++ src/common/compat.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug4437 b/changes/bug4437 new file mode 100644 index 0000000..985c670 --- /dev/null +++ b/changes/bug4437 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't warn about unused log_mutex in log.c when building with + --disable-threads using a recent GCC. Fixes bug 4437; bugfix on + 0.1.0.6-rc which introduced --disable-threads. + diff --git a/src/common/compat.h b/src/common/compat.h index eb79b04..7e6058a 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -177,6 +177,10 @@ extern INLINE double U64_TO_DBL(uint64_t x) { /** Expands to a syntactically valid empty statement. */ #define STMT_NIL (void)0 +/** Expands to a syntactically valid empty statement, explicitly (void)ing its + * argument. */ +#define STMT_VOID(a) while (0) { (void)(a); } + #ifdef __GNUC__ /** STMT_BEGIN and STMT_END are used to wrap blocks inside macros so that * the macro can be used as if it were a single C statement. */ @@ -610,7 +614,7 @@ void tor_threads_init(void); #else #define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int))) #define tor_mutex_init(m) STMT_NIL -#define tor_mutex_acquire(m) STMT_NIL +#define tor_mutex_acquire(m) STMT_VOID(m) #define tor_mutex_release(m) STMT_NIL #define tor_mutex_free(m) STMT_BEGIN tor_free(m); STMT_END #define tor_mutex_uninit(m) STMT_NIL

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 09 Nov '11

09 Nov '11

commit 9452b65680deee698dbc8c4eae929aba3b75b198 Merge: d4489a2 0cc7a63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 10:28:43 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4437 | 5 +++++ src/common/compat.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Don't warn when compiling with --disable-threads
by nickm＠torproject.org 09 Nov '11

09 Nov '11

commit 0cc7a63fc0f8e23e0dc01a36de9a369671bdd4d5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 8 08:09:40 2011 +0100 Don't warn when compiling with --disable-threads STMT_VOID semantics suggested by nick, thanks! --- changes/bug4437 | 5 +++++ src/common/compat.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug4437 b/changes/bug4437 new file mode 100644 index 0000000..985c670 --- /dev/null +++ b/changes/bug4437 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't warn about unused log_mutex in log.c when building with + --disable-threads using a recent GCC. Fixes bug 4437; bugfix on + 0.1.0.6-rc which introduced --disable-threads. + diff --git a/src/common/compat.h b/src/common/compat.h index eb79b04..7e6058a 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -177,6 +177,10 @@ extern INLINE double U64_TO_DBL(uint64_t x) { /** Expands to a syntactically valid empty statement. */ #define STMT_NIL (void)0 +/** Expands to a syntactically valid empty statement, explicitly (void)ing its + * argument. */ +#define STMT_VOID(a) while (0) { (void)(a); } + #ifdef __GNUC__ /** STMT_BEGIN and STMT_END are used to wrap blocks inside macros so that * the macro can be used as if it were a single C statement. */ @@ -610,7 +614,7 @@ void tor_threads_init(void); #else #define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int))) #define tor_mutex_init(m) STMT_NIL -#define tor_mutex_acquire(m) STMT_NIL +#define tor_mutex_acquire(m) STMT_VOID(m) #define tor_mutex_release(m) STMT_NIL #define tor_mutex_free(m) STMT_BEGIN tor_free(m); STMT_END #define tor_mutex_uninit(m) STMT_NIL

1 0

[metrics-web/master] Redirect stderr, or it will be sent to the mailing list.
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit 889c5200bdc6bb18b1f23f3e2832878f4c84be59 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:51:04 2011 +0100 Redirect stderr, or it will be sent to the mailing list. In theory, our cronjob shouldn't include stderr in whatever it pipes to mail. But Ant doesn't make a difference between stdout and stderr and writes everything to stdout. When we grep Ant's output we include the stderr part, too. Now we explicitly redirect stderr to a file. We usually don't need it, but when something goes wrong, we might want to take a look. --- build.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index 32a450f..570c973 100644 --- a/build.xml +++ b/build.xml @@ -64,7 +64,8 @@ <target name="chc" depends="compile"> <java fork="true" maxmemory="512m" - classname="org.torproject.chc.Main"> + classname="org.torproject.chc.Main" + error="chc-stderr.txt"> <classpath refid="classpath"/> </java> </target>

1 0

[tor-cloud/master] Comment out some stuff and add another echo
by runa＠torproject.org 09 Nov '11

09 Nov '11

commit 83f797372dda229327c08c77a4a5018a9f885ea4 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Nov 9 08:38:18 2011 +0000 Comment out some stuff and add another echo --- build.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 760f867..0d4e47b 100755 --- a/build.sh +++ b/build.sh @@ -87,8 +87,8 @@ sleep 20 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # TODO: fix GPG verification, exit on failed verification -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "grep 'BAD signature' verify.txt &> /dev/null && if [ `echo $?` = "0" ]; then echo 'Cannot verify the signature, stopping here...'; fi" +#ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt" +#ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "grep 'BAD signature' verify.txt &> /dev/null && if [ `echo $?` = "0" ]; then echo 'Cannot verify the signature, stopping here...'; fi" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local" @@ -131,6 +131,7 @@ NOW=$(date +"%m-%d-%Y") RANDOM=$(echo `</dev/urandom tr -dc A-Za-z0-9 | head -c8`) # Finally register and publish the image +echo "Registering and publishing the image..." ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}]" # cleanup

1 0

[tor-cloud/master] Make sure we mount the correct image, and not something that does not exist
by runa＠torproject.org 09 Nov '11

09 Nov '11

commit 9ba9c825d858567ac888bc2ec523d7788e19ddfd Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Nov 9 07:46:44 2011 +0000 Make sure we mount the correct image, and not something that does not exist --- build.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index d09580a..760f867 100755 --- a/build.sh +++ b/build.sh @@ -84,10 +84,11 @@ ec2-attach-volume --instance ${iid} --region ${region} --device /dev/sdh ${vol} echo "After attaching the volume, sleep for 20 seconds..." sleep 20 -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-uec-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # TODO: fix GPG verification, exit on failed verification -#ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt && cat /mnt/verify.txt | grep Good | awk {'print $2'})" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "grep 'BAD signature' verify.txt &> /dev/null && if [ `echo $?` = "0" ]; then echo 'Cannot verify the signature, stopping here...'; fi" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local"

1 0

[metrics-tasks/master] Add a bash script to make graphs (#2394).
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit abef2d21b1af690b55d745b4173da1740a2ffa14 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:31:09 2011 +0100 Add a bash script to make graphs (#2394). --- task-2394/README | 6 ++++++ task-2394/plot.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/task-2394/README b/task-2394/README index b58f1e8..dbf31fb 100644 --- a/task-2394/README +++ b/task-2394/README @@ -1,6 +1,12 @@ Visualize self-reported vs. measured bandwidth of relays ======================================================== +You can either + + - Run plot.sh. + +or run the steps manually: + - Download a single consensus and all referenced votes and server descriptors from the metrics website, e.g., diff --git a/task-2394/plot.sh b/task-2394/plot.sh new file mode 100755 index 0000000..d3744e0 --- /dev/null +++ b/task-2394/plot.sh @@ -0,0 +1,36 @@ +#!/bin/bash +COMMONS="commons-codec-1.4.jar" +CURRENT=`date -u +%Y-%m-%d-%H-00-00` + +if [ ! -f commons-codec-1.4.jar ]; then + echo "$COMMONS not found. Please download Apache Commons Codec 1.4." + exit 1 +fi + +if [ ! -d descriptors ]; then + mkdir descriptors +else + rm descriptors/* +fi + +echo "Downloading descriptors from the metrics website..." +curl https://metrics.torproject.org/votes?valid-after=$CURRENT \ + > descriptors/$CURRENT-votes +curl https://metrics.torproject.org/consensus?valid-after=$CURRENT \ + > descriptors/$CURRENT-consensus +curl https://metrics.torproject.org/serverdesc?valid-after=$CURRENT \ + > descriptors/$CURRENT-serverdesc + +if [ ! -f ParseDescriptors.class ]; then + echo "Compiling..." + javac -cp commons-codec-1.4.jar ParseDescriptors.java +fi + +echo "Parsing descriptors..." +java -cp .:commons-codec-1.4.jar ParseDescriptors + +echo "Plotting..." +R --slave -f bandwidth-comparison.R + +echo "Terminating. Please find the .png files in this directory." +

1 0

[metrics-tasks/master] There's a new bwauth in town, and it's going to be orange.
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit d91ae44fe39a8ed68368427e8b90dc027c4aa41c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:27:56 2011 +0100 There's a new bwauth in town, and it's going to be orange. --- task-2394/ParseDescriptors.java | 2 ++ task-2394/bandwidth-comparison.R | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/task-2394/ParseDescriptors.java b/task-2394/ParseDescriptors.java index 7ddab73..fbbc4b5 100644 --- a/task-2394/ParseDescriptors.java +++ b/task-2394/ParseDescriptors.java @@ -42,6 +42,8 @@ public class ParseDescriptors { "moria1"); bandwidthAuthorities.put("ED03BB616EB2F60BEC80151114BB25CEF515B226", "gabelmoo"); + bandwidthAuthorities.put("49015F787433103580E3B66A1707A00E60F2D15B", + "maatuska"); BufferedWriter bw = new BufferedWriter(new FileWriter( "bandwidth-comparison.csv")); bw.write("validafter,fingerprint,nickname,category," diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R index 50739b7..56095ef 100644 --- a/task-2394/bandwidth-comparison.R +++ b/task-2394/bandwidth-comparison.R @@ -40,6 +40,7 @@ cdf_relays_category_votes <- function(data, category) { urras <- sort(d$urrasbandwidth * 1000 / d$descriptorbandwidth) moria1 <- sort(d$moria1bandwidth * 1000 / d$descriptorbandwidth) gabelmoo <- sort(d$gabelmoobandwidth * 1000 / d$descriptorbandwidth) + maatuska <- sort(d$maatuskabandwidth * 1000 / d$descriptorbandwidth) d <- data.frame(x = consensus, y = (1:length(consensus)) / length(consensus), source = "consensus", @@ -68,6 +69,12 @@ cdf_relays_category_votes <- function(data, category) { source = "gabelmoo", category = category)) } + if (length(maatuska) > 0) { + d <- rbind(d, data.frame(x = maatuska, + y = (1:length(maatuska)) / length(maatuska), + source = "maatuska", + category = category)) + } d } relays_category_votes <- rbind( @@ -87,7 +94,8 @@ scale_y_continuous("Fraction of relays\n", limits = c(0, 1), formatter = "percent") + scale_colour_manual("", c("consensus" = "black", "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), - "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5), + "maatuska" = alpha("orange", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", "consensus and votes\n"), legend.position = "right") @@ -127,7 +135,10 @@ cdf_measured_category_votes <- function(data, category) { measured = d$moria1bandwidth), "moria1", category), wecdf(data.frame( ratio = d$gabelmoobandwidth * 1000 / d$descriptorbandwidth, - measured = d$gabelmoobandwidth), "gabelmoo", category)) + measured = d$gabelmoobandwidth), "gabelmoo", category), + wecdf(data.frame( + ratio = d$maatuskabandwidth * 1000 / d$descriptorbandwidth, + measured = d$maatuskabandwidth), "maatuska", category)) d } measured_category_votes <- rbind( @@ -147,7 +158,8 @@ scale_y_continuous("Fraction of measured bandwidth\n", limits = c(0, 1), formatter = "percent") + scale_colour_manual("", c("consensus" = "black", "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), - "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5), + "maatuska" = alpha("orange", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", "consensus and votes\n"), legend.position = "right")

1 0

[metrics-tasks/master] Allow for the case that we're missing bwauth results (#2394).
by karsten＠torproject.org 09 Nov '11

09 Nov '11

commit 6eab08b32522d3d1640636822ba862578149f1b1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 9 08:16:58 2011 +0100 Allow for the case that we're missing bwauth results (#2394). --- task-2394/bandwidth-comparison.R | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R index a4b0329..50739b7 100644 --- a/task-2394/bandwidth-comparison.R +++ b/task-2394/bandwidth-comparison.R @@ -40,27 +40,34 @@ cdf_relays_category_votes <- function(data, category) { urras <- sort(d$urrasbandwidth * 1000 / d$descriptorbandwidth) moria1 <- sort(d$moria1bandwidth * 1000 / d$descriptorbandwidth) gabelmoo <- sort(d$gabelmoobandwidth * 1000 / d$descriptorbandwidth) - d <- rbind( - data.frame(x = consensus, + d <- data.frame(x = consensus, y = (1:length(consensus)) / length(consensus), source = "consensus", - category = category), - data.frame(x = urras, + category = category) + if (length(urras) > 0) { + d <- rbind(d, data.frame(x = urras, y = (1:length(urras)) / length(urras), source = "urras", - category = category), - data.frame(x = ides, + category = category)) + } + if (length(ides) > 0) { + d <- rbind(d, data.frame(x = ides, y = (1:length(ides)) / length(ides), source = "ides", - category = category), - data.frame(x = moria1, + category = category)) + } + if (length(moria1) > 0) { + d <- rbind(d, data.frame(x = moria1, y = (1:length(moria1)) / length(moria1), source = "moria1", - category = category), - data.frame(x = gabelmoo, + category = category)) + } + if (length(gabelmoo) > 0) { + d <- rbind(d, data.frame(x = gabelmoo, y = (1:length(gabelmoo)) / length(gabelmoo), source = "gabelmoo", category = category)) + } d } relays_category_votes <- rbind(

1 0