diff options
author | Sree Kuchibhotla <sreek@google.com> | 2018-04-11 15:26:56 -0700 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2018-04-11 15:26:56 -0700 |
commit | 7b011b296e252403cd47dc36a20cb4b8cdcaba5b (patch) | |
tree | da0e08c9bb990fe00d9640739973ab4a67e31d60 /src/core/lib/iomgr/timer_generic.cc | |
parent | f2f5a9a0a75b2eba8d950345aeec89b4275f7b59 (diff) | |
parent | 71e8aee5e7861134fa8c5d49d41d569df981e88a (diff) |
Merge branch 'master' into fix-time
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.cc')
-rw-r--r-- | src/core/lib/iomgr/timer_generic.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 9a4da59624..e8f14dd2e5 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -98,6 +98,12 @@ static void init_timer_ht() { } } +static void destroy_timer_ht() { + for (int i = 0; i < NUM_HASH_BUCKETS; i++) { + gpr_mu_destroy(&g_hash_mu[i]); + } +} + static bool is_in_ht(grpc_timer* t) { size_t i = GPR_HASH_POINTER(t, NUM_HASH_BUCKETS); @@ -189,6 +195,7 @@ static void validate_non_pending_timer(grpc_timer* t) { } #define INIT_TIMER_HASH_TABLE() init_timer_ht() +#define DESTROY_TIMER_HASH_TABLE() destroy_timer_ht() #define ADD_TO_HASH_TABLE(t) add_to_ht((t)) #define REMOVE_FROM_HASH_TABLE(t) remove_from_ht((t)) #define VALIDATE_NON_PENDING_TIMER(t) validate_non_pending_timer((t)) @@ -196,6 +203,7 @@ static void validate_non_pending_timer(grpc_timer* t) { #else #define INIT_TIMER_HASH_TABLE() +#define DESTROY_TIMER_HASH_TABLE() #define ADD_TO_HASH_TABLE(t) #define REMOVE_FROM_HASH_TABLE(t) #define VALIDATE_NON_PENDING_TIMER(t) @@ -299,6 +307,8 @@ static void timer_list_shutdown() { gpr_free(g_shards); gpr_free(g_shard_queue); g_shared_mutables.initialized = false; + + DESTROY_TIMER_HASH_TABLE(); } /* returns true if the first element in the list */ |