Improve -EINTR detection in um_wait_for_cqe_without_gvl

noteflakes · noteflakes · commit 6aa7886b5760 · 2024-11-12T19:15:56.000+01:00
diff --git a/ext/um/um.c b/ext/um/um.c
@@ -140,7 +140,7 @@ void *um_wait_for_cqe_without_gvl(void *ptr) {
     //
     // https://github.com/axboe/liburing/issues/1280
     int res = io_uring_submit_and_wait_timeout(&ctx->machine->ring, &ctx->cqe, 1, NULL, NULL);
-    ctx->result = (!ctx->cqe) ? -EINTR : res;
+    ctx->result = (res > 0 && !ctx->cqe) ? -EINTR : res;
   }
   else
     ctx->result = io_uring_wait_cqe(&ctx->machine->ring, &ctx->cqe);

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ void um_wait_for_cqe_without_gvl(void ptr) {`
`140`	`140`	`//`
`141`	`141`	`// https://github.com/axboe/liburing/issues/1280`
`142`	`142`	`int res = io_uring_submit_and_wait_timeout(&ctx->machine->ring, &ctx->cqe, 1, NULL, NULL);`
`143`		`- ctx->result = (!ctx->cqe) ? -EINTR : res;`
	`143`	`+ ctx->result = (res > 0 && !ctx->cqe) ? -EINTR : res;`
`144`	`144`	`}`
`145`	`145`	`else`
`146`	`146`	`ctx->result = io_uring_wait_cqe(&ctx->machine->ring, &ctx->cqe);`