cpp/liburing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

examples/link-cp: fix a few issues

Browse Source 
Still need to handle broken chains, must resubmit those.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2019-05-14 20:46:12 -06:00
parent bb2c80ff0f
commit 7e8902e14c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/link-cp.c
View File

@@ -78,7 +78,7 @@ static int queue_rw_pair(struct io_uring *ring, off_t size, off_t offset)
return 0; return 0;
} }
static void handle_cqe(struct io_uring_cqe *cqe) static void handle_cqe(struct io_uring *ring, struct io_uring_cqe *cqe)
{ {
struct io_data *data; struct io_data *data;
@@ -86,10 +86,9 @@ static void handle_cqe(struct io_uring_cqe *cqe)
printf("cqe error: %s\n", strerror(cqe->res)); printf("cqe error: %s\n", strerror(cqe->res));
data = io_uring_cqe_get_data(cqe); data = io_uring_cqe_get_data(cqe);
if (!data) if (data)
return; free(data);
io_uring_cqe_seen(ring, cqe);
free(data);
} }
static int copy_file(struct io_uring *ring, off_t insize) static int copy_file(struct io_uring *ring, off_t insize)
@@ -103,8 +102,9 @@ static int copy_file(struct io_uring *ring, off_t insize)
inflight = 0; inflight = 0;
while (insize) { while (insize) {
int has_inflight = inflight; int has_inflight = inflight;
int depth;
while (inflight < QD) { while (insize && inflight < QD) {
this_size = BS; this_size = BS;
if (this_size > insize) if (this_size > insize)
this_size = insize; this_size = insize;
@@ -117,12 +117,16 @@ static int copy_file(struct io_uring *ring, off_t insize)
if (has_inflight != inflight) if (has_inflight != inflight)
io_uring_submit(ring); io_uring_submit(ring);
while (inflight >= QD) { if (insize)
depth = QD;
else
depth = 1;
while (inflight >= depth) {
int ret; int ret;
ret = io_uring_wait_cqe(ring, &cqe); ret = io_uring_wait_cqe(ring, &cqe);
assert(ret >= 0); assert(ret >= 0);
handle_cqe(cqe); handle_cqe(ring, cqe);
inflight--; inflight--;
} }
} }