commit a0ee54549fec3ae710ab5e3623d707bd08adcafe Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 1 13:34:07 2018 -0400

Turn the wallclock module into a subsystem.

(This may be slightly gratuitous.) --- src/app/main/main.c | 1 - src/app/main/subsystem_list.c | 4 +++- src/lib/wallclock/.may_include | 1 + src/lib/wallclock/approx_time.c | 16 ++++++++++++++++ src/lib/wallclock/include.am | 3 ++- src/lib/wallclock/wallclock_sys.h | 14 ++++++++++++++ 6 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/app/main/main.c b/src/app/main/main.c index f44f3475d..5740efb0b 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1394,7 +1394,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)

init_protocol_warning_severity_level();

- update_approx_time(time(NULL)); tor_compress_init(); monotime_init();

diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 4a2994ec4..3d03a9a4d 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -9,9 +9,10 @@ #include "lib/cc/torint.h"

#include "lib/err/torerr_sys.h" +#include "lib/log/log_sys.h" #include "lib/process/winprocess_sys.h" #include "lib/thread/thread_sys.h" -#include "lib/log/log_sys.h" +#include "lib/wallclock/wallclock_sys.h"

#include <stddef.h>

@@ -21,6 +22,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_winprocess, &sys_torerr, + &sys_wallclock, &sys_threads, &sys_logging, }; diff --git a/src/lib/wallclock/.may_include b/src/lib/wallclock/.may_include index dc010da06..ce7a26472 100644 --- a/src/lib/wallclock/.may_include +++ b/src/lib/wallclock/.may_include @@ -3,4 +3,5 @@ lib/cc/*.h lib/err/*.h lib/wallclock/*.h lib/string/*.h +lib/subsys/*.h lib/testsupport/*.h diff --git a/src/lib/wallclock/approx_time.c b/src/lib/wallclock/approx_time.c index bb9a29236..c7a7ae9bd 100644 --- a/src/lib/wallclock/approx_time.c +++ b/src/lib/wallclock/approx_time.c @@ -9,7 +9,9 @@ **/

#include "orconfig.h" +#include "lib/subsys/subsys.h" #include "lib/wallclock/approx_time.h" +#include "lib/wallclock/wallclock_sys.h"

/* ===== * Cached time @@ -41,3 +43,17 @@ update_approx_time(time_t now) cached_approx_time = now; } #endif /* !defined(TIME_IS_FAST) */ + +static int +init_wallclock_subsys(void) +{ + update_approx_time(time(NULL)); + return 0; +} + +const subsys_fns_t sys_wallclock = { + .name = "wallclock", + .supported = true, + .level = -99, + .initialize = init_wallclock_subsys, +}; diff --git a/src/lib/wallclock/include.am b/src/lib/wallclock/include.am index 1961639bd..2351252e0 100644 --- a/src/lib/wallclock/include.am +++ b/src/lib/wallclock/include.am @@ -19,4 +19,5 @@ noinst_HEADERS += \ src/lib/wallclock/approx_time.h \ src/lib/wallclock/timeval.h \ src/lib/wallclock/time_to_tm.h \ - src/lib/wallclock/tor_gettimeofday.h + src/lib/wallclock/tor_gettimeofday.h \ + src/lib/wallclock/wallclock_sys.h diff --git a/src/lib/wallclock/wallclock_sys.h b/src/lib/wallclock/wallclock_sys.h new file mode 100644 index 000000000..e009578a8 --- /dev/null +++ b/src/lib/wallclock/wallclock_sys.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file wallclock_sys.h + * \brief Declare subsystem object for the wallclock module. + **/ + +#ifndef TOR_WALLCLOCK_SYS_H +#define TOR_WALLCLOCK_SYS_H + +extern const struct subsys_fns_t sys_wallclock; + +#endif /* !defined(TOR_WALLCLOCK_SYS_H) */