luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-14 06:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-3624-wakeup-eintr-glib-2-78' into 'glib-2-78'

Browse Source 
Backport  “wakeup: Fix g_wakeup_acknowledge if signal comes in” to glib-2-78

See merge request
This commit is contained in:
Michael Catanzaro
2023-10-05 17:57:11 +00:00
parent e3ff3b5a24 794d792e23
commit 4b39ae7b6e
1 changed files with 8 additions and 3 deletions

11
glib/gwakeup.c

@ -207,20 +207,25 @@ g_wakeup_get_pollfd (GWakeup *wakeup,
void
g_wakeup_acknowledge (GWakeup *wakeup)
{
/* read until it is empty */
int res;
if (wakeup->fds[1] == -1)
{
uint64_t value;
/* eventfd() read resets counter */
read (wakeup->fds[0], &value, sizeof (value));
do
res = read (wakeup->fds[0], &value, sizeof (value));
while (G_UNLIKELY (res == -1 && errno == EINTR));
}
else
{
uint8_t value;
while (read (wakeup->fds[0], &value, sizeof (value)) == sizeof (value));
/* read until it is empty */
do
res = read (wakeup->fds[0], &value, sizeof (value));
while (res == sizeof (value) || G_UNLIKELY (res == -1 && errno == EINTR));
}
}