[PATCH] D31475: [tsan] Add interceptor for xpc_connection_cancel to avoid false positives

[Kuba (Brecka) Mracek via Phabricator via llvm-commits]

kubamracek created this revision.
kubamracek added a project: Sanitizers.

TSan reports a false positive when using `xpc_connection_cancel`.  We're missing a happens-before edge from `xpc_connection_cancel` to the event handler on the same connection.


Repository:
  rL LLVM

https://reviews.llvm.org/D31475

Files:
  lib/tsan/rtl/tsan_interceptors_mac.cc
  test/tsan/Darwin/xpc-cancel.mm


Index: test/tsan/Darwin/xpc-cancel.mm
===================================================================
--- test/tsan/Darwin/xpc-cancel.mm
+++ test/tsan/Darwin/xpc-cancel.mm
@@ -0,0 +1,37 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+#import <xpc/xpc.h>
+
+long global;
+
+int main(int argc, const char *argv[]) {
+  fprintf(stderr, "Hello world.\n");
+
+  dispatch_queue_t server_q = dispatch_queue_create("server.queue", DISPATCH_QUEUE_CONCURRENT);
+  xpc_connection_t server_conn = xpc_connection_create(NULL, server_q);
+
+  xpc_connection_set_event_handler(server_conn, ^(xpc_object_t client) {
+    if (client == XPC_ERROR_CONNECTION_INTERRUPTED || client == XPC_ERROR_CONNECTION_INVALID) {
+      global = 43;
+      
+      dispatch_async(dispatch_get_main_queue(), ^{
+        CFRunLoopStop(CFRunLoopGetCurrent());
+      });
+    }
+  });
+  xpc_connection_resume(server_conn);
+  
+  global = 42;
+  
+  xpc_connection_cancel(server_conn);
+  
+  CFRunLoopRun();
+
+  fprintf(stderr, "Done.\n");
+}
+
+// CHECK: Hello world.
+// CHECK-NOT: WARNING: ThreadSanitizer
+// CHECK: Done.
Index: lib/tsan/rtl/tsan_interceptors_mac.cc
===================================================================
--- lib/tsan/rtl/tsan_interceptors_mac.cc
+++ lib/tsan/rtl/tsan_interceptors_mac.cc
@@ -280,6 +280,12 @@
   REAL(xpc_connection_send_message_with_reply)
   (connection, message, replyq, new_handler);
 }
+  
+TSAN_INTERCEPTOR(void, xpc_connection_cancel, xpc_connection_t connection) {
+  SCOPED_TSAN_INTERCEPTOR(xpc_connection_cancel, connection);
+  Release(thr, pc, (uptr)connection);
+  REAL(xpc_connection_cancel)(connection);
+}
 
 // On macOS, libc++ is always linked dynamically, so intercepting works the
 // usual way.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31475.93395.patch
Type: text/x-patch
Size: 1820 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170329/2c6fa419/attachment.bin>