Fix (forever) a TSAN bug thats plagued us

10 years ago · 26205360fe
parent 40d808ffdc
commit 26205360fe
1 changed files with 2 additions and 2 deletions
--- a/src/core/iomgr/tcp_client_posix.c
+++ b/src/core/iomgr/tcp_client_posix.c
@ -114,6 +114,8 @@ static void on_writable(void *acp, int success) {
  void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb;
  void *cb_arg = ac->cb_arg;

+  grpc_alarm_cancel(&ac->alarm);
+
  gpr_mu_lock(&ac->mu);
  if (success) {
    do {
@ -178,8 +180,6 @@ finish:
  if (done) {
    gpr_mu_destroy(&ac->mu);
    gpr_free(ac);
-  } else {
-    grpc_alarm_cancel(&ac->alarm);
  }
  cb(cb_arg, ep);
 }