Re-order most subsystems to correspond to dependency order.

diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c
index b4439cdc7bd622f430190679e2de3dffaad50226..6784ebe8a00e553bdf6ce533f42ebc6f4f8bec9b 100644 (file)
--- 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 66992a0b5f0c997c19becd0f2ce2d16f15586379..6aa7f684e07e01337edfab733c2272c23df9aad1 100644 (file)
--- 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 d0a06aa040aac3eac34e527011fd2a11e7599f5d..7ed6b5fdfa7df74e43c6edf4debff0a73db74d78 100644 (file)
--- 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 874150ee13ff2a90e173f7939e047fc0648e3215..3595af0fcccb30540610ee77c98fe53945bfefd5 100644 (file)
--- 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 c62d7d5d2ad49d3ecfc194f3109705a5f67c83bf..84e960192096729bc9a85f181677294edb2449c2 100644 (file)
--- 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 012fc56bbafc107c80d620c846c8aa027c9c14ab..f0421385b7f530c6cb5ecc870e4a29aa910704cf 100644 (file)
--- 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,