Fix timerfd reader not being removed from asyncio loop

igo95862 · igo95862 · commit 266fca55fec6 · 2024-09-23T21:02:33.000+01:00
The copy pasted code in the timer fd paths removed the bus fd. Thanks @ofacklam for noticing it.
diff --git a/src/sdbus/sd_bus_internals_bus.c b/src/sdbus/sd_bus_internals_bus.c
@@ -30,7 +30,7 @@ static void SdBus_dealloc(SdBusObject* self) {
                 Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_writer_str, self->bus_fd, NULL));
         }
         if (NULL != self->timer_fd) {
-                Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->bus_fd, NULL));
+                Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->timer_fd, NULL));
                 Py_DECREF(self->timer_fd);
                 close(self->timer_fd_int);
         }
@@ -631,7 +631,7 @@ static PyObject* SdBus_close(SdBusObject* self, PyObject* Py_UNUSED(args)) {
                 Py_XDECREF(CALL_PYTHON_AND_CHECK(PyObject_CallMethodObjArgs(self->loop, remove_writer_str, self->bus_fd, NULL)));
         }
         if (NULL != self->timer_fd) {
-                Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->bus_fd, NULL));
+                Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->timer_fd, NULL));
                 // TODO: Close timerfd
         }
         Py_RETURN_NONE;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ static void SdBus_dealloc(SdBusObject* self) {`
`30`	`30`	`Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_writer_str, self->bus_fd, NULL));`
`31`	`31`	`}`
`32`	`32`	`if (NULL != self->timer_fd) {`
`33`		`- Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->bus_fd, NULL));`
	`33`	`+ Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->timer_fd, NULL));`
`34`	`34`	`Py_DECREF(self->timer_fd);`
`35`	`35`	`close(self->timer_fd_int);`
`36`	`36`	`}`
`@@ -631,7 +631,7 @@ static PyObject* SdBus_close(SdBusObject* self, PyObject* Py_UNUSED(args)) {`
`631`	`631`	`Py_XDECREF(CALL_PYTHON_AND_CHECK(PyObject_CallMethodObjArgs(self->loop, remove_writer_str, self->bus_fd, NULL)));`
`632`	`632`	`}`
`633`	`633`	`if (NULL != self->timer_fd) {`
`634`		`- Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->bus_fd, NULL));`
	`634`	`+ Py_XDECREF(PyObject_CallMethodObjArgs(self->loop, remove_reader_str, self->timer_fd, NULL));`
`635`	`635`	`// TODO: Close timerfd`
`636`	`636`	`}`
`637`	`637`	`Py_RETURN_NONE;`