From 7766912dda5b2ce1d6a13f2acc7762fd21104b10 Mon Sep 17 00:00:00 2001
From: xtao <vertextao@hotmail.com>
Date: Tue, 12 Feb 2019 16:52:02 +0800
Subject: [PATCH] fix more detected mu/cv leaks

---
 src/core/ext/transport/inproc/inproc_transport.cc | 5 ++---
 test/core/end2end/inproc_callback_test.cc         | 5 ++++-
 test/core/gpr/cpu_test.cc                         | 2 ++
 test/core/gpr/mpscq_test.cc                       | 1 +
 test/core/gprpp/thd_test.cc                       | 2 ++
 test/cpp/microbenchmarks/bm_closure.cc            | 2 ++
 test/cpp/util/grpc_tool.cc                        | 1 +
 7 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc
index ac5441fd39d..b0f93eb63f4 100644
--- a/src/core/ext/transport/inproc/inproc_transport.cc
+++ b/src/core/ext/transport/inproc/inproc_transport.cc
@@ -64,9 +64,7 @@ struct shared_mu {
     gpr_ref_init(&refs, 2);
   }
 
-  ~shared_mu() {
-    gpr_mu_destroy(&mu);
-  }
+  ~shared_mu() { gpr_mu_destroy(&mu); }
 
   gpr_mu mu;
   gpr_refcount refs;
@@ -87,6 +85,7 @@ struct inproc_transport {
   ~inproc_transport() {
     grpc_connectivity_state_destroy(&connectivity);
     if (gpr_unref(&mu->refs)) {
+      mu->~shared_mu();
       gpr_free(mu);
     }
   }
diff --git a/test/core/end2end/inproc_callback_test.cc b/test/core/end2end/inproc_callback_test.cc
index 72ad992d54c..550c2c2d69a 100644
--- a/test/core/end2end/inproc_callback_test.cc
+++ b/test/core/end2end/inproc_callback_test.cc
@@ -65,7 +65,10 @@ class ShutdownCallback : public grpc_experimental_completion_queue_functor {
     gpr_mu_init(&mu_);
     gpr_cv_init(&cv_);
   }
-  ~ShutdownCallback() {}
+  ~ShutdownCallback() {
+    gpr_mu_destroy(&mu_);
+    gpr_cv_destroy(&cv_);
+  }
   static void StaticRun(grpc_experimental_completion_queue_functor* cb,
                         int ok) {
     auto* callback = static_cast<ShutdownCallback*>(cb);
diff --git a/test/core/gpr/cpu_test.cc b/test/core/gpr/cpu_test.cc
index dbaeb08c183..316a4c61bef 100644
--- a/test/core/gpr/cpu_test.cc
+++ b/test/core/gpr/cpu_test.cc
@@ -140,6 +140,8 @@ static void cpu_test(void) {
   }
   fprintf(stderr, "] (%d/%d)\n", cores_seen, ct.ncores);
   fflush(stderr);
+  gpr_mu_destroy(&ct.mu);
+  gpr_cv_destroy(&ct.done_cv);
   gpr_free(ct.used);
 }
 
diff --git a/test/core/gpr/mpscq_test.cc b/test/core/gpr/mpscq_test.cc
index c826ccb498b..744cea934c5 100644
--- a/test/core/gpr/mpscq_test.cc
+++ b/test/core/gpr/mpscq_test.cc
@@ -178,6 +178,7 @@ static void test_mt_multipop(void) {
   for (auto& th : thds) {
     th.Join();
   }
+  gpr_mu_destroy(&pa.mu);
   gpr_mpscq_destroy(&q);
 }
 
diff --git a/test/core/gprpp/thd_test.cc b/test/core/gprpp/thd_test.cc
index 06aa58984b0..eda78d95323 100644
--- a/test/core/gprpp/thd_test.cc
+++ b/test/core/gprpp/thd_test.cc
@@ -71,6 +71,8 @@ static void test1(void) {
     th.Join();
   }
   GPR_ASSERT(t.n == 0);
+  gpr_mu_destroy(&t.mu);
+  gpr_cv_destroy(&t.done_cv);
 }
 
 static void thd_body2(void* v) {}
diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc
index 74ca1ce3a49..e1f1e92d4d8 100644
--- a/test/cpp/microbenchmarks/bm_closure.cc
+++ b/test/cpp/microbenchmarks/bm_closure.cc
@@ -183,6 +183,7 @@ static void BM_AcquireMutex(benchmark::State& state) {
     DoNothing(nullptr, GRPC_ERROR_NONE);
     gpr_mu_unlock(&mu);
   }
+  gpr_mu_destroy(&mu);
 
   track_counters.Finish(state);
 }
@@ -202,6 +203,7 @@ static void BM_TryAcquireMutex(benchmark::State& state) {
       abort();
     }
   }
+  gpr_mu_destroy(&mu);
 
   track_counters.Finish(state);
 }
diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc
index 80eaf4f7279..44b14bf617f 100644
--- a/test/cpp/util/grpc_tool.cc
+++ b/test/cpp/util/grpc_tool.cc
@@ -590,6 +590,7 @@ bool GrpcTool::CallMethod(int argc, const char** argv,
 
     call.WritesDoneAndWait();
     read_thread.join();
+    gpr_mu_destroy(&parser_mu);
 
     std::multimap<grpc::string_ref, grpc::string_ref> server_trailing_metadata;
     Status status = call.Finish(&server_trailing_metadata);