From 25819ec642ef3659150c759280a8a3c3b8c87931 Mon Sep 17 00:00:00 2001
From: bright <bright2227@gmail.com>
Date: Sat, 1 Aug 2026 18:06:46 +0800
Subject: [PATCH] native: retry interrupted completion reaping

---
 src/uringcore_liburing.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/uringcore_liburing.c b/src/uringcore_liburing.c
index 380a01e..0146732 100644
--- a/src/uringcore_liburing.c
+++ b/src/uringcore_liburing.c
@@ -39,6 +39,7 @@ struct UringCoreLiburingRing {
     unsigned int features;
     unsigned int pending;
     unsigned int prepared;
+    unsigned long long generation;
 };
 
 static PyTypeObject UringCoreLiburingRequestType;
@@ -102,6 +103,7 @@ uringcore_liburing_ring_close_resources(UringCoreLiburingRing *self)
     UringCoreLiburingRequest *request;
 
     if (self->initialized) {
+        self->generation++;
         io_uring_queue_exit(&self->ring);
         memset(&self->ring, 0, sizeof(self->ring));
         self->initialized = 0;
@@ -300,6 +302,7 @@ uringcore_liburing_ring_init(
     }
 
     self->initialized = 1;
+    self->generation++;
     self->sq_entries = params.sq_entries;
     self->cq_entries = params.cq_entries;
     self->features = params.features;
@@ -369,15 +372,27 @@ uringcore_liburing_ring_submit(
 {
     UringCoreLiburingRequest *request;
     unsigned int remaining;
+    unsigned long long generation;
     int result;
 
     if (!self->initialized) {
         PyErr_SetString(PyExc_RuntimeError, "ring is closed");
         return NULL;
     }
+    generation = self->generation;
 
     do {
         result = io_uring_submit(&self->ring);
+        if (result == -EINTR && PyErr_CheckSignals() < 0) {
+            return NULL;
+        }
+        if (result == -EINTR &&
+            (!self->initialized || self->generation != generation)) {
+            PyErr_SetString(
+                PyExc_RuntimeError,
+                "ring changed while submit was interrupted");
+            return NULL;
+        }
     } while (result == -EINTR);
     if (result < 0) {
         errno = -result;
@@ -417,6 +432,7 @@ uringcore_liburing_ring_reap(
     unsigned int max_completions = 64;
     PyObject *completed;
     unsigned int reaped = 0;
+    unsigned long long generation;
 
     if (!PyArg_ParseTupleAndKeywords(
             args,
@@ -457,6 +473,7 @@ uringcore_liburing_ring_reap(
         PyErr_SetString(PyExc_RuntimeError, "ring is closed");
         return NULL;
     }
+    generation = self->generation;
 
     completed = PyList_New(0);
     if (completed == NULL) {
@@ -465,7 +482,23 @@ uringcore_liburing_ring_reap(
     while (reaped < max_completions) {
         UringCoreLiburingRequest *request;
         struct io_uring_cqe *cqe;
-        int result = io_uring_peek_cqe(&self->ring, &cqe);
+        int result;
+
+        do {
+            result = io_uring_peek_cqe(&self->ring, &cqe);
+            if (result == -EINTR && PyErr_CheckSignals() < 0) {
+                Py_DECREF(completed);
+                return NULL;
+            }
+            if (result == -EINTR &&
+                (!self->initialized || self->generation != generation)) {
+                PyErr_SetString(
+                    PyExc_RuntimeError,
+                    "ring changed while completion reaping was interrupted");
+                Py_DECREF(completed);
+                return NULL;
+            }
+        } while (result == -EINTR);
 
         if (result == -EAGAIN) {
             break;