-
Notifications
You must be signed in to change notification settings - Fork 10.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[tsan] Add HB edges for GCD barrier blocks
Adding support for GCD barrier blocks in concurrent queues. This uses two sync object in the same way as read-write locks do. This also simplifies the use of dispatch groups (the notifications act as barrier blocks). Differential Revision: http://reviews.llvm.org/D21604 llvm-svn: 273893
- Loading branch information
1 parent
a36aa41
commit 2621dea
Showing
3 changed files
with
132 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // RUN: %clang_tsan %s -o %t -framework Foundation | ||
| // RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %deflake %run %t 2>&1 | FileCheck %s | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "../test.h" | ||
|
|
||
| long global; | ||
|
|
||
| int main() { | ||
| fprintf(stderr, "Hello world.\n"); | ||
| print_address("addr=", 1, &global); | ||
| barrier_init(&barrier, 2); | ||
|
|
||
| dispatch_queue_t q = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT); | ||
| dispatch_queue_t bgq = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); | ||
|
|
||
| dispatch_barrier_sync(q, ^{ | ||
| global = 42; | ||
| }); | ||
|
|
||
| dispatch_async(bgq, ^{ | ||
| dispatch_sync(q, ^{ | ||
| global = 43; | ||
| barrier_wait(&barrier); | ||
| }); | ||
| }); | ||
|
|
||
| dispatch_async(bgq, ^{ | ||
| dispatch_sync(q, ^{ | ||
| barrier_wait(&barrier); | ||
| global = 44; | ||
|
|
||
| dispatch_sync(dispatch_get_main_queue(), ^{ | ||
| CFRunLoopStop(CFRunLoopGetCurrent()); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| CFRunLoopRun(); | ||
| fprintf(stderr, "Done.\n"); | ||
| } | ||
|
|
||
| // CHECK: Hello world. | ||
| // CHECK: addr=[[ADDR:0x[0-9,a-f]+]] | ||
| // CHECK: WARNING: ThreadSanitizer: data race | ||
| // CHECK: Location is global 'global' {{(of size 8 )?}}at [[ADDR]] (gcd-barrier-race.mm.tmp+0x{{[0-9,a-f]+}}) | ||
| // CHECK: Done. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // 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> | ||
|
|
||
| #import "../test.h" | ||
|
|
||
| long global; | ||
|
|
||
| int main() { | ||
| fprintf(stderr, "Hello world.\n"); | ||
| print_address("addr=", 1, &global); | ||
| barrier_init(&barrier, 2); | ||
|
|
||
| dispatch_queue_t q = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT); | ||
| dispatch_queue_t bgq = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); | ||
|
|
||
| dispatch_async(bgq, ^{ | ||
| dispatch_sync(q, ^{ | ||
| global = 42; | ||
| }); | ||
| barrier_wait(&barrier); | ||
| }); | ||
|
|
||
| dispatch_async(bgq, ^{ | ||
| barrier_wait(&barrier); | ||
| dispatch_barrier_sync(q, ^{ | ||
| global = 43; | ||
| }); | ||
|
|
||
| dispatch_async(bgq, ^{ | ||
| barrier_wait(&barrier); | ||
| global = 44; | ||
| }); | ||
|
|
||
| barrier_wait(&barrier); | ||
|
|
||
| dispatch_sync(dispatch_get_main_queue(), ^{ | ||
| CFRunLoopStop(CFRunLoopGetCurrent()); | ||
| }); | ||
| }); | ||
|
|
||
| CFRunLoopRun(); | ||
| fprintf(stderr, "Done.\n"); | ||
| } | ||
|
|
||
| // CHECK: Hello world. | ||
| // CHECK: Done. | ||
| // CHECK-NOT: WARNING: ThreadSanitizer |