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

glib/gpoll W32: trust WFMOE() return value

Browse Source 
WaitForMultipleObjectsEx() returns the index of the *first* handle that triggered the wakeup, and promises that all handles with lower index are still inactive. Therefore, don't check them, only check the handles with higher index. This removes the need of rearranging the handles (and, now, handle_to_fd) array, it's enough to take a pointer to the next item and use it as a new, shorter array.

https://bugzilla.gnome.org/show_bug.cgi?id=785468
This commit is contained in:
Руслан Ижбулатов 2017-07-29 08:12:40 +00:00
parent 226ea94685
commit b267f648d9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glib/gpoll.c
View File

@ -226,15 +226,16 @@ poll_rest (GPollFD *msg_fd,
*/
if (timeout == 0 && nhandles > 1)
{
/* Remove the handle that fired */
int i;
for (i = ready - WAIT_OBJECT_0 + 1; i < nhandles; i++)
{
handles[i-1] = handles[i];
handle_to_fd[i-1] = handle_to_fd[i];
}
nhandles--;
recursed_result = poll_rest (NULL, handles, handle_to_fd, nhandles, 0);
/* Poll the handles with index > ready */
HANDLE *shorter_handles;
GPollFD **shorter_handle_to_fd;
gint shorter_nhandles;
shorter_handles = &handles[ready - WAIT_OBJECT_0 + 1];
shorter_handle_to_fd = &handle_to_fd[ready - WAIT_OBJECT_0 + 1];
shorter_nhandles = nhandles - (ready - WAIT_OBJECT_0 + 1);
recursed_result = poll_rest (NULL, shorter_handles, shorter_handle_to_fd, shorter_nhandles, 0);
return (recursed_result == -1) ? -1 : 1 + recursed_result;
}
return 1;