commit 67d59d7d1ffa058280471154b8185b5420334458 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 13 12:53:15 2020 -0500

Re-order most subsystems to correspond to dependency order. --- src/app/main/subsystem_list.c | 12 ++++++------ src/core/or/ocirc_event.c | 2 +- src/core/or/orconn_event.c | 2 +- src/feature/control/btrack.c | 2 +- src/lib/compress/compress.c | 2 +- src/lib/net/network_sys.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index b4439cdc7..6784ebe8a 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -50,24 +50,24 @@ const subsys_fns_t *tor_subsystems[] = { &sys_logging,

&sys_time, - &sys_network,

- &sys_compress, &sys_crypto, + &sys_compress, + &sys_network, &sys_tortls, &sys_process,

- &sys_orconn_event, - &sys_ocirc_event, - &sys_btrack, - &sys_evloop,

&sys_mainloop, &sys_or, + &sys_orconn_event, + &sys_ocirc_event,

&sys_relay,

+ &sys_btrack, + &sys_dirauth, };

diff --git a/src/core/or/ocirc_event.c b/src/core/or/ocirc_event.c index 66992a0b5..6aa7f684e 100644 --- a/src/core/or/ocirc_event.c +++ b/src/core/or/ocirc_event.c @@ -123,6 +123,6 @@ ocirc_cevent_publish(ocirc_cevent_msg_t *msg) const subsys_fns_t sys_ocirc_event = { .name = "ocirc_event", .supported = true, - .level = -32, + .level = 22, .add_pubsub = ocirc_add_pubsub, }; diff --git a/src/core/or/orconn_event.c b/src/core/or/orconn_event.c index d0a06aa04..7ed6b5fdf 100644 --- a/src/core/or/orconn_event.c +++ b/src/core/or/orconn_event.c @@ -94,6 +94,6 @@ orconn_status_publish(orconn_status_msg_t *msg) const subsys_fns_t sys_orconn_event = { .name = "orconn_event", .supported = true, - .level = -33, + .level = 22, .add_pubsub = orconn_add_pubsub, }; diff --git a/src/feature/control/btrack.c b/src/feature/control/btrack.c index 874150ee1..3595af0fc 100644 --- a/src/feature/control/btrack.c +++ b/src/feature/control/btrack.c @@ -57,7 +57,7 @@ btrack_add_pubsub(pubsub_connector_t *connector) const subsys_fns_t sys_btrack = { .name = "btrack", .supported = true, - .level = -30, + .level = 55, .initialize = btrack_init, .shutdown = btrack_fini, .add_pubsub = btrack_add_pubsub, diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c index c62d7d5d2..84e960192 100644 --- a/src/lib/compress/compress.c +++ b/src/lib/compress/compress.c @@ -695,6 +695,6 @@ subsys_compress_initialize(void) const subsys_fns_t sys_compress = { .name = "compress", .supported = true, - .level = -70, + .level = -55, .initialize = subsys_compress_initialize, }; diff --git a/src/lib/net/network_sys.c b/src/lib/net/network_sys.c index 012fc56bb..f0421385b 100644 --- a/src/lib/net/network_sys.c +++ b/src/lib/net/network_sys.c @@ -39,7 +39,7 @@ const subsys_fns_t sys_network = { .name = "network", /* Network depends on logging, and a lot of other modules depend on network. */ - .level = -80, + .level = -55, .supported = true, .initialize = subsys_network_initialize, .shutdown = subsys_network_shutdown,