luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix,fs: fix uv_fs_sendfile()

Browse Source 
Fix the `off_in` argument  in `copy_file_range()`.

Fixes: https://github.com/libuv/libuv/issues/3056
PR-URL: https://github.com/libuv/libuv/pull/3058
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Santiago Gimeno 2020-12-01 10:43:46 +01:00
parent dde98158b5
commit 263516e0a0
No known key found for this signature in database
GPG Key ID: F28C3C8DA33C03BE
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/unix/fs.c
View File

@ -919,7 +919,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
static int copy_file_range_support = 1; static int copy_file_range_support = 1;
if (copy_file_range_support) { if (copy_file_range_support) {
r = uv__fs_copy_file_range(in_fd, NULL, out_fd, &off, req->bufsml[0].len, 0); r = uv__fs_copy_file_range(in_fd, &off, out_fd, NULL, req->bufsml[0].len, 0);
if (r == -1 && errno == ENOSYS) { if (r == -1 && errno == ENOSYS) {
errno = 0; errno = 0;

27
test/test-fs.c
View File

@ -673,7 +673,7 @@ static void stat_cb(uv_fs_t* req) {
static void sendfile_cb(uv_fs_t* req) { static void sendfile_cb(uv_fs_t* req) {
ASSERT(req == &sendfile_req); ASSERT(req == &sendfile_req);
ASSERT(req->fs_type == UV_FS_SENDFILE); ASSERT(req->fs_type == UV_FS_SENDFILE);
ASSERT(req->result == 65546); ASSERT(req->result == 65545);
sendfile_cb_count++; sendfile_cb_count++;
uv_fs_req_cleanup(req); uv_fs_req_cleanup(req);
} }
@ -1190,6 +1190,8 @@ TEST_IMPL(fs_async_dir) {
static int test_sendfile(void (*setup)(int), uv_fs_cb cb, off_t expected_size) { static int test_sendfile(void (*setup)(int), uv_fs_cb cb, off_t expected_size) {
int f, r; int f, r;
struct stat s1, s2; struct stat s1, s2;
uv_fs_t req;
char buf1[1];
loop = uv_default_loop(); loop = uv_default_loop();
@ -1219,7 +1221,7 @@ static int test_sendfile(void (*setup)(int), uv_fs_cb cb, off_t expected_size) {
uv_fs_req_cleanup(&open_req2); uv_fs_req_cleanup(&open_req2);
r = uv_fs_sendfile(loop, &sendfile_req, open_req2.result, open_req1.result, r = uv_fs_sendfile(loop, &sendfile_req, open_req2.result, open_req1.result,
0, 131072, cb); 1, 131072, cb);
ASSERT(r == 0); ASSERT(r == 0);
uv_run(loop, UV_RUN_DEFAULT); uv_run(loop, UV_RUN_DEFAULT);
@ -1234,9 +1236,26 @@ static int test_sendfile(void (*setup)(int), uv_fs_cb cb, off_t expected_size) {
ASSERT(0 == stat("test_file", &s1)); ASSERT(0 == stat("test_file", &s1));
ASSERT(0 == stat("test_file2", &s2)); ASSERT(0 == stat("test_file2", &s2));
ASSERT(s1.st_size == s2.st_size);
ASSERT(s2.st_size == expected_size); ASSERT(s2.st_size == expected_size);
if (expected_size > 0) {
ASSERT_UINT64_EQ(s1.st_size, s2.st_size + 1);
r = uv_fs_open(NULL, &open_req1, "test_file2", O_RDWR, 0, NULL);
ASSERT(r >= 0);
ASSERT(open_req1.result >= 0);
uv_fs_req_cleanup(&open_req1);
memset(buf1, 0, sizeof(buf1));
iov = uv_buf_init(buf1, sizeof(buf1));
r = uv_fs_read(NULL, &req, open_req1.result, &iov, 1, -1, NULL);
ASSERT(r >= 0);
ASSERT(req.result >= 0);
ASSERT_EQ(buf1[0], 'e'); /* 'e' from begin */
uv_fs_req_cleanup(&req);
} else {
ASSERT_UINT64_EQ(s1.st_size, s2.st_size);
}
/* Cleanup. */ /* Cleanup. */
unlink("test_file"); unlink("test_file");
unlink("test_file2"); unlink("test_file2");
@ -1254,7 +1273,7 @@ static void sendfile_setup(int f) {
TEST_IMPL(fs_async_sendfile) { TEST_IMPL(fs_async_sendfile) {
return test_sendfile(sendfile_setup, sendfile_cb, 65546); return test_sendfile(sendfile_setup, sendfile_cb, 65545);
} }