commit 0317b3d082a2120900123744aeaadd871133e724
author Craig Tiller <ctiller@google.com> Mon Jun 01 21:57:03 2015 -0700
committer Craig Tiller <ctiller@google.com> Mon Jun 01 21:57:03 2015 -0700
tree 8a9fdfe3c653fa1c8274a044f23eefe86826bcd4
parent 668e3582ea86c6d9e5c70ea347cffe59ea290cd7

Fix TSAN reported errors

src/core/iomgr/fd_posix.c

diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c
index a43e3ed..52a6920 100644
--- a/src/core/iomgr/fd_posix.c
+++ b/src/core/iomgr/fd_posix.c
@@ -134,7 +134,9 @@
 #endif
   old = gpr_atm_full_fetch_add(&fd->refst, -n);
   if (old == n) {
-    grpc_iomgr_add_callback(&fd->on_done_closure);
+    if (fd->on_done_closure) {
+      grpc_iomgr_add_callback(fd->on_done_closure);
+    }
     freelist_fd(fd);
     grpc_iomgr_unregister_object(&fd->iomgr_object);
   } else {
@@ -153,8 +155,6 @@
   gpr_mu_destroy(&fd_freelist_mu);
 }
 
-static void do_nothing(void *ignored, int success) {}
-
 grpc_fd *grpc_fd_create(int fd, const char *name) {
   grpc_fd *r = alloc_fd(fd);
   grpc_iomgr_register_object(&r->iomgr_object, name);
@@ -195,9 +195,8 @@
   }
 }
 
-void grpc_fd_orphan(grpc_fd *fd, grpc_iomgr_cb_func on_done, void *user_data) {
-  grpc_iomgr_closure_init(&fd->on_done_closure, on_done ? on_done : do_nothing,
-                          user_data);
+void grpc_fd_orphan(grpc_fd *fd, grpc_iomgr_closure *on_done) {
+  fd->on_done_closure = on_done;
   shutdown(fd->fd, SHUT_RDWR);
   REF_BY(fd, 1, "orphan"); /* remove active status, but keep referenced */
   gpr_mu_lock(&fd->watcher_mu);
@@ -208,21 +207,18 @@
 
 /* increment refcount by two to avoid changing the orphan bit */
 #ifdef GRPC_FD_REF_COUNT_DEBUG
-void grpc_fd_ref(grpc_fd *fd, const char *reason, const char *file, int line) { 
-  ref_by(fd, 2, reason, file, line); 
+void grpc_fd_ref(grpc_fd *fd, const char *reason, const char *file, int line) {
+  ref_by(fd, 2, reason, file, line);
 }
 
-void grpc_fd_unref(grpc_fd *fd, const char *reason, const char *file, int line) { 
-  unref_by(fd, 2, reason, file, line); 
+void grpc_fd_unref(grpc_fd *fd, const char *reason, const char *file,
+                   int line) {
+  unref_by(fd, 2, reason, file, line);
 }
 #else
-void grpc_fd_ref(grpc_fd *fd) { 
-  ref_by(fd, 2); 
-}
+void grpc_fd_ref(grpc_fd *fd) { ref_by(fd, 2); }
 
-void grpc_fd_unref(grpc_fd *fd) { 
-  unref_by(fd, 2); 
-}
+void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); }
 #endif
 
 static void process_callback(grpc_iomgr_closure *closure, int success,