diff options
| author |  Yang Gao <yangg@google.com> | 2018-01-31 23:37:24 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-31 23:37:24 -0800 |
| commit | 7159c0f7e9673da1890d586032479368ce35334e (patch) | |
| tree | 67a047b40dc9301b4eb8040011730a7a00360428 /src/core/lib | |
| parent | 368504170d439dec59723e965bab4161c1a1f51e (diff) | |
| parent | 8f65906521afcc92b564226d448442f34b02df6f (diff) | |
Merge pull request #14263 from yang-g/latency_tool
Shutdown timer manager first and then executor
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/surface/init.cc | 2 |
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(); |