diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-10-19 14:36:04 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-10-19 14:36:04 -0700 |
| commit | 70ee74c4798afe781788d40afe1923feff37d657 (patch) | |
| tree | 7ba929cf88d563f344b68932ec9d7d38bef89538 | |
| parent | 20e77f27b0cf2cb1305df21a91e6a51d9a4171d1 (diff) | |
| parent | 2406e31b839b3d0106658431943f3f03c2df2358 (diff) | |
Merge pull request #8427 from ctiller/lock-cycle
Avoid TSAN reported lock cycle
| -rw-r--r-- | test/core/iomgr/tcp_server_posix_test.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 6b1dd428a1..5791f562e1 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -118,8 +118,11 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, grpc_endpoint_shutdown(exec_ctx, tcp); grpc_endpoint_destroy(exec_ctx, tcp); + on_connect_result temp_result; + on_connect_result_set(&temp_result, acceptor); + gpr_mu_lock(g_mu); - on_connect_result_set(&g_result, acceptor); + g_result = temp_result; g_nconnects++; GPR_ASSERT( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); |