March 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 448bd220928f337e60dd377e8a3bb814248f4a7a Merge: 6263190 ceb6dee Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:17:20 2015 -0400 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/master] GETINFO bw-event-cache to get information on recent BW events
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 62631904cb403ee9f27080a1cf096e8ddd8a3048 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:37:23 2015 -0500 GETINFO bw-event-cache to get information on recent BW events Closes 14128; useful to regain functionality lost because of 13988. --- changes/ticket14128 | 5 +++++ src/or/control.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 1 + 3 files changed, 56 insertions(+) diff --git a/changes/ticket14128 b/changes/ticket14128 new file mode 100644 index 0000000..38b25fa --- /dev/null +++ b/changes/ticket14128 @@ -0,0 +1,5 @@ + o Minor features (controller): + - New "GETINFO bw-event-cache" to get information about recent bandwidth + events. Closes ticket 14128. Useful for controllers to get recent + bandwidth history after the fix for 13988. + diff --git a/src/or/control.c b/src/or/control.c index 9378f38..fbd648d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1424,6 +1424,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, (void) conn; if (!strcmp(question, "version")) { *answer = tor_strdup(get_version()); + } else if (!strcmp(question, "bw-event-cache")) { + *answer = get_bw_samples(); } else if (!strcmp(question, "config-file")) { *answer = tor_strdup(get_torrc_fname(0)); } else if (!strcmp(question, "config-defaults-file")) { @@ -2099,6 +2101,7 @@ typedef struct getinfo_item_t { * to answer them. */ static const getinfo_item_t getinfo_items[] = { ITEM("version", misc, "The current version of Tor."), + ITEM("bw-event-cache", misc, "Cached BW events for a short interval."), ITEM("config-file", misc, "Current location of the \"torrc\" file."), ITEM("config-defaults-file", misc, "Current location of the defaults file."), ITEM("config-text", misc, @@ -4133,11 +4136,29 @@ control_event_tb_empty(const char *bucket, uint32_t read_empty_time, return 0; } +/* about 5 minutes worth. */ +#define N_BW_EVENTS_TO_CACHE 300 +/* Index into cached_bw_events to next write. */ +static int next_measurement_idx = 0; +/* number of entries set in n_measurements */ +static int n_measurements = 0; +static struct cached_bw_event_s { + uint32_t n_read; + uint32_t n_written; +} cached_bw_events[N_BW_EVENTS_TO_CACHE]; + /** A second or more has elapsed: tell any interested control * connections how much bandwidth we used. */ int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written) { + cached_bw_events[next_measurement_idx].n_read = n_read; + cached_bw_events[next_measurement_idx].n_written = n_written; + if (++next_measurement_idx == N_BW_EVENTS_TO_CACHE) + next_measurement_idx = 0; + if (n_measurements < N_BW_EVENTS_TO_CACHE) + ++n_measurements; + if (EVENT_IS_INTERESTING(EVENT_BANDWIDTH_USED)) { send_control_event(EVENT_BANDWIDTH_USED, ALL_FORMATS, "650 BW %lu %lu\r\n", @@ -4148,6 +4169,35 @@ control_event_bandwidth_used(uint32_t n_read, uint32_t n_written) return 0; } +STATIC char * +get_bw_samples(void) +{ + int i; + int idx = (next_measurement_idx + N_BW_EVENTS_TO_CACHE - n_measurements) + % N_BW_EVENTS_TO_CACHE; + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + + smartlist_t *elements = smartlist_new(); + + for (i = 0; i < n_measurements; ++i) { + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; + + smartlist_add_asprintf(elements, "%u,%u", + (unsigned)bwe->n_read, + (unsigned)bwe->n_written); + + idx = (idx + 1) % N_BW_EVENTS_TO_CACHE; + } + + char *result = smartlist_join_strings(elements, " ", 0, NULL); + + SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); + smartlist_free(elements); + + return result; +} + /** Called when we are sending a log message to the controllers: suspend * sending further log messages to the controllers until we're done. Used by * CONN_LOG_PROTECT. */ diff --git a/src/or/control.h b/src/or/control.h index 494f04b..8697262 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -201,6 +201,7 @@ void append_cell_stats_by_command(smartlist_t *event_parts, const uint64_t *number_to_include); void format_cell_stats(char **event_string, circuit_t *circ, cell_stats_t *cell_stats); +STATIC char *get_bw_samples(void); #endif #endif

1 0

[tor/master] Restore c89 in 0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 64bfc2930ac0be3af669636c16f6f0bba715056f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:22:58 2015 -0400 Restore c89 in 0.2.5 --- src/or/control.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index fbd648d..2ff1cc8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4175,12 +4175,12 @@ get_bw_samples(void) int i; int idx = (next_measurement_idx + N_BW_EVENTS_TO_CACHE - n_measurements) % N_BW_EVENTS_TO_CACHE; - tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); - smartlist_t *elements = smartlist_new(); + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); for (i = 0; i < n_measurements; ++i) { tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + { const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; smartlist_add_asprintf(elements, "%u,%u", @@ -4188,14 +4188,17 @@ get_bw_samples(void) (unsigned)bwe->n_written); idx = (idx + 1) % N_BW_EVENTS_TO_CACHE; + } } + { char *result = smartlist_join_strings(elements, " ", 0, NULL); SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); return result; + } } /** Called when we are sending a log message to the controllers: suspend

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 5c08a19eda04906cc56d6f8fa1943bc385723412 Merge: 8450f6e 64bfc29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:23:32 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 8450f6e9a04be27f828f27a916f6560518741ca8 Merge: fb0de57 448bd22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:21:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/ticket14128 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 4af742fe9744b1fb81287daa920dca726771275c Merge: ed7f248 5c08a19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:24:26 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/ticket14128 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/maint-0.2.6] Restore c89 in 0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 64bfc2930ac0be3af669636c16f6f0bba715056f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:22:58 2015 -0400 Restore c89 in 0.2.5 --- src/or/control.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index fbd648d..2ff1cc8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4175,12 +4175,12 @@ get_bw_samples(void) int i; int idx = (next_measurement_idx + N_BW_EVENTS_TO_CACHE - n_measurements) % N_BW_EVENTS_TO_CACHE; - tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); - smartlist_t *elements = smartlist_new(); + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); for (i = 0; i < n_measurements; ++i) { tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + { const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; smartlist_add_asprintf(elements, "%u,%u", @@ -4188,14 +4188,17 @@ get_bw_samples(void) (unsigned)bwe->n_written); idx = (idx + 1) % N_BW_EVENTS_TO_CACHE; + } } + { char *result = smartlist_join_strings(elements, " ", 0, NULL); SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); return result; + } } /** Called when we are sending a log message to the controllers: suspend

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 5c08a19eda04906cc56d6f8fa1943bc385723412 Merge: 8450f6e 64bfc29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:23:32 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/maint-0.2.5] Restore c89 in 0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 64bfc2930ac0be3af669636c16f6f0bba715056f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:22:58 2015 -0400 Restore c89 in 0.2.5 --- src/or/control.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index fbd648d..2ff1cc8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4175,12 +4175,12 @@ get_bw_samples(void) int i; int idx = (next_measurement_idx + N_BW_EVENTS_TO_CACHE - n_measurements) % N_BW_EVENTS_TO_CACHE; - tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); - smartlist_t *elements = smartlist_new(); + tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); for (i = 0; i < n_measurements; ++i) { tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); + { const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; smartlist_add_asprintf(elements, "%u,%u", @@ -4188,14 +4188,17 @@ get_bw_samples(void) (unsigned)bwe->n_written); idx = (idx + 1) % N_BW_EVENTS_TO_CACHE; + } } + { char *result = smartlist_join_strings(elements, " ", 0, NULL); SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); smartlist_free(elements); return result; + } } /** Called when we are sending a log message to the controllers: suspend

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:09:50 2015 -0400 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0