- tor-commits - lists.torproject.org

[tor/master] Clean up bridge-stats code.
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit d690a99dfe65ba164aa3de0662be2a8fedc69b01 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 4 14:45:24 2011 +0200 Clean up bridge-stats code. Only write a bridge-stats string if bridge stats have been initialized. This behavior is similar to dirreq-stats, entry-stats, etc. Also add a few unit tests for the bridge-stats code. --- src/or/geoip.c | 8 +++++--- src/or/geoip.h | 1 + src/test/test.c | 23 ++++++++++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index e525b2a..67dea96 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1197,8 +1197,8 @@ static char *bridge_stats_extrainfo = NULL; /** Return a newly allocated string holding our bridge usage stats by country * in a format suitable for inclusion in an extrainfo document. Return NULL on * failure. */ -static char * -format_bridge_stats_extrainfo(time_t now) +char * +geoip_format_bridge_stats(time_t now) { char *out = NULL, *data = NULL; long duration = now - start_of_bridge_stats_interval; @@ -1206,6 +1206,8 @@ format_bridge_stats_extrainfo(time_t now) if (duration < 0) return NULL; + if (!start_of_bridge_stats_interval) + return NULL; /* Not initialized. */ format_iso_time(written, now); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); @@ -1255,7 +1257,7 @@ geoip_bridge_stats_write(time_t now) geoip_remove_old_clients(start_of_bridge_stats_interval); /* Generate formatted string */ - val = format_bridge_stats_extrainfo(now); + val = geoip_format_bridge_stats(now); if (val == NULL) goto done; diff --git a/src/or/geoip.h b/src/or/geoip.h index 3372260..ce38419 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -53,6 +53,7 @@ void geoip_entry_stats_term(void); void geoip_reset_entry_stats(time_t now); char *geoip_format_entry_stats(time_t now); void geoip_bridge_stats_init(time_t now); +char *geoip_format_bridge_stats(time_t now); time_t geoip_bridge_stats_write(time_t now); void geoip_bridge_stats_term(void); const char *geoip_get_bridge_stats_extrainfo(time_t); diff --git a/src/test/test.c b/src/test/test.c index fe8146a..605e44c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1483,7 +1483,10 @@ test_geoip(void) int i, j; time_t now = 1281533250; /* 2010-08-11 13:27:30 UTC */ char *s = NULL; - const char *dirreq_stats_1 = + const char *bridge_stats_1 = + "bridge-stats-end 2010-08-12 13:27:30 (86400 s)\n" + "bridge-ips zz=24,xy=8\n", + *dirreq_stats_1 = "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n" "dirreq-v3-ips ab=8\n" "dirreq-v2-ips \n" @@ -1594,6 +1597,24 @@ test_geoip(void) test_assert(s); test_streq("zz=24,xy=8", s); + /* Start testing bridge statistics by making sure that we don't output + * bridge stats without initializing them. */ + s = geoip_format_bridge_stats(now + 86400); + test_assert(!s); + + /* Initialize stats and generate the bridge-stats history string out of + * the connecting clients added above. */ + geoip_bridge_stats_init(now); + s = geoip_format_bridge_stats(now + 86400); + test_streq(bridge_stats_1, s); + tor_free(s); + + /* Stop collecting bridge stats and make sure we don't write a history + * string anymore. */ + geoip_bridge_stats_term(); + s = geoip_format_bridge_stats(now + 86400); + test_assert(!s); + /* Stop being a bridge and start being a directory mirror that gathers * directory request statistics. */ geoip_bridge_stats_term();

1 0

[tor/master] Replace files in stats/ rather than appending to them.
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit a6a127c833eace1100aca7ab8ad118862bb8a8b9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 4 20:53:53 2011 +0200 Replace files in stats/ rather than appending to them. Right now, we append statistics to files in the stats/ directory for half of the statistics, whereas we overwrite these files for the other half. In particular, we append buffer, dirreq, and entry stats and overwrite exit, connection, and bridge stats. Appending to files was useful when we didn't include stats in extra-info descriptors, because otherwise we'd have to copy them away to prevent Tor from overwriting them. But now that we include statistics in extra-info descriptors, it makes no sense to keep the old statistics forever. We should change the behavior to overwriting instead of appending for all statistics. Implements #2930. --- changes/bug2930 | 5 +++++ src/or/geoip.c | 4 ++-- src/or/rephist.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug2930 b/changes/bug2930 new file mode 100644 index 0000000..8d28664 --- /dev/null +++ b/changes/bug2930 @@ -0,0 +1,5 @@ + o Minor features: + - Replace files in stats/ rather than appending to them. Now that we + include statistics in extra-info descriptors, it makes no sense to + keep old statistics forever. Implements #2930. + diff --git a/src/or/geoip.c b/src/or/geoip.c index 5596ff3..d02666b 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -996,7 +996,7 @@ geoip_dirreq_stats_write(time_t now) data_v2 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); data_v3 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_file); if (!out) goto done; @@ -1329,7 +1329,7 @@ geoip_entry_stats_write(time_t now) filename = get_datadir_fname2("stats", "entry-stats"); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_file); if (!out) goto done; diff --git a/src/or/rephist.c b/src/or/rephist.c index 1ad08fe..672e3f3 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2490,7 +2490,7 @@ rep_hist_buffer_stats_write(time_t now) if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "buffer-stats"); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_file); if (!out) goto done;

1 0

[tor/master] Create cell-stats history even if we didn't see a single circuit.
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit 8f4e5fa2b5e78d04ac8d656f58db22110f2e450d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 3 13:33:48 2011 +0200 Create cell-stats history even if we didn't see a single circuit. So far, if we didn't see a single circuit, we refrained from generating a cell-stats string and logged a warning. Nobody will notice the warning, and people will wonder why there's no cell-stats string in the extra-info descriptor. The better behavior is to generate a cell-stats string with all zeros. --- src/or/rephist.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 672e3f3..a5a828d 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2455,32 +2455,31 @@ rep_hist_buffer_stats_write(time_t now) /* add current circuits to stats */ for (circ = _circuit_get_global_list(); circ; circ = circ->next) rep_hist_buffer_stats_add_circ(circ, now); - /* calculate deciles */ + + /* Calculate deciles if we saw at least one circuit. */ memset(processed_cells, 0, SHARES * sizeof(int)); memset(circs_in_share, 0, SHARES * sizeof(int)); memset(queued_cells, 0, SHARES * sizeof(double)); memset(time_in_queue, 0, SHARES * sizeof(double)); if (!circuits_for_buffer_stats) circuits_for_buffer_stats = smartlist_create(); - smartlist_sort(circuits_for_buffer_stats, - _buffer_stats_compare_entries); number_of_circuits = smartlist_len(circuits_for_buffer_stats); - if (number_of_circuits < 1) { - log_info(LD_HIST, "Attempt to write cell statistics to disk failed. " - "We haven't seen a single circuit to report about."); - goto done; - } - i = 0; - SMARTLIST_FOREACH_BEGIN(circuits_for_buffer_stats, - circ_buffer_stats_t *, stat) - { - int share = i++ * SHARES / number_of_circuits; - processed_cells[share] += stat->processed_cells; - queued_cells[share] += stat->mean_num_cells_in_queue; - time_in_queue[share] += stat->mean_time_cells_in_queue; - circs_in_share[share]++; + if (number_of_circuits > 0) { + smartlist_sort(circuits_for_buffer_stats, + _buffer_stats_compare_entries); + i = 0; + SMARTLIST_FOREACH_BEGIN(circuits_for_buffer_stats, + circ_buffer_stats_t *, stat) + { + int share = i++ * SHARES / number_of_circuits; + processed_cells[share] += stat->processed_cells; + queued_cells[share] += stat->mean_num_cells_in_queue; + time_in_queue[share] += stat->mean_time_cells_in_queue; + circs_in_share[share]++; + } + SMARTLIST_FOREACH_END(stat); } - SMARTLIST_FOREACH_END(stat); + /* clear buffer stats history */ SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, stat, tor_free(stat));

1 0

[tor/master] Clean up rep_hist_buffer_stats_write().
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit 95ebd01e6225fecc2af6d9adb0167f1ab6a363fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 3 13:34:29 2011 +0200 Clean up rep_hist_buffer_stats_write(). We later want to split this function into one function that generates the buffer-stats string and one that writes it to disk. --- src/or/rephist.c | 95 +++++++++++++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 44 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index a5a828d..ce0152e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2434,24 +2434,25 @@ time_t rep_hist_buffer_stats_write(time_t now) { char *statsdir = NULL, *filename = NULL; - char written[ISO_TIME_LEN+1]; open_file_t *open_file = NULL; FILE *out; #define SHARES 10 int processed_cells[SHARES], circs_in_share[SHARES], number_of_circuits, i; double queued_cells[SHARES], time_in_queue[SHARES]; - smartlist_t *str_build = NULL; - char *str = NULL, *buf = NULL; + char *buf = NULL; circuit_t *circ; + smartlist_t *processed_cells_strings, *queued_cells_strings, + *time_in_queue_strings; + char *processed_cells_string, *queued_cells_string, + *time_in_queue_string; + char t[ISO_TIME_LEN+1]; if (!start_of_buffer_stats_interval) return 0; /* Not initialized. */ if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now) goto done; /* Not ready to write */ - str_build = smartlist_create(); - /* add current circuits to stats */ for (circ = _circuit_get_global_list(); circ; circ = circ->next) rep_hist_buffer_stats_add_circ(circ, now); @@ -2484,53 +2485,61 @@ rep_hist_buffer_stats_write(time_t now) SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, stat, tor_free(stat)); smartlist_clear(circuits_for_buffer_stats); - /* write to file */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) - goto done; - filename = get_datadir_fname2("stats", "buffer-stats"); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, - 0600, &open_file); - if (!out) - goto done; - format_iso_time(written, now); - if (fprintf(out, "cell-stats-end %s (%d s)\n", written, - (unsigned) (now - start_of_buffer_stats_interval)) < 0) - goto done; + + /* Write deciles to strings. */ + processed_cells_strings = smartlist_create(); + queued_cells_strings = smartlist_create(); + time_in_queue_strings = smartlist_create(); for (i = 0; i < SHARES; i++) { tor_asprintf(&buf,"%d", !circs_in_share[i] ? 0 : processed_cells[i] / circs_in_share[i]); - smartlist_add(str_build, buf); + smartlist_add(processed_cells_strings, buf); } - str = smartlist_join_strings(str_build, ",", 0, NULL); - if (fprintf(out, "cell-processed-cells %s\n", str) < 0) - goto done; - tor_free(str); - SMARTLIST_FOREACH(str_build, char *, c, tor_free(c)); - smartlist_clear(str_build); for (i = 0; i < SHARES; i++) { tor_asprintf(&buf, "%.2f", circs_in_share[i] == 0 ? 0.0 : queued_cells[i] / (double) circs_in_share[i]); - smartlist_add(str_build, buf); + smartlist_add(queued_cells_strings, buf); } - str = smartlist_join_strings(str_build, ",", 0, NULL); - if (fprintf(out, "cell-queued-cells %s\n", str) < 0) - goto done; - tor_free(str); - SMARTLIST_FOREACH(str_build, char *, c, tor_free(c)); - smartlist_clear(str_build); for (i = 0; i < SHARES; i++) { tor_asprintf(&buf, "%.0f", circs_in_share[i] == 0 ? 0.0 : time_in_queue[i] / (double) circs_in_share[i]); - smartlist_add(str_build, buf); + smartlist_add(time_in_queue_strings, buf); } - str = smartlist_join_strings(str_build, ",", 0, NULL); - if (fprintf(out, "cell-time-in-queue %s\n", str) < 0) + + /* Join all observations in single strings. */ + processed_cells_string = smartlist_join_strings(processed_cells_strings, + ",", 0, NULL); + queued_cells_string = smartlist_join_strings(queued_cells_strings, + ",", 0, NULL); + time_in_queue_string = smartlist_join_strings(time_in_queue_strings, + ",", 0, NULL); + SMARTLIST_FOREACH(processed_cells_strings, char *, cp, tor_free(cp)); + SMARTLIST_FOREACH(queued_cells_strings, char *, cp, tor_free(cp)); + SMARTLIST_FOREACH(time_in_queue_strings, char *, cp, tor_free(cp)); + smartlist_free(processed_cells_strings); + smartlist_free(queued_cells_strings); + smartlist_free(time_in_queue_strings); + + /* Write everything to disk. */ + statsdir = get_datadir_fname("stats"); + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) + goto done; + filename = get_datadir_fname2("stats", "buffer-stats"); + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, + 0600, &open_file); + if (!out) + goto done; + format_iso_time(t, now); + if (fprintf(out, "cell-stats-end %s (%d s)\n", t, + (unsigned) (now - start_of_buffer_stats_interval)) < 0) + goto done; + if (fprintf(out, "cell-processed-cells %s\n", processed_cells_string) + < 0) + goto done; + if (fprintf(out, "cell-queued-cells %s\n", queued_cells_string) < 0) + goto done; + if (fprintf(out, "cell-time-in-queue %s\n", time_in_queue_string) < 0) goto done; - tor_free(str); - SMARTLIST_FOREACH(str_build, char *, c, tor_free(c)); - smartlist_free(str_build); - str_build = NULL; if (fprintf(out, "cell-circuits-per-decile %d\n", (number_of_circuits + SHARES - 1) / SHARES) < 0) goto done; @@ -2542,11 +2551,9 @@ rep_hist_buffer_stats_write(time_t now) abort_writing_to_file(open_file); tor_free(filename); tor_free(statsdir); - if (str_build) { - SMARTLIST_FOREACH(str_build, char *, c, tor_free(c)); - smartlist_free(str_build); - } - tor_free(str); + tor_free(processed_cells_string); + tor_free(queued_cells_string); + tor_free(time_in_queue_string); #undef SHARES return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL; }

1 0

[tor/master] Separate generation of a buffer-stats string from writing it to disk.
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit 07dc46e7fc7275fa1fcd365e34f318aa164fe7f1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 3 13:26:49 2011 +0200 Separate generation of a buffer-stats string from writing it to disk. The new rep_hist_format_buffer_stats() generates a buffer-stats string that rep_hist_buffer_stats_write() writes to disk. All the state changing (e.g., resetting the buffer-stats history and initializing the next measurement interval) takes place in rep_hist_buffer_stats_write(). That allows us to finally test the buffer-stats code better. --- src/or/rephist.c | 119 +++++++++++++++++++++++++++++++----------------------- src/or/rephist.h | 2 + 2 files changed, 71 insertions(+), 50 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index ce0152e..1b43e5c 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2420,42 +2420,41 @@ _buffer_stats_compare_entries(const void **_a, const void **_b) void rep_hist_buffer_stats_term(void) { - start_of_buffer_stats_interval = 0; + rep_hist_reset_buffer_stats(0); +} + +/** Clear history of circuit statistics and set the measurement interval + * start to now. */ +void +rep_hist_reset_buffer_stats(time_t now) +{ if (!circuits_for_buffer_stats) circuits_for_buffer_stats = smartlist_create(); SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, stat, tor_free(stat)); smartlist_clear(circuits_for_buffer_stats); + start_of_buffer_stats_interval = now; } -/** Write buffer statistics to $DATADIR/stats/buffer-stats and return when - * we would next want to write exit stats. */ -time_t -rep_hist_buffer_stats_write(time_t now) +/** Return a newly allocated string containing the buffer statistics until + * now, or NULL if we're not collecting buffer stats. */ +char * +rep_hist_format_buffer_stats(time_t now) { - char *statsdir = NULL, *filename = NULL; - open_file_t *open_file = NULL; - FILE *out; #define SHARES 10 int processed_cells[SHARES], circs_in_share[SHARES], number_of_circuits, i; double queued_cells[SHARES], time_in_queue[SHARES]; char *buf = NULL; - circuit_t *circ; smartlist_t *processed_cells_strings, *queued_cells_strings, *time_in_queue_strings; char *processed_cells_string, *queued_cells_string, *time_in_queue_string; char t[ISO_TIME_LEN+1]; + char *result; if (!start_of_buffer_stats_interval) - return 0; /* Not initialized. */ - if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now) - goto done; /* Not ready to write */ - - /* add current circuits to stats */ - for (circ = _circuit_get_global_list(); circ; circ = circ->next) - rep_hist_buffer_stats_add_circ(circ, now); + return NULL; /* Not initialized. */ /* Calculate deciles if we saw at least one circuit. */ memset(processed_cells, 0, SHARES * sizeof(int)); @@ -2481,11 +2480,6 @@ rep_hist_buffer_stats_write(time_t now) SMARTLIST_FOREACH_END(stat); } - /* clear buffer stats history */ - SMARTLIST_FOREACH(circuits_for_buffer_stats, circ_buffer_stats_t *, - stat, tor_free(stat)); - smartlist_clear(circuits_for_buffer_stats); - /* Write deciles to strings. */ processed_cells_strings = smartlist_create(); queued_cells_strings = smartlist_create(); @@ -2520,41 +2514,66 @@ rep_hist_buffer_stats_write(time_t now) smartlist_free(queued_cells_strings); smartlist_free(time_in_queue_strings); - /* Write everything to disk. */ + /* Put everything together. */ + format_iso_time(t, now); + tor_asprintf(&result, "cell-stats-end %s (%d s)\n" + "cell-processed-cells %s\n" + "cell-queued-cells %s\n" + "cell-time-in-queue %s\n" + "cell-circuits-per-decile %d\n", + t, (unsigned) (now - start_of_buffer_stats_interval), + processed_cells_string, + queued_cells_string, + time_in_queue_string, + (number_of_circuits + SHARES - 1) / SHARES); + tor_free(processed_cells_string); + tor_free(queued_cells_string); + tor_free(time_in_queue_string); + return result; +#undef SHARES +} + +/** If 24 hours have passed since the beginning of the current buffer + * stats period, write buffer stats to $DATADIR/stats/buffer-stats + * (possibly overwriting an existing file) and reset counters. Return + * when we would next want to write buffer stats or 0 if we never want to + * write. */ +time_t +rep_hist_buffer_stats_write(time_t now) +{ + circuit_t *circ; + char *statsdir = NULL, *filename = NULL, *str = NULL; + + if (!start_of_buffer_stats_interval) + return 0; /* Not initialized. */ + if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now) + goto done; /* Not ready to write */ + + /* Add open circuits to the history. */ + for (circ = _circuit_get_global_list(); circ; circ = circ->next) { + rep_hist_buffer_stats_add_circ(circ, now); + } + + /* Generate history string. */ + str = rep_hist_format_buffer_stats(now); + + /* Reset both buffer history and counters of open circuits. */ + rep_hist_reset_buffer_stats(now); + + /* Try to write to disk. */ statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { + log_warn(LD_HIST, "Unable to create stats/ directory!"); goto done; + } filename = get_datadir_fname2("stats", "buffer-stats"); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, - 0600, &open_file); - if (!out) - goto done; - format_iso_time(t, now); - if (fprintf(out, "cell-stats-end %s (%d s)\n", t, - (unsigned) (now - start_of_buffer_stats_interval)) < 0) - goto done; - if (fprintf(out, "cell-processed-cells %s\n", processed_cells_string) - < 0) - goto done; - if (fprintf(out, "cell-queued-cells %s\n", queued_cells_string) < 0) - goto done; - if (fprintf(out, "cell-time-in-queue %s\n", time_in_queue_string) < 0) - goto done; - if (fprintf(out, "cell-circuits-per-decile %d\n", - (number_of_circuits + SHARES - 1) / SHARES) < 0) - goto done; - finish_writing_to_file(open_file); - open_file = NULL; - start_of_buffer_stats_interval = now; + if (write_str_to_file(filename, str, 0) < 0) + log_warn(LD_HIST, "Unable to write buffer stats to disk!"); + done: - if (open_file) - abort_writing_to_file(open_file); + tor_free(str); tor_free(filename); tor_free(statsdir); - tor_free(processed_cells_string); - tor_free(queued_cells_string); - tor_free(time_in_queue_string); -#undef SHARES return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL; } diff --git a/src/or/rephist.h b/src/or/rephist.h index 5748748..13dee15 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -77,6 +77,8 @@ void rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval); time_t rep_hist_buffer_stats_write(time_t now); void rep_hist_buffer_stats_term(void); +char *rep_hist_format_buffer_stats(time_t now); +void rep_hist_reset_buffer_stats(time_t now); void rep_hist_conn_stats_init(time_t now); void rep_hist_note_or_conn_bytes(uint64_t conn_id, size_t num_read,

1 0

[tor/master] Add unit tests for buffer-stats.
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit 3d3ed853e79d7aea2f41d34813a7fa5a3517dc92 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 3 13:29:03 2011 +0200 Add unit tests for buffer-stats. Now that formatting the buffer-stats string is separate from writing it to disk, we can also decouple the logic to extract stats from circuits and finally write some unit tests for the history code. --- src/or/rephist.c | 35 ++++++++++++++++++++++++++------- src/or/rephist.h | 2 + src/test/test.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 8 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 1b43e5c..25aece3 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2364,23 +2364,41 @@ typedef struct circ_buffer_stats_t { /** List of circ_buffer_stats_t. */ static smartlist_t *circuits_for_buffer_stats = NULL; +/** Remember cell statistics mean_num_cells_in_queue, + * mean_time_cells_in_queue, and processed_cells of a + * circuit. */ +void +rep_hist_add_buffer_stats(double mean_num_cells_in_queue, + double mean_time_cells_in_queue, uint32_t processed_cells) +{ + circ_buffer_stats_t *stat; + if (!start_of_buffer_stats_interval) + return; /* Not initialized. */ + stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); + stat->mean_num_cells_in_queue = mean_num_cells_in_queue; + stat->mean_time_cells_in_queue = mean_time_cells_in_queue; + stat->processed_cells = processed_cells; + if (!circuits_for_buffer_stats) + circuits_for_buffer_stats = smartlist_create(); + smartlist_add(circuits_for_buffer_stats, stat); +} + /** Remember cell statistics for circuit circ at time * end_of_interval and reset cell counters in case the circuit * remains open in the next measurement interval. */ void rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) { - circ_buffer_stats_t *stat; time_t start_of_interval; int interval_length; or_circuit_t *orcirc; + double mean_num_cells_in_queue, mean_time_cells_in_queue; + uint32_t processed_cells; if (CIRCUIT_IS_ORIGIN(circ)) return; orcirc = TO_OR_CIRCUIT(circ); if (!orcirc->processed_cells) return; - if (!circuits_for_buffer_stats) - circuits_for_buffer_stats = smartlist_create(); start_of_interval = (circ->timestamp_created.tv_sec > start_of_buffer_stats_interval) ? circ->timestamp_created.tv_sec : @@ -2388,17 +2406,18 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) interval_length = (int) (end_of_interval - start_of_interval); if (interval_length <= 0) return; - stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); - stat->processed_cells = orcirc->processed_cells; + processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */ - stat->mean_num_cells_in_queue = (double) orcirc->total_cell_waiting_time / + mean_num_cells_in_queue = (double) orcirc->total_cell_waiting_time / (double) interval_length / 1000.0 / 2.0; - stat->mean_time_cells_in_queue = + mean_time_cells_in_queue = (double) orcirc->total_cell_waiting_time / (double) orcirc->processed_cells; - smartlist_add(circuits_for_buffer_stats, stat); orcirc->total_cell_waiting_time = 0; orcirc->processed_cells = 0; + rep_hist_add_buffer_stats(mean_num_cells_in_queue, + mean_time_cells_in_queue, + processed_cells); } /** Sorting helper: return -1, 1, or 0 based on comparison of two diff --git a/src/or/rephist.h b/src/or/rephist.h index 13dee15..e590659 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -77,6 +77,8 @@ void rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval); time_t rep_hist_buffer_stats_write(time_t now); void rep_hist_buffer_stats_term(void); +void rep_hist_add_buffer_stats(double mean_num_cells_in_queue, + double mean_time_cells_in_queue, uint32_t processed_cells); char *rep_hist_format_buffer_stats(time_t now); void rep_hist_reset_buffer_stats(time_t now); diff --git a/src/test/test.c b/src/test/test.c index e7d4ccb..4ef87a0 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1635,6 +1635,61 @@ test_stats(void) rep_hist_reset_conn_stats(now); s = rep_hist_format_conn_stats(now + 86400); test_streq("conn-bi-direct 2010-08-12 13:27:30 (86400 s) 0,0,0,0\n", s); + tor_free(s); + + /* Continue with testing buffer statistics; we shouldn't collect buffer + * stats without initializing them. */ + rep_hist_add_buffer_stats(2.0, 2.0, 20); + s = rep_hist_format_buffer_stats(now + 86400); + test_assert(!s); + + /* Initialize stats, add statistics for a single circuit, and generate + * the history string. */ + rep_hist_buffer_stats_init(now); + rep_hist_add_buffer_stats(2.0, 2.0, 20); + s = rep_hist_format_buffer_stats(now + 86400); + test_streq("cell-stats-end 2010-08-12 13:27:30 (86400 s)\n" + "cell-processed-cells 20,0,0,0,0,0,0,0,0,0\n" + "cell-queued-cells 2.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00," + "0.00,0.00\n" + "cell-time-in-queue 2,0,0,0,0,0,0,0,0,0\n" + "cell-circuits-per-decile 1\n", s); + tor_free(s); + + /* Add nineteen more circuit statistics to the one that's already in the + * history to see that the math works correctly. */ + for (i = 21; i < 30; i++) + rep_hist_add_buffer_stats(2.0, 2.0, i); + for (i = 20; i < 30; i++) + rep_hist_add_buffer_stats(3.5, 3.5, i); + s = rep_hist_format_buffer_stats(now + 86400); + test_streq("cell-stats-end 2010-08-12 13:27:30 (86400 s)\n" + "cell-processed-cells 29,28,27,26,25,24,23,22,21,20\n" + "cell-queued-cells 2.75,2.75,2.75,2.75,2.75,2.75,2.75,2.75," + "2.75,2.75\n" + "cell-time-in-queue 3,3,3,3,3,3,3,3,3,3\n" + "cell-circuits-per-decile 2\n", s); + tor_free(s); + + /* Stop collecting stats, add statistics for one circuit, and ensure we + * don't generate a history string. */ + rep_hist_buffer_stats_term(); + rep_hist_add_buffer_stats(2.0, 2.0, 20); + s = rep_hist_format_buffer_stats(now + 86400); + test_assert(!s); + + /* Re-start stats, add statistics for one circuit, reset stats, and make + * sure that the history has all zeros. */ + rep_hist_buffer_stats_init(now); + rep_hist_add_buffer_stats(2.0, 2.0, 20); + rep_hist_reset_buffer_stats(now); + s = rep_hist_format_buffer_stats(now + 86400); + test_streq("cell-stats-end 2010-08-12 13:27:30 (86400 s)\n" + "cell-processed-cells 0,0,0,0,0,0,0,0,0,0\n" + "cell-queued-cells 0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00," + "0.00,0.00\n" + "cell-time-in-queue 0,0,0,0,0,0,0,0,0,0\n" + "cell-circuits-per-decile 0\n", s); done: tor_free(s);

1 0

[tor/master] Clean up geoip_dirreq_stats_write().
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit abeaabba00a8c8e089b71fe8831f3ee5462ba604 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 4 11:52:52 2011 +0200 Clean up geoip_dirreq_stats_write(). We later want to split this function into one function that generates the dirreq-stats string and one that writes it to disk. --- src/or/geoip.c | 171 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 98 insertions(+), 73 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index d02666b..aff636d 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -974,12 +974,16 @@ time_t geoip_dirreq_stats_write(time_t now) { char *statsdir = NULL, *filename = NULL; - char *data_v2 = NULL, *data_v3 = NULL; - char written[ISO_TIME_LEN+1]; open_file_t *open_file = NULL; + char t[ISO_TIME_LEN+1]; double v2_share = 0.0, v3_share = 0.0; FILE *out; int i; + char *v3_ips_string, *v2_ips_string, *v3_reqs_string, *v2_reqs_string, + *v2_share_string = NULL, *v3_share_string = NULL, + *v3_direct_dl_string, *v2_direct_dl_string, + *v3_tunneled_dl_string, *v2_tunneled_dl_string; + char *result; if (!start_of_dirreq_stats_interval) return 0; /* Not initialized. */ @@ -989,35 +993,13 @@ geoip_dirreq_stats_write(time_t now) /* Discard all items in the client history that are too old. */ geoip_remove_old_clients(start_of_dirreq_stats_interval); - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) - goto done; - filename = get_datadir_fname2("stats", "dirreq-stats"); - data_v2 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); - data_v3 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); - format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, - 0600, &open_file); - if (!out) - goto done; - if (fprintf(out, "dirreq-stats-end %s (%d s)\ndirreq-v3-ips %s\n" - "dirreq-v2-ips %s\n", written, - (unsigned) (now - start_of_dirreq_stats_interval), - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) - goto done; - tor_free(data_v2); - tor_free(data_v3); + format_iso_time(t, now); + v2_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); + v3_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); + v2_reqs_string = geoip_get_request_history( + GEOIP_CLIENT_NETWORKSTATUS_V2); + v3_reqs_string = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS); - data_v2 = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS_V2); - data_v3 = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS); - if (fprintf(out, "dirreq-v3-reqs %s\ndirreq-v2-reqs %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) - goto done; - tor_free(data_v2); - tor_free(data_v3); - SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, { - c->n_v2_ns_requests = c->n_v3_ns_requests = 0; - }); #define RESPONSE_GRANULARITY 8 for (i = 0; i < GEOIP_NS_RESPONSE_NUM; i++) { ns_v2_responses[i] = round_uint32_to_next_multiple_of( @@ -1026,61 +1008,104 @@ geoip_dirreq_stats_write(time_t now) ns_v3_responses[i], RESPONSE_GRANULARITY); } #undef RESPONSE_GRANULARITY - if (fprintf(out, "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," - "not-found=%u,not-modified=%u,busy=%u\n", - ns_v3_responses[GEOIP_SUCCESS], - ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS], - ns_v3_responses[GEOIP_REJECT_UNAVAILABLE], - ns_v3_responses[GEOIP_REJECT_NOT_FOUND], - ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED], - ns_v3_responses[GEOIP_REJECT_BUSY]) < 0) - goto done; - if (fprintf(out, "dirreq-v2-resp ok=%u,unavailable=%u," - "not-found=%u,not-modified=%u,busy=%u\n", - ns_v2_responses[GEOIP_SUCCESS], - ns_v2_responses[GEOIP_REJECT_UNAVAILABLE], - ns_v2_responses[GEOIP_REJECT_NOT_FOUND], - ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED], - ns_v2_responses[GEOIP_REJECT_BUSY]) < 0) - goto done; - memset(ns_v2_responses, 0, sizeof(ns_v2_responses)); - memset(ns_v3_responses, 0, sizeof(ns_v3_responses)); + if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) { - if (fprintf(out, "dirreq-v2-share %0.2lf%%\n", v2_share*100) < 0) - goto done; - if (fprintf(out, "dirreq-v3-share %0.2lf%%\n", v3_share*100) < 0) - goto done; + tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2lf%%\n", + v2_share*100); + tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2lf%%\n", + v3_share*100); } - data_v2 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - DIRREQ_DIRECT); - data_v3 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS, - DIRREQ_DIRECT); - if (fprintf(out, "dirreq-v3-direct-dl %s\ndirreq-v2-direct-dl %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) + v2_direct_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_DIRECT); + v3_direct_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_DIRECT); + + v2_tunneled_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_TUNNELED); + v3_tunneled_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_TUNNELED); + + /* Put everything together into a single string. */ + tor_asprintf(&result, "dirreq-stats-end %s (%d s)\n" + "dirreq-v3-ips %s\n" + "dirreq-v2-ips %s\n" + "dirreq-v3-reqs %s\n" + "dirreq-v2-reqs %s\n" + "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," + "not-found=%u,not-modified=%u,busy=%u\n" + "dirreq-v2-resp ok=%u,unavailable=%u," + "not-found=%u,not-modified=%u,busy=%u\n" + "%s" + "%s" + "dirreq-v3-direct-dl %s\n" + "dirreq-v2-direct-dl %s\n" + "dirreq-v3-tunneled-dl %s\n" + "dirreq-v2-tunneled-dl %s\n", + t, + (unsigned) (now - start_of_dirreq_stats_interval), + v3_ips_string ? v3_ips_string : "", + v2_ips_string ? v2_ips_string : "", + v3_reqs_string ? v3_reqs_string : "", + v2_reqs_string ? v2_reqs_string : "", + ns_v3_responses[GEOIP_SUCCESS], + ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS], + ns_v3_responses[GEOIP_REJECT_UNAVAILABLE], + ns_v3_responses[GEOIP_REJECT_NOT_FOUND], + ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED], + ns_v3_responses[GEOIP_REJECT_BUSY], + ns_v2_responses[GEOIP_SUCCESS], + ns_v2_responses[GEOIP_REJECT_UNAVAILABLE], + ns_v2_responses[GEOIP_REJECT_NOT_FOUND], + ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED], + ns_v2_responses[GEOIP_REJECT_BUSY], + v2_share_string ? v2_share_string : "", + v3_share_string ? v3_share_string : "", + v3_direct_dl_string ? v3_direct_dl_string : "", + v2_direct_dl_string ? v2_direct_dl_string : "", + v3_tunneled_dl_string ? v3_tunneled_dl_string : "", + v2_tunneled_dl_string ? v2_tunneled_dl_string : ""); + + /* Free partial strings. */ + tor_free(v3_ips_string); + tor_free(v2_ips_string); + tor_free(v3_reqs_string); + tor_free(v2_reqs_string); + tor_free(v2_share_string); + tor_free(v3_share_string); + tor_free(v3_direct_dl_string); + tor_free(v2_direct_dl_string); + tor_free(v3_tunneled_dl_string); + tor_free(v2_tunneled_dl_string); + + /* Reset history to prepare for the next measurement interval. */ + SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, { + c->n_v2_ns_requests = c->n_v3_ns_requests = 0; + }); + memset(ns_v2_responses, 0, sizeof(ns_v2_responses)); + memset(ns_v3_responses, 0, sizeof(ns_v3_responses)); + start_of_dirreq_stats_interval = now; + + /* Write dirreq-stats string to disk. */ + statsdir = get_datadir_fname("stats"); + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; - tor_free(data_v2); - tor_free(data_v3); - data_v2 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - DIRREQ_TUNNELED); - data_v3 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS, - DIRREQ_TUNNELED); - if (fprintf(out, "dirreq-v3-tunneled-dl %s\ndirreq-v2-tunneled-dl %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) + filename = get_datadir_fname2("stats", "dirreq-stats"); + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, + 0600, &open_file); + if (!out) + goto done; + if (fprintf(out, "%s", result) < 0) goto done; - finish_writing_to_file(open_file); open_file = NULL; - start_of_dirreq_stats_interval = now; - done: if (open_file) abort_writing_to_file(open_file); - tor_free(filename); tor_free(statsdir); - tor_free(data_v2); - tor_free(data_v3); + tor_free(filename); + tor_free(result); return start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL; }

1 0

r24941: {website} revert part of r24939, resizing the image is easy I used the (in website/trunk: css images)
by Damian Johnson 04 Aug '11

04 Aug '11

Author: atagar Date: 2011-08-04 15:18:19 +0000 (Thu, 04 Aug 2011) New Revision: 24941 Added: website/trunk/images/tor-logo_small.jpg Modified: website/trunk/css/layout.css Log: revert part of r24939, resizing the image is easy I used the larger image because it looked fine and didn't alter the layout of the page. If the size is really a concern then that's trivial to fix - this makes it the same size as the low resolution version. As for the other concerns mentioned in ticket 3682... - The file size difference is tiny. If you really care about sizes that much then we should run an optimizer on the site to remove unnecessary whitespace in the html. Btw, the file size of this small version is 4.5 KB (vs 4.9 with the big version and 4.0 with the low resolution). - It's simple to lighten the image if that looks better to you. In Gimp just go to "Colors > Brightness-Contrast..." to make it match the old version. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-04 03:18:37 UTC (rev 24940) +++ website/trunk/css/layout.css 2011-08-04 15:18:19 UTC (rev 24941) @@ -43,7 +43,7 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo_low_resolution.jpg) left top no-repeat; + background: url(../images/tor-logo_small.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; width: 150px; Added: website/trunk/images/tor-logo_small.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tor-logo_small.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

2 2

r24945: {} too many tor-logo's floating around. (website/trunk/images)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:48:07 +0000 (Thu, 04 Aug 2011) New Revision: 24945 Removed: website/trunk/images/tor-logo_low_resolution.jpg website/trunk/images/tor-logo_small.jpg Log: too many tor-logo's floating around. Deleted: website/trunk/images/tor-logo_low_resolution.jpg =================================================================== (Binary files differ) Deleted: website/trunk/images/tor-logo_small.jpg =================================================================== (Binary files differ)

1 0

r24944: {} delete the stupid sitemap that google screws up anyway. (website/trunk)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:46:46 +0000 (Thu, 04 Aug 2011) New Revision: 24944 Removed: website/trunk/sitemap.xml Log: delete the stupid sitemap that google screws up anyway. Deleted: website/trunk/sitemap.xml =================================================================== --- website/trunk/sitemap.xml 2011-08-04 17:46:15 UTC (rev 24943) +++ website/trunk/sitemap.xml 2011-08-04 17:46:46 UTC (rev 24944) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<urlset xmlns="http://www.google.com/schemas/sitemap/0.9"> -<url> -<loc>http://www.torproject.org/</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/overview.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/download/download.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/documentation.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/getinvolved/volunteer.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/corepeople.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/donate/donate.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/torusers.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/tor-doc-relay.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/contact.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/trademark-faq.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/press/inthemedia.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/press/press.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -</urlset>

1 0