From 3f37fd95b20e27a6dd34a0d2be3222777269a75d Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 29 May 2015 16:33:01 -0700
Subject: [PATCH] Clear alarm list more aggressively
---
src/core/iomgr/iomgr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c
index 7e6315a8cc..9bbff4104c 100644
--- a/src/core/iomgr/iomgr.c
+++ b/src/core/iomgr/iomgr.c
@@ -107,6 +107,7 @@ void grpc_iomgr_shutdown(void) {
gpr_timespec shutdown_deadline =
gpr_time_add(gpr_now(), gpr_time_from_seconds(10));
+ grpc_alarm_list_shutdown();
gpr_mu_lock(&g_mu);
g_shutdown = 1;
@@ -153,7 +154,6 @@ void grpc_iomgr_shutdown(void) {
gpr_event_wait(&g_background_callback_executor_done, gpr_inf_future);
grpc_iomgr_platform_shutdown();
- grpc_alarm_list_shutdown();
gpr_mu_destroy(&g_mu);
gpr_cv_destroy(&g_rcv);
}
--
GitLab