Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-03-04 14:07:30 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

adopt new aio read api

Browse Source
This commit is contained in:
Ryo Nakamura
2025-08-12 12:35:04 +09:00
parent 6716a71575
commit 3f8b107d77
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/path.c
View File

@@ -410,46 +410,45 @@ static int copy_chunk_l2r(struct chunk *c, int fd, sftp_file sf, int nr_ahead, i
return 0; return 0;
} }
static int copy_chunk_r2l(struct chunk *c, sftp_file sf, int fd, int nr_ahead, int buf_sz, static int copy_chunk_r2l(struct chunk *c, sftp_file sf, int fd,
struct bwlimit *bw, size_t *counter) int nr_ahead, int buf_sz,
struct bwlimit *bw, size_t *counter)
{ {
ssize_t read_bytes, write_bytes, remaind, thrown; ssize_t read_bytes, write_bytes, remain, thrown, len, requested;
sftp_aio reqs[nr_ahead];
char buf[buf_sz]; char buf[buf_sz];
int idx; int i;
struct {
int id;
ssize_t len;
} reqs[nr_ahead];
if (c->len == 0) if (c->len == 0)
return 0; return 0;
remaind = thrown = c->len; remain = thrown = c->len;
for (idx = 0; idx < nr_ahead && thrown > 0; idx++) { for (i = 0; i < nr_ahead && thrown > 0; i++) {
reqs[idx].len = min(thrown, sizeof(buf)); len = min(thrown, sizeof(buf));
reqs[idx].id = sftp_async_read_begin(sf, reqs[idx].len); requested = sftp_aio_begin_read(sf, len, &reqs[i]);
if (reqs[idx].id < 0) { if (requested == SSH_ERROR) {
priv_set_errv("sftp_async_read_begin: %d", priv_set_errv("sftp_aio_begin_read: %d",
sftp_get_error(sf->sftp)); sftp_get_error(sf->sftp));
return -1; return -1;
} }
thrown -= reqs[idx].len; thrown -= requested;
bwlimit_wait(bw, reqs[idx].len); bwlimit_wait(bw, requested);
} }
for (idx = 0; remaind > 0; idx = (idx + 1) % nr_ahead) { for (i = 0; remain > 0; i = (i + 1) % nr_ahead) {
read_bytes = sftp_async_read(sf, buf, reqs[idx].len, reqs[idx].id); read_bytes = sftp_aio_wait_read(&reqs[i], buf, sizeof(buf));
if (read_bytes == SSH_ERROR) { if (read_bytes == SSH_ERROR) {
priv_set_errv("sftp_async_read: %d", sftp_get_error(sf->sftp)); priv_set_errv("sftp_aio_wait_read: %d",
sftp_get_error(sf->sftp));
return -1; return -1;
} }
if (thrown > 0) { if (thrown > 0) {
reqs[idx].len = min(thrown, sizeof(buf)); len = min(thrown, sizeof(buf));
reqs[idx].id = sftp_async_read_begin(sf, reqs[idx].len); requested = sftp_aio_begin_read(sf, len, &reqs[i]);
thrown -= reqs[idx].len; thrown -= requested;
bwlimit_wait(bw, reqs[idx].len); bwlimit_wait(bw, requested);
} }
write_bytes = write(fd, buf, read_bytes); write_bytes = write(fd, buf, read_bytes);
@@ -464,13 +463,13 @@ static int copy_chunk_r2l(struct chunk *c, sftp_file sf, int fd, int nr_ahead, i
} }
*counter += write_bytes; *counter += write_bytes;
remaind -= read_bytes; remain -= write_bytes;
} }
if (remaind < 0) { if (remain < 0) {
priv_set_errv("invalid remaind bytes %ld. last async_read bytes %ld. " priv_set_errv("invalid remain bytes %ld. last async_read bytes %ld. "
"last write bytes %ld", "last write bytes %ld",
remaind, read_bytes, write_bytes); remain, read_bytes, write_bytes);
return -1; return -1;
} }