diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat_libevent.c | 8 | ||||
| -rw-r--r-- | src/or/config.c | 6 | ||||
| -rw-r--r-- | src/or/relay.c | 4 | ||||
| -rw-r--r-- | src/or/relay.h | 2 | ||||
| -rw-r--r-- | src/or/rephist.c | 1 | ||||
| -rw-r--r-- | src/or/routerparse.h | 2 |
6 files changed, 11 insertions, 12 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 5305ee9fbd..48a5b326c8 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -252,9 +252,9 @@ tor_libevent_get_method(void) #endif } -/** Return the le_version_t for the current version of libevent. If the - * version is very new, return LE_OTHER. If the version is so old that it - * doesn't support event_get_version(), return LE_OLD. DOCDOC */ +/** Return the le_version_t for the version of libevent specified in the + * string <b>v</b>. If the version is very new or uses an unrecognized + * version, format, return LE_OTHER. */ static le_version_t tor_decode_libevent_version(const char *v) { @@ -304,7 +304,7 @@ le_versions_compatibility(le_version_t v) } /** Return the version number of the currently running version of Libevent. - See le_version_t for info on the format. + * See le_version_t for info on the format. */ static le_version_t tor_get_libevent_version(const char **v_out) diff --git a/src/or/config.c b/src/or/config.c index 79d222b38f..d853d7b7d0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4874,10 +4874,10 @@ options_save_current(void) } /** Mapping from a unit name to a multiplier for converting that unit into a - * base unit. */ + * base unit. Used by config_parse_unit. */ struct unit_table_t { - const char *unit; - uint64_t multiplier; + const char *unit; /**< The name of the unit */ + uint64_t multiplier; /**< How many of the base unit appear in this unit */ }; /** Table to map the names of memory units to the number of bytes they diff --git a/src/or/relay.c b/src/or/relay.c index 7180cfb28a..657ee32fcc 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -53,9 +53,9 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); static int circuit_queue_streams_are_blocked(circuit_t *circ); +/* XXXX023 move this all to compat_libevent */ /** Cache the current hi-res time; the cache gets reset when libevent * calls us. */ - static struct timeval cached_time_hires = {0, 0}; /** Stop reading on edge connections when we have this many cells @@ -77,7 +77,7 @@ tor_gettimeofday_cached(struct timeval *tv) void tor_gettimeofday_cache_clear(void) { - cached_time_hires.tv_sec = 0; + cached_time_hires.tv_sec = 0; } /** Stats: how many relay cells have originated at this hop, or have diff --git a/src/or/relay.h b/src/or/relay.h index dbba09239a..f64752da5d 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -64,5 +64,7 @@ void cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus); void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); +void tor_gettimeofday_cache_clear(void); + #endif diff --git a/src/or/rephist.c b/src/or/rephist.c index 2b804b1a1e..688ff82ee4 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2326,7 +2326,6 @@ typedef struct circ_buffer_stats_t { double mean_time_cells_in_queue; } circ_buffer_stats_t; -/** Holds stats. */ smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit <b>circ</b> at time diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 3499f18c7c..8b8cde25f6 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -82,7 +82,5 @@ int rend_parse_introduction_points(rend_service_descriptor_t *parsed, size_t intro_points_encoded_size); int rend_parse_client_keys(strmap_t *parsed_clients, const char *str); -void tor_gettimeofday_cache_clear(void); - #endif |