This is an archive of the discontinued LLVM Phabricator instance.

Differential D60591

[TSan][libdispatch] Replace NSTemporaryDirectory in tests
ClosedPublic

Authored by yln on Apr 11 2019, 4:42 PM.

Details

Reviewers
kubamracek
dcoughlin
Commits
rGbfcbd677c8b8: [TSan][libdispatch] Replace NSTemporaryDirectory in tests
rCRT358308: [TSan][libdispatch] Replace NSTemporaryDirectory in tests
rL358308: [TSan][libdispatch] Replace NSTemporaryDirectory in tests
Summary

After this change, most tests don't have a dependency on Foundation.

Note: To hold the file name tempnam allocates a new buffer. We leak
this buffer (omit the free), but I don't think we need to care.

Diff Detail

Event Timeline

yln created this revision.Apr 11 2019, 4:42 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 11 2019, 4:42 PM
Herald added subscribers: llvm-commits, Restricted Project, kubamracek. · View Herald Transcript
Harbormaster completed remote builds in B30409: Diff 194785.Apr 11 2019, 4:44 PM
yln edited the summary of this revision. (Show Details)Apr 11 2019, 4:45 PM
yln added reviewers: kubamracek, dcoughlin.
kubamracek accepted this revision.Apr 12 2019, 1:03 PM
kubamracek added inline comments.
compiler-rt/test/tsan/Darwin/gcd-fd.mm
4

Do we want to remove this now?

This revision is now accepted and ready to land.Apr 12 2019, 1:03 PM
yln marked 2 inline comments as done.Apr 12 2019, 1:08 PM
yln added inline comments.
compiler-rt/test/tsan/Darwin/gcd-fd.mm
4

Yes, I will do this plus renaming/moving the tests in a separate commit.

Closed by commit rL358308: [TSan][libdispatch] Replace NSTemporaryDirectory in tests (authored by yln). · Explain WhyApr 12 2019, 1:28 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptApr 12 2019, 1:28 PM

Revision Contents

PathSize
compiler-rt/
test/
tsan/
Darwin/
6 lines
3 lines
3 lines
3 lines
3 lines
3 lines

Diff 194785

compiler-rt/test/tsan/Darwin/gcd-fd.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 | FileCheck %s // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
kubamracekUnsubmitted
Not Done
ReplyInline Actions

Do we want to remove this now?

kubamracek: Do we want to remove this now?
ylnAuthorUnsubmitted
Done
ReplyInline Actions

Yes, I will do this plus renaming/moving the tests in a separate commit.

yln: Yes, I will do this plus renaming/moving the tests in a separate commit.
long my_global = 0; long my_global = 0;
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
fprintf(stderr, "Hello world.\n"); fprintf(stderr, "Hello world.\n");
dispatch_queue_t queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL); dispatch_queue_t queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL);
dispatch_semaphore_t sem = dispatch_semaphore_create(0); dispatch_semaphore_t sem = dispatch_semaphore_create(0);
NSString *path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]]; const char *path = tempnam(NULL, "libdispatch-fd-");
dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path.fileSystemRepresentation, O_CREAT | O_WRONLY, dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY,
0666, queue, ^(int error) { }); 0666, queue, ^(int error) { });
dispatch_io_set_high_water(channel, 1); dispatch_io_set_high_water(channel, 1);
char buf[1000]; char buf[1000];
dispatch_data_t data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT); dispatch_data_t data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
my_global++; my_global++;
dispatch_io_write(channel, 0, data, queue, ^(bool done, dispatch_data_t remainingData, int error) { dispatch_io_write(channel, 0, data, queue, ^(bool done, dispatch_data_t remainingData, int error) {
my_global++; my_global++;
dispatch_async(queue, ^{ dispatch_async(queue, ^{
my_global++; my_global++;
if (done) { if (done) {
dispatch_semaphore_signal(sem); dispatch_semaphore_signal(sem);
} }
}); });
}); });
dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
my_global++; my_global++;
dispatch_io_close(channel, 0); dispatch_io_close(channel, 0);
channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path.fileSystemRepresentation, O_RDONLY, channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_RDONLY,
0, queue, ^(int error) { }); 0, queue, ^(int error) { });
dispatch_io_set_high_water(channel, 1); dispatch_io_set_high_water(channel, 1);
my_global++; my_global++;
dispatch_io_read(channel, 0, SIZE_MAX, queue, ^(bool done, dispatch_data_t remainingData, int error) { dispatch_io_read(channel, 0, SIZE_MAX, queue, ^(bool done, dispatch_data_t remainingData, int error) {
my_global++; my_global++;
dispatch_async(queue, ^{ dispatch_async(queue, ^{
my_global++; my_global++;
Show All 15 Lines

compiler-rt/test/tsan/Darwin/gcd-io-barrier-race.mm

Show All 13 Lines
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
fprintf(stderr, "Hello world.\n"); fprintf(stderr, "Hello world.\n");
print_address("addr=", 1, &my_global); print_address("addr=", 1, &my_global);
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT); queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
sem = dispatch_semaphore_create(0); sem = dispatch_semaphore_create(0);
NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]]; path = tempnam(NULL, "libdispatch-io-barrier-race-");
path = ns_path.fileSystemRepresentation;
char buf[1000]; char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT); data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY, 0666, queue, ^(int error) { }); dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY, 0666, queue, ^(int error) { });
if (! channel) abort(); if (! channel) abort();
dispatch_io_set_high_water(channel, 1); dispatch_io_set_high_water(channel, 1);
dispatch_io_write(channel, 0, data, queue, ^(bool done, dispatch_data_t remainingData, int error) { dispatch_io_write(channel, 0, data, queue, ^(bool done, dispatch_data_t remainingData, int error) {
Show All 24 Lines

compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm

Show All 9 Lines
long my_global = 0; long my_global = 0;
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
fprintf(stderr, "Hello world.\n"); fprintf(stderr, "Hello world.\n");
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT); queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
sem = dispatch_semaphore_create(0); sem = dispatch_semaphore_create(0);
NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]]; path = tempnam(NULL, "libdispatch-io-barrier");
path = ns_path.fileSystemRepresentation;
char buf[1000]; char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT); data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY, 0666, queue, ^(int error) { }); dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY, 0666, queue, ^(int error) { });
if (! channel) abort(); if (! channel) abort();
dispatch_io_set_high_water(channel, 1); dispatch_io_set_high_water(channel, 1);
for (int i = 0; i < 1000; i++) { for (int i = 0; i < 1000; i++) {
Show All 21 Lines

compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm

// RUN: %clang_tsan %s -o %t -framework Foundation // RUN: %clang_tsan %s -o %t -framework Foundation
// RUN: %run %t 2>&1 | FileCheck %s // RUN: %run %t 2>&1 | FileCheck %s
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
long my_global = 0; long my_global = 0;
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
fprintf(stderr, "Hello world.\n"); fprintf(stderr, "Hello world.\n");
dispatch_queue_t queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT); dispatch_queue_t queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
dispatch_semaphore_t sem = dispatch_semaphore_create(0); dispatch_semaphore_t sem = dispatch_semaphore_create(0);
NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]]; const char *path = tempnam(NULL, "libdispatch-io-cleanup-");
const char *path = ns_path.fileSystemRepresentation;
dispatch_io_t channel; dispatch_io_t channel;
dispatch_fd_t fd = open(path, O_CREAT | O_WRONLY, 0666); dispatch_fd_t fd = open(path, O_CREAT | O_WRONLY, 0666);
my_global++; my_global++;
channel = dispatch_io_create(DISPATCH_IO_STREAM, fd, queue, ^(int error) { channel = dispatch_io_create(DISPATCH_IO_STREAM, fd, queue, ^(int error) {
my_global++; my_global++;
dispatch_semaphore_signal(sem); dispatch_semaphore_signal(sem);
}); });
Show All 34 Lines

compiler-rt/test/tsan/Darwin/gcd-io-race.mm

Show All 15 Lines
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
fprintf(stderr, "Hello world.\n"); fprintf(stderr, "Hello world.\n");
print_address("addr=", 1, &my_global); print_address("addr=", 1, &my_global);
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT); queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
sem = dispatch_semaphore_create(0); sem = dispatch_semaphore_create(0);
NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]]; path = tempnam(NULL, "libdispatch-io-race");
path = ns_path.fileSystemRepresentation;
char buf[1000]; char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT); data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY, 0666, queue, ^(int error) { }); dispatch_io_t channel = dispatch_io_create_with_path(DISPATCH_IO_STREAM, path, O_CREAT | O_WRONLY, 0666, queue, ^(int error) { });
if (! channel) abort(); if (! channel) abort();
dispatch_io_set_high_water(channel, 1); dispatch_io_set_high_water(channel, 1);
dispatch_io_write(channel, 0, data, queue, ^(bool done, dispatch_data_t remainingData, int error) { dispatch_io_write(channel, 0, data, queue, ^(bool done, dispatch_data_t remainingData, int error) {
Show All 23 Lines

compiler-rt/test/tsan/Darwin/gcd-io.mm

Show First 20 Lines • Show All 92 Lines • ▼ Show 20 Linesvoid test_dispatch_read() {
close(fd); close(fd);
} }
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
fprintf(stderr, "Hello world.\n"); fprintf(stderr, "Hello world.\n");
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL); queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL);
sem = dispatch_semaphore_create(0); sem = dispatch_semaphore_create(0);
NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]]; path = tempnam(NULL, "libdispatch-io-");
path = ns_path.fileSystemRepresentation;
char buf[1000]; char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT); data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
test_dispatch_io_write(); test_dispatch_io_write();
test_dispatch_write(); test_dispatch_write();
test_dispatch_io_read(); test_dispatch_io_read();
test_dispatch_read(); test_dispatch_read();
fprintf(stderr, "Done.\n"); fprintf(stderr, "Done.\n");
return 0; return 0;
} }
// CHECK: Hello world. // CHECK: Hello world.
// CHECK-NOT: WARNING: ThreadSanitizer // CHECK-NOT: WARNING: ThreadSanitizer
// CHECK: Done. // CHECK: Done.