From 3285f4c7329bf4305133be74f88dd4b10d5e2052 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 27 Nov 2017 15:58:44 -0800 Subject: Fix grpc_init by removing exec_ctx usage before init --- src/core/lib/iomgr/iomgr.cc | 7 +++++-- src/core/lib/surface/init.cc | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index f3f080e315..3bad17a54e 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -50,8 +50,11 @@ void grpc_iomgr_init() { gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); grpc_core::ExecCtx::GlobalInit(); - grpc_executor_init(); - grpc_timer_list_init(); + { + grpc_core::ExecCtx _local_exec_ctx; + grpc_executor_init(); + grpc_timer_list_init(); + } g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = (char*)"root"; grpc_network_status_init(); diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index cdbe01e1d4..da641e1cf5 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -116,7 +116,6 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); - grpc_core::ExecCtx _local_exec_ctx; gpr_mu_lock(&g_init_mu); if (++g_initializations == 1) { gpr_time_init(); -- cgit v1.2.3