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

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

07 Jan '15

commit f8baa40c01917a6261dd6824097cee98e8ace514 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 3dbaa1b..9ff71c9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1438,6 +1438,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")) { @@ -2113,6 +2115,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, @@ -4155,11 +4158,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", @@ -4170,6 +4191,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 0af09ae..8c9f7bb 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -203,6 +203,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] Merge branch 'ticket14128_squashed'
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit ceed53c39b19488e3c62f06f79a3e60b0ec38184 Merge: 1abd526 f8baa40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 13:19:57 2015 -0500 Merge branch 'ticket14128_squashed' changes/ticket14128 | 5 +++++ src/or/control.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/control.h | 1 + 3 files changed, 56 insertions(+)

1 0

[tor/master] restore the sensible part of ac268a83408e1450544db2f23f364dfa3
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit b82e166bec5fcc468424af1ff71e2e753ac534a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 29 12:21:57 2014 -0400 restore the sensible part of ac268a83408e1450544db2f23f364dfa3 We don't want to call event_del() postfork, if cpuworkers are multiprocess. --- src/or/connection.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/or/connection.c b/src/or/connection.c index 6d205d1..aedb29d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -553,10 +553,17 @@ connection_free_(connection_t *conn) tor_free(control_conn->incoming_cmd); } +#ifdef TOR_IS_MULTITHREADED /* Probably already freed by connection_free. */ + /* We don't do these frees on the multiprocess case, since in that case we + * don't want to call event_del() postfork or it's likely to mess up. + * Multiprocess builds are deprecated, so let's just have a one-time memory + * leak here. + */ tor_event_free(conn->read_event); tor_event_free(conn->write_event); conn->read_event = conn->write_event = NULL; +#endif IF_HAS_BUFFEREVENT(conn, { /* This was a workaround to handle bugs in some old versions of libevent * where callbacks can occur after calling bufferevent_free(). Setting

1 0

[tor/master] Merge remote-tracking branch 'public/bug12985_024' into bug12984_025
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit b0138cd05540001f084b7bd828b3dcffbaeb5b22 Merge: 37a76d7 b82e166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 29 12:24:52 2014 -0400 Merge remote-tracking branch 'public/bug12985_024' into bug12984_025 changes/bug12985 | 4 ++++ src/common/compat_libevent.c | 14 +++++++++++++- src/common/compat_libevent.h | 5 ++--- src/or/connection.c | 13 +++++++++++-- 4 files changed, 30 insertions(+), 6 deletions(-)

1 0

[tor/master] Revert "restore the sensible part of ac268a83408e1450544db2f23f364dfa3"
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit d8fe499e08cf6c04fd6bf6230c916dcedf17dc80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 29 12:25:05 2014 -0400 Revert "restore the sensible part of ac268a83408e1450544db2f23f364dfa3" This reverts commit b82e166bec5fcc468424af1ff71e2e753ac534a2. We don't need that part in 0.2.5, since 0.2.5 no longer supports non-multithreaded builds. --- src/or/connection.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index bcb1737..36200e5 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -575,17 +575,10 @@ connection_free_(connection_t *conn) tor_free(control_conn->incoming_cmd); } -#ifdef TOR_IS_MULTITHREADED /* Probably already freed by connection_free. */ - /* We don't do these frees on the multiprocess case, since in that case we - * don't want to call event_del() postfork or it's likely to mess up. - * Multiprocess builds are deprecated, so let's just have a one-time memory - * leak here. - */ tor_event_free(conn->read_event); tor_event_free(conn->write_event); conn->read_event = conn->write_event = NULL; -#endif IF_HAS_BUFFEREVENT(conn, { /* This was a workaround to handle bugs in some old versions of libevent * where callbacks can occur after calling bufferevent_free(). Setting

1 0

[tor/master] Always event_del() connection events before freeing them
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 4144b4552b00c25eba9be7a959aa75c1efbe4a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 29 11:33:05 2014 -0400 Always event_del() connection events before freeing them Previously, we had done this only in the connection_free() case, but when we called connection_free_() directly from connections_free_all(), we didn't free the connections. --- changes/bug12985 | 4 ++++ src/common/compat_libevent.c | 14 +++++++++++++- src/common/compat_libevent.h | 5 ++--- src/or/connection.c | 6 ++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/changes/bug12985 b/changes/bug12985 new file mode 100644 index 0000000..dc14cdd --- /dev/null +++ b/changes/bug12985 @@ -0,0 +1,4 @@ + o Minor bugfixes (shutdown): + - When shutting down, always call event_del() on lingering read or + write events before freeing them. Fixes bug 12985; bugfix on + 0.1.0.2-rc. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 200a7c6..2a7386d 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -144,13 +144,25 @@ tor_evsignal_new(struct event_base * base, int sig, { return tor_event_new(base, sig, EV_SIGNAL|EV_PERSIST, cb, arg); } -/** Work-alike replacement for event_free() on pre-Libevent-2.0 systems. */ +/** Work-alike replacement for event_free() on pre-Libevent-2.0 systems, + * except tolerate tor_event_free(NULL). */ void tor_event_free(struct event *ev) { + if (ev == NULL) + return; event_del(ev); tor_free(ev); } +#else +/* Wrapper for event_free() that tolerates tor_event_free(NULL) */ +void +tor_event_free(struct event *ev) +{ + if (ev == NULL) + return; + event_free(ev); +} #endif /** Global event base for use by the main thread. */ diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 2472e2c..ab7066b 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -28,11 +28,9 @@ void suppress_libevent_log_msg(const char *msg); #define tor_event_new event_new #define tor_evtimer_new evtimer_new #define tor_evsignal_new evsignal_new -#define tor_event_free event_free #define tor_evdns_add_server_port(sock, tcp, cb, data) \ evdns_add_server_port_with_base(tor_libevent_get_base(), \ (sock),(tcp),(cb),(data)); - #else struct event *tor_event_new(struct event_base * base, evutil_socket_t sock, short what, void (*cb)(evutil_socket_t, short, void *), void *arg); @@ -40,10 +38,11 @@ struct event *tor_evtimer_new(struct event_base * base, void (*cb)(evutil_socket_t, short, void *), void *arg); struct event *tor_evsignal_new(struct event_base * base, int sig, void (*cb)(evutil_socket_t, short, void *), void *arg); -void tor_event_free(struct event *ev); #define tor_evdns_add_server_port evdns_add_server_port #endif +void tor_event_free(struct event *ev); + typedef struct periodic_timer_t periodic_timer_t; periodic_timer_t *periodic_timer_new(struct event_base *base, diff --git a/src/or/connection.c b/src/or/connection.c index 4f74a1d..6d205d1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -553,8 +553,10 @@ connection_free_(connection_t *conn) tor_free(control_conn->incoming_cmd); } - tor_free(conn->read_event); /* Probably already freed by connection_free. */ - tor_free(conn->write_event); /* Probably already freed by connection_free. */ + /* Probably already freed by connection_free. */ + tor_event_free(conn->read_event); + tor_event_free(conn->write_event); + conn->read_event = conn->write_event = NULL; IF_HAS_BUFFEREVENT(conn, { /* This was a workaround to handle bugs in some old versions of libevent * where callbacks can occur after calling bufferevent_free(). Setting

1 0

[tor/master] Merge remote-tracking branch 'public/bug12985_025'
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 1abd526c75eade83318a6ec6aff84d5f0f079a3b Merge: 7dd8528 139a1c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:55:50 2015 -0500 Merge remote-tracking branch 'public/bug12985_025' changes/bug12985 | 5 +++++ src/common/compat_libevent.c | 14 +++++++++++++- src/common/compat_libevent.h | 5 ++--- src/or/connection.c | 6 ++++-- 4 files changed, 24 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug12985_024' into bug12985_025
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 139a1c64a0333d7a2af6715e827d5858628683f4 Merge: d8fe499 e9463b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:54:33 2015 -0500 Merge remote-tracking branch 'public/bug12985_024' into bug12985_025 changes/bug12985 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] Clarify why bug12985 is a thing
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit e9463b04e7c396d4344dc658e0c9dae3bdfc15af Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:52:24 2015 -0500 Clarify why bug12985 is a thing --- changes/bug12985 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/bug12985 b/changes/bug12985 index dc14cdd..636ae4d 100644 --- a/changes/bug12985 +++ b/changes/bug12985 @@ -1,4 +1,5 @@ o Minor bugfixes (shutdown): - When shutting down, always call event_del() on lingering read or - write events before freeing them. Fixes bug 12985; bugfix on + write events before freeing them. Otherwise, we risk double-frees + or read-after-frees in event_base_free(). Fixes bug 12985; bugfix on 0.1.0.2-rc.

1 0

[tor/master] Merge remote-tracking branch 'public/bug13988_025'
by nickm＠torproject.org 07 Jan '15

07 Jan '15

commit 7dd852835c24a2db1cc4751f3b9235a8c78bf775 Merge: 79aaad9 6830667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 7 11:45:24 2015 -0500 Merge remote-tracking branch 'public/bug13988_025' changes/bug13988 | 3 +++ src/or/rephist.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0