3 files changed, 14 insertions, 19 deletions

diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c
index a04471706e..8b8514ccc9 100644
--- a/test/core/util/port_posix.c
+++ b/test/core/util/port_posix.c
@@ -69,7 +69,7 @@ static int has_port_been_chosen(int port) {
 }
 
 typedef struct freereq {
-  gpr_mu mu;
+  gpr_mu *mu;
   grpc_pollset *pollset;
   int done;
 } freereq;
@@ -83,10 +83,10 @@ static void destroy_pollset_and_shutdown(grpc_exec_ctx *exec_ctx, void *p,
 static void freed_port_from_server(grpc_exec_ctx *exec_ctx, void *arg,
                                    const grpc_httpcli_response *response) {
   freereq *pr = arg;
-  gpr_mu_lock(&pr->mu);
+  gpr_mu_lock(pr->mu);
   pr->done = 1;
   grpc_pollset_kick(pr->pollset, NULL);
-  gpr_mu_unlock(&pr->mu);
+  gpr_mu_unlock(pr->mu);
 }
 
 static void free_port_using_server(char *server, int port) {
@@ -103,7 +103,6 @@ static void free_port_using_server(char *server, int port) {
   memset(&req, 0, sizeof(req));
 
   pr.pollset = gpr_malloc(grpc_pollset_size());
-  gpr_mu_init(&pr.mu);
   grpc_pollset_init(pr.pollset, &pr.mu);
   grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown,
                     pr.pollset);
@@ -116,21 +115,20 @@ static void free_port_using_server(char *server, int port) {
   grpc_httpcli_get(&exec_ctx, &context, pr.pollset, &req,
                    GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), freed_port_from_server,
                    &pr);
-  gpr_mu_lock(&pr.mu);
+  gpr_mu_lock(pr.mu);
   while (!pr.done) {
     grpc_pollset_worker *worker = NULL;
     grpc_pollset_work(&exec_ctx, pr.pollset, &worker,
                       gpr_now(GPR_CLOCK_MONOTONIC),
                       GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1));
   }
-  gpr_mu_unlock(&pr.mu);
+  gpr_mu_unlock(pr.mu);
 
   grpc_httpcli_context_destroy(&context);
   grpc_exec_ctx_finish(&exec_ctx);
   grpc_pollset_shutdown(&exec_ctx, pr.pollset, &shutdown_closure);
   grpc_exec_ctx_finish(&exec_ctx);
   gpr_free(pr.pollset);
-  gpr_mu_destroy(&pr.mu);
   gpr_free(path);
 }
 
@@ -208,7 +206,7 @@ static int is_port_available(int *port, int is_tcp) {
 }
 
 typedef struct portreq {
-  gpr_mu mu;
+  gpr_mu *mu;
   grpc_pollset *pollset;
   int port;
   int retries;
@@ -253,10 +251,10 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg,
     port = port * 10 + response->body[i] - '0';
   }
   GPR_ASSERT(port > 1024);
-  gpr_mu_lock(&pr->mu);
+  gpr_mu_lock(pr->mu);
   pr->port = port;
   grpc_pollset_kick(pr->pollset, NULL);
-  gpr_mu_unlock(&pr->mu);
+  gpr_mu_unlock(pr->mu);
 }
 
 static int pick_port_using_server(char *server) {
@@ -271,7 +269,6 @@ static int pick_port_using_server(char *server) {
   memset(&pr, 0, sizeof(pr));
   memset(&req, 0, sizeof(req));
   pr.pollset = gpr_malloc(grpc_pollset_size());
-  gpr_mu_init(&pr.mu);
   grpc_pollset_init(pr.pollset, &pr.mu);
   grpc_closure_init(&shutdown_closure, destroy_pollset_and_shutdown,
                     pr.pollset);
@@ -287,20 +284,20 @@ static int pick_port_using_server(char *server) {
                    GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server,
                    &pr);
   grpc_exec_ctx_finish(&exec_ctx);
-  gpr_mu_lock(&pr.mu);
+  gpr_mu_lock(pr.mu);
   while (pr.port == -1) {
     grpc_pollset_worker *worker = NULL;
     grpc_pollset_work(&exec_ctx, pr.pollset, &worker,
                       gpr_now(GPR_CLOCK_MONOTONIC),
                       GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1));
   }
-  gpr_mu_unlock(&pr.mu);
+  gpr_mu_unlock(pr.mu);
 
   grpc_httpcli_context_destroy(&context);
   grpc_pollset_shutdown(&exec_ctx, pr.pollset, &shutdown_closure);
   grpc_exec_ctx_finish(&exec_ctx);
   gpr_free(pr.pollset);
-  gpr_mu_destroy(&pr.mu);
+  gpr_mu_destroy(pr.mu);
 
   return pr.port;
 }
diff --git a/test/core/util/test_tcp_server.c b/test/core/util/test_tcp_server.c
index 8f1db4e501..ab379441d8 100644
--- a/test/core/util/test_tcp_server.c
+++ b/test/core/util/test_tcp_server.c
@@ -58,7 +58,6 @@ void test_tcp_server_init(test_tcp_server *server,
   grpc_closure_init(&server->shutdown_complete, on_server_destroyed, server);
   server->shutdown = 0;
   server->pollset = gpr_malloc(grpc_pollset_size());
-  gpr_mu_init(&server->mu);
   grpc_pollset_init(server->pollset, &server->mu);
   server->on_connect = on_connect;
   server->cb_data = user_data;
@@ -91,10 +90,10 @@ void test_tcp_server_poll(test_tcp_server *server, int seconds) {
       gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
                    gpr_time_from_seconds(seconds, GPR_TIMESPAN));
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  gpr_mu_lock(&server->mu);
+  gpr_mu_lock(server->mu);
   grpc_pollset_work(&exec_ctx, server->pollset, &worker,
                     gpr_now(GPR_CLOCK_MONOTONIC), deadline);
-  gpr_mu_unlock(&server->mu);
+  gpr_mu_unlock(server->mu);
   grpc_exec_ctx_finish(&exec_ctx);
 }
 
@@ -116,6 +115,5 @@ void test_tcp_server_destroy(test_tcp_server *server) {
   grpc_exec_ctx_finish(&exec_ctx);
   grpc_pollset_destroy(server->pollset);
   gpr_free(server->pollset);
-  gpr_mu_destroy(&server->mu);
   grpc_shutdown();
 }
diff --git a/test/core/util/test_tcp_server.h b/test/core/util/test_tcp_server.h
index ef9dd007c7..15fcb4fb87 100644
--- a/test/core/util/test_tcp_server.h
+++ b/test/core/util/test_tcp_server.h
@@ -41,7 +41,7 @@ typedef struct test_tcp_server {
   grpc_tcp_server *tcp_server;
   grpc_closure shutdown_complete;
   int shutdown;
-  gpr_mu mu;
+  gpr_mu *mu;
   grpc_pollset *pollset;
   grpc_tcp_server_cb on_connect;
   void *cb_data;