Page MenuHomePhabricator

D60591.diff
No OneTemporary

File Metadata

Created
Wed, Jul 17, 7:34 AM

D60591.diff

Index: compiler-rt/trunk/test/tsan/Darwin/gcd-fd.mm
===================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-fd.mm
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-fd.mm
@@ -11,9 +11,9 @@
dispatch_queue_t queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL);
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) { });
dispatch_io_set_high_water(channel, 1);
@@ -34,7 +34,7 @@
dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
my_global++;
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) { });
dispatch_io_set_high_water(channel, 1);
Index: compiler-rt/trunk/test/tsan/Darwin/gcd-io-barrier-race.mm
===================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-io-barrier-race.mm
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-io-barrier-race.mm
@@ -19,8 +19,7 @@
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
sem = dispatch_semaphore_create(0);
- NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]];
- path = ns_path.fileSystemRepresentation;
+ path = tempnam(NULL, "libdispatch-io-barrier-race-");
char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
Index: compiler-rt/trunk/test/tsan/Darwin/gcd-io-barrier.mm
===================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-io-barrier.mm
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-io-barrier.mm
@@ -15,8 +15,7 @@
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
sem = dispatch_semaphore_create(0);
- NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]];
- path = ns_path.fileSystemRepresentation;
+ path = tempnam(NULL, "libdispatch-io-barrier");
char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
Index: compiler-rt/trunk/test/tsan/Darwin/gcd-io-cleanup.mm
===================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-io-cleanup.mm
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-io-cleanup.mm
@@ -10,8 +10,7 @@
dispatch_queue_t queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
dispatch_semaphore_t sem = dispatch_semaphore_create(0);
- NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]];
- const char *path = ns_path.fileSystemRepresentation;
+ const char *path = tempnam(NULL, "libdispatch-io-cleanup-");
dispatch_io_t channel;
dispatch_fd_t fd = open(path, O_CREAT | O_WRONLY, 0666);
Index: compiler-rt/trunk/test/tsan/Darwin/gcd-io-race.mm
===================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-io-race.mm
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-io-race.mm
@@ -21,8 +21,7 @@
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_CONCURRENT);
sem = dispatch_semaphore_create(0);
- NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]];
- path = ns_path.fileSystemRepresentation;
+ path = tempnam(NULL, "libdispatch-io-race");
char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);
Index: compiler-rt/trunk/test/tsan/Darwin/gcd-io.mm
===================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-io.mm
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-io.mm
@@ -98,8 +98,7 @@
queue = dispatch_queue_create("my.queue", DISPATCH_QUEUE_SERIAL);
sem = dispatch_semaphore_create(0);
- NSString *ns_path = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"temp-gcd-io.%d", getpid()]];
- path = ns_path.fileSystemRepresentation;
+ path = tempnam(NULL, "libdispatch-io-");
char buf[1000];
data = dispatch_data_create(buf, sizeof(buf), NULL, DISPATCH_DATA_DESTRUCTOR_DEFAULT);

Event Timeline