[compiler-rt] r265660 - [tsan] Add support for dispatch event sources
Kuba Brecka via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 7 04:38:54 PDT 2016
Author: kuba.brecka
Date: Thu Apr 7 06:38:53 2016
New Revision: 265660
URL: http://llvm.org/viewvc/llvm-project?rev=265660&view=rev
Log:
[tsan] Add support for dispatch event sources
GCD has APIs for event sources, we need some more release-acquire pairs to avoid false positives in TSan.
Differential Revision: http://reviews.llvm.org/D18515
Added:
compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel.mm
compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel2.mm
compiler-rt/trunk/test/tsan/Darwin/gcd-source-event.mm
compiler-rt/trunk/test/tsan/Darwin/gcd-source-event2.mm
compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration.mm
compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration2.mm
Modified:
compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc?rev=265660&r1=265659&r2=265660&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_libdispatch_mac.cc Thu Apr 7 06:38:53 2016
@@ -317,6 +317,78 @@ TSAN_INTERCEPTOR(void, dispatch_group_no
dispatch_callback_wrap);
}
+TSAN_INTERCEPTOR(void, dispatch_source_set_event_handler,
+ dispatch_source_t source, dispatch_block_t handler) {
+ SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_event_handler, source, handler);
+ dispatch_block_t new_handler = ^(void) {
+ {
+ SCOPED_INTERCEPTOR_RAW(dispatch_source_set_event_handler_callback);
+ Acquire(thr, pc, (uptr)source);
+ }
+ handler();
+ };
+ Release(thr, pc, (uptr)source);
+ REAL(dispatch_source_set_event_handler)(source, new_handler);
+}
+
+TSAN_INTERCEPTOR(void, dispatch_source_set_event_handler_f,
+ dispatch_source_t source, dispatch_function_t handler) {
+ SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_event_handler_f, source, handler);
+ dispatch_block_t block = ^(void) {
+ handler(dispatch_get_context(source));
+ };
+ WRAP(dispatch_source_set_event_handler)(source, block);
+}
+
+TSAN_INTERCEPTOR(void, dispatch_source_set_cancel_handler,
+ dispatch_source_t source, dispatch_block_t handler) {
+ SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_cancel_handler, source, handler);
+ dispatch_block_t new_handler = ^(void) {
+ {
+ SCOPED_INTERCEPTOR_RAW(dispatch_source_set_cancel_handler_callback);
+ Acquire(thr, pc, (uptr)source);
+ }
+ handler();
+ };
+ Release(thr, pc, (uptr)source);
+ REAL(dispatch_source_set_cancel_handler)(source, new_handler);
+}
+
+TSAN_INTERCEPTOR(void, dispatch_source_set_cancel_handler_f,
+ dispatch_source_t source, dispatch_function_t handler) {
+ SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_cancel_handler_f, source,
+ handler);
+ dispatch_block_t block = ^(void) {
+ handler(dispatch_get_context(source));
+ };
+ WRAP(dispatch_source_set_cancel_handler)(source, block);
+}
+
+TSAN_INTERCEPTOR(void, dispatch_source_set_registration_handler,
+ dispatch_source_t source, dispatch_block_t handler) {
+ SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_registration_handler, source,
+ handler);
+ dispatch_block_t new_handler = ^(void) {
+ {
+ SCOPED_INTERCEPTOR_RAW(dispatch_source_set_registration_handler_callback);
+ Acquire(thr, pc, (uptr)source);
+ }
+ handler();
+ };
+ Release(thr, pc, (uptr)source);
+ REAL(dispatch_source_set_registration_handler)(source, new_handler);
+}
+
+TSAN_INTERCEPTOR(void, dispatch_source_set_registration_handler_f,
+ dispatch_source_t source, dispatch_function_t handler) {
+ SCOPED_TSAN_INTERCEPTOR(dispatch_source_set_registration_handler_f, source,
+ handler);
+ dispatch_block_t block = ^(void) {
+ handler(dispatch_get_context(source));
+ };
+ WRAP(dispatch_source_set_registration_handler)(source, block);
+}
+
} // namespace __tsan
#endif // SANITIZER_MAC
Added: compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel.mm?rev=265660&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel.mm (added)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel.mm Thu Apr 7 06:38:53 2016
@@ -0,0 +1,36 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+
+long global;
+
+int main(int argc, const char *argv[]) {
+ dispatch_queue_t queue =
+ dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
+
+ dispatch_source_t source =
+ dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+
+ dispatch_source_set_timer(source, dispatch_walltime(NULL, 0), 1e9, 5);
+
+ global = 42;
+
+ dispatch_source_set_cancel_handler(source, ^{
+ fprintf(stderr, "global = %ld\n", global);
+
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ CFRunLoopStop(CFRunLoopGetCurrent());
+ });
+ });
+
+ dispatch_resume(source);
+ dispatch_cancel(source);
+
+ CFRunLoopRun();
+
+ return 0;
+}
+
+// CHECK: global = 42
+// CHECK-NOT: WARNING: ThreadSanitizer
Added: compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel2.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel2.mm?rev=265660&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel2.mm (added)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-source-cancel2.mm Thu Apr 7 06:38:53 2016
@@ -0,0 +1,38 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+
+long global;
+
+void handler(void *arg) {
+ fprintf(stderr, "global = %ld\n", global);
+
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ CFRunLoopStop(CFRunLoopGetCurrent());
+ });
+}
+
+int main(int argc, const char *argv[]) {
+ dispatch_queue_t queue =
+ dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
+
+ dispatch_source_t source =
+ dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+
+ dispatch_source_set_timer(source, dispatch_walltime(NULL, 0), 1e9, 5);
+
+ global = 42;
+
+ dispatch_source_set_cancel_handler_f(source, &handler);
+
+ dispatch_resume(source);
+ dispatch_cancel(source);
+
+ CFRunLoopRun();
+
+ return 0;
+}
+
+// CHECK: global = 42
+// CHECK-NOT: WARNING: ThreadSanitizer
Added: compiler-rt/trunk/test/tsan/Darwin/gcd-source-event.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-source-event.mm?rev=265660&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-source-event.mm (added)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-source-event.mm Thu Apr 7 06:38:53 2016
@@ -0,0 +1,35 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+
+long global;
+
+int main(int argc, const char *argv[]) {
+ dispatch_queue_t queue =
+ dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
+
+ dispatch_source_t source =
+ dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+
+ dispatch_source_set_timer(source, dispatch_walltime(NULL, 0), 1e9, 5);
+
+ global = 42;
+
+ dispatch_source_set_event_handler(source, ^{
+ fprintf(stderr, "global = %ld\n", global);
+
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ CFRunLoopStop(CFRunLoopGetCurrent());
+ });
+ });
+
+ dispatch_resume(source);
+
+ CFRunLoopRun();
+
+ return 0;
+}
+
+// CHECK: global = 42
+// CHECK-NOT: WARNING: ThreadSanitizer
Added: compiler-rt/trunk/test/tsan/Darwin/gcd-source-event2.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-source-event2.mm?rev=265660&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-source-event2.mm (added)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-source-event2.mm Thu Apr 7 06:38:53 2016
@@ -0,0 +1,37 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+
+long global;
+
+void handler(void *arg) {
+ fprintf(stderr, "global = %ld\n", global);
+
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ CFRunLoopStop(CFRunLoopGetCurrent());
+ });
+}
+
+int main(int argc, const char *argv[]) {
+ dispatch_queue_t queue =
+ dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
+
+ dispatch_source_t source =
+ dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+
+ dispatch_source_set_timer(source, dispatch_walltime(NULL, 0), 1e9, 5);
+
+ global = 42;
+
+ dispatch_source_set_event_handler_f(source, &handler);
+
+ dispatch_resume(source);
+
+ CFRunLoopRun();
+
+ return 0;
+}
+
+// CHECK: global = 42
+// CHECK-NOT: WARNING: ThreadSanitizer
Added: compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration.mm?rev=265660&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration.mm (added)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration.mm Thu Apr 7 06:38:53 2016
@@ -0,0 +1,33 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+
+long global;
+
+int main(int argc, const char *argv[]) {
+ dispatch_queue_t queue =
+ dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
+
+ dispatch_source_t source =
+ dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGHUP, 0, queue);
+
+ global = 42;
+
+ dispatch_source_set_registration_handler(source, ^{
+ fprintf(stderr, "global = %ld\n", global);
+
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ CFRunLoopStop(CFRunLoopGetCurrent());
+ });
+ });
+
+ dispatch_resume(source);
+
+ CFRunLoopRun();
+
+ return 0;
+}
+
+// CHECK: global = 42
+// CHECK-NOT: WARNING: ThreadSanitizer
Added: compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration2.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration2.mm?rev=265660&view=auto
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration2.mm (added)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-source-registration2.mm Thu Apr 7 06:38:53 2016
@@ -0,0 +1,35 @@
+// RUN: %clang_tsan %s -o %t -framework Foundation
+// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
+
+#import <Foundation/Foundation.h>
+
+long global;
+
+void handler(void *arg) {
+ fprintf(stderr, "global = %ld\n", global);
+
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ CFRunLoopStop(CFRunLoopGetCurrent());
+ });
+}
+
+int main(int argc, const char *argv[]) {
+ dispatch_queue_t queue =
+ dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
+
+ dispatch_source_t source =
+ dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGHUP, 0, queue);
+
+ global = 42;
+
+ dispatch_source_set_registration_handler_f(source, handler);
+
+ dispatch_resume(source);
+
+ CFRunLoopRun();
+
+ return 0;
+}
+
+// CHECK: global = 42
+// CHECK-NOT: WARNING: ThreadSanitizer
More information about the llvm-commits
mailing list