[tor-commits] [tor/maint-0.2.2] Move the decl for tor_gettimofday_cache_clear to the right header

nickm at torproject.org nickm at torproject.org
Wed Mar 16 22:09:21 UTC 2011


commit 27d1675d93a07227aae3bb1d86bd4876d6c3ac77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 16 17:54:43 2011 -0400

    Move the decl for tor_gettimofday_cache_clear to the right header
---
 src/or/relay.c       |    4 ++--
 src/or/relay.h       |    2 ++
 src/or/routerparse.h |    2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 2510242..076b46b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -52,9 +52,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
@@ -76,7 +76,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 dbba092..f64752d 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/routerparse.h b/src/or/routerparse.h
index 3499f18..8b8cde2 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
 





More information about the tor-commits mailing list