Skip to content

Commit bb1cb6a

Browse files
authored
Merge pull request swiftlang#805 from AtariDreams/buffer
Prefer aligned_alloc over posix_memalign
2 parents a102d19 + d92618a commit bb1cb6a

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/io.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,10 +2374,7 @@ _dispatch_operation_perform(dispatch_operation_t op)
23742374
}
23752375
op->buf = _aligned_malloc(op->buf_siz, siInfo.dwPageSize);
23762376
#else
2377-
err = posix_memalign(&op->buf, (size_t)PAGE_SIZE, op->buf_siz);
2378-
if (err != 0) {
2379-
goto error;
2380-
}
2377+
op->buf = aligned_alloc((size_t)PAGE_SIZE, op->buf_siz)
23812378
#endif
23822379
_dispatch_op_debug("buffer allocated", op);
23832380
} else if (op->direction == DOP_DIR_WRITE) {

tests/dispatch_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ test_async_read(char *path, size_t size, int option, dispatch_queue_t queue,
398398
buffer = _aligned_malloc(size, si.dwPageSize);
399399
#else
400400
size_t pagesize = (size_t)sysconf(_SC_PAGESIZE);
401-
posix_memalign((void **)&buffer, pagesize, size);
401+
buffer = aligned_alloc(pagesize, size);
402402
#endif
403403
ssize_t r = dispatch_test_fd_read(fd, buffer, size);
404404
if (r == -1) {

tests/dispatch_read2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ dispatch_read2(dispatch_fd_t fd,
9191
buffer = _aligned_malloc(bufsiz, pagesize);
9292
#else
9393
size_t pagesize = (size_t)sysconf(_SC_PAGESIZE);
94-
posix_memalign((void **)&buffer, pagesize, bufsiz);
94+
buffer = aligned_alloc(pagesize, bufsiz);
9595
#endif
9696
ssize_t actual = dispatch_test_fd_read(fd, buffer, bufsiz);
9797
if (actual == -1) {

0 commit comments

Comments
 (0)