aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryang-g <yangg@google.com>2018-01-31 15:16:41 -0800
committeryang-g <yangg@google.com>2018-01-31 15:16:41 -0800
commit8f65906521afcc92b564226d448442f34b02df6f (patch)
tree6a4ccca35d7be04b80fa8023f2131698535fe75f
parentd6358a5b0a473042927dbd0e9e0102eac5a89159 (diff)
downloadgrpc-grpc-8f65906521afcc92b564226d448442f34b02df6f.tar.gz
Shutdown timer manager first and then executor
-rw-r--r--src/core/lib/surface/init.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index 70329b09f4..b9eefda0ec 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -162,9 +162,9 @@ void grpc_shutdown(void) {
{
grpc_core::ExecCtx exec_ctx(0);
{
- grpc_executor_shutdown();
grpc_timer_manager_set_threading(
false); // shutdown timer_manager thread
+ grpc_executor_shutdown();
for (i = g_number_of_plugins; i >= 0; i--) {
if (g_all_of_the_plugins[i].destroy != nullptr) {
g_all_of_the_plugins[i].destroy();