diff options
author | 2016-07-19 10:25:07 -0400 | |
---|---|---|
committer | 2016-07-19 10:25:07 -0400 | |
commit | 53826511f95cbfa31e3b8316b11cf397830502b0 (patch) | |
tree | 4fca7a659dfdeb7c625384e795bce6e325c8f762 /src/core/lib/iomgr/iomgr.c | |
parent | db4f1967d0a61bbe19be1fbd299d72fca68a5ec7 (diff) | |
parent | 2eebe29ec84ed6b2d5c64016b12e1782281d5a38 (diff) |
Merge branch 'master' into move_timeout_encoding
Diffstat (limited to 'src/core/lib/iomgr/iomgr.c')
-rw-r--r-- | src/core/lib/iomgr/iomgr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/iomgr.c b/src/core/lib/iomgr/iomgr.c index 89292a153e..d67d388b8c 100644 --- a/src/core/lib/iomgr/iomgr.c +++ b/src/core/lib/iomgr/iomgr.c @@ -45,6 +45,7 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/network_status_tracker.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/support/env.h" #include "src/core/lib/support/string.h" @@ -62,6 +63,7 @@ void grpc_iomgr_init(void) { grpc_timer_list_init(gpr_now(GPR_CLOCK_MONOTONIC)); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = "root"; + grpc_network_status_init(); grpc_iomgr_platform_init(); } @@ -140,6 +142,7 @@ void grpc_iomgr_shutdown(void) { grpc_iomgr_platform_shutdown(); grpc_exec_ctx_global_shutdown(); + grpc_network_status_shutdown(); gpr_mu_destroy(&g_mu); gpr_cv_destroy(&g_rcv); } |