[tor-commits] [tor/master] Merge branch 'bug31615_041' into bug31615_master

[dgoulet at torproject.org]

commit 987768b07766e752d7aa7234916abe1e8e2feb87
Merge: 796a9b37e f1c57cd1e
Author: teor <teor at torproject.org>
Date:   Tue Sep 10 09:03:37 2019 +1000

    Merge branch 'bug31615_041' into bug31615_master
    
    Merged modified lines from bug31615_041, and unmodified lines
    from master.

 changes/bug31615                 |  5 +++++
 src/app/main/subsystem_list.c    | 38 ++++++++++++++++++++------------------
 src/lib/err/torerr_sys.c         |  5 ++++-
 src/lib/log/log_sys.c            |  2 ++
 src/lib/net/network_sys.c        |  4 +++-
 src/lib/process/winprocess_sys.c |  2 ++
 src/lib/thread/compat_threads.c  |  2 ++
 src/lib/time/time_sys.c          |  4 +++-
 src/lib/wallclock/approx_time.c  |  4 +++-
 9 files changed, 44 insertions(+), 22 deletions(-)

diff --cc src/app/main/subsystem_list.c
index 95d96f78d,989b0d6f8..d525708e7
--- a/src/app/main/subsystem_list.c
+++ b/src/app/main/subsystem_list.c
@@@ -33,33 -32,33 +33,35 @@@
  
  /**
   * Global list of the subsystems in Tor, in the order of their initialization.
+  * Want to know the exact level numbers?
+  * We'll implement a level dump command in #31614.
   **/
  const subsys_fns_t *tor_subsystems[] = {
-   &sys_winprocess, /* -100 */
-   &sys_torerr, /* -100 */
-   &sys_wallclock, /* -99 */
-   &sys_threads, /* -95 */
-   &sys_logging, /* -90 */
-   &sys_time, /* -90 */
-   &sys_network, /* -90 */
-   &sys_compress, /* -70 */
-   &sys_crypto, /* -60 */
-   &sys_tortls, /* -50 */
-   &sys_process, /* -35 */
+   &sys_winprocess,
+   &sys_torerr,
+   &sys_wallclock,
+   &sys_threads,
+   &sys_logging,
+   &sys_time,
+   &sys_network,
+   &sys_compress,
+   &sys_crypto,
+   &sys_tortls,
+   &sys_process,
  
-   &sys_orconn_event, /* -33 */
-   &sys_ocirc_event, /* -32 */
-   &sys_btrack, /* -30 */
+   &sys_orconn_event,
+   &sys_ocirc_event,
+   &sys_btrack,
  
 +  &sys_evloop, /* -20 */
 +
-   &sys_mainloop, /* 5 */
-   &sys_or, /* 20 */
+   &sys_mainloop,
+   &sys_or,
  
-   &sys_relay, /* 50 */
+   &sys_relay,
  
  #ifdef HAVE_MODULE_DIRAUTH
-   &sys_dirauth, /* 70 */
+   &sys_dirauth,
  #endif
  };