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

win32: make gio stream cancellable

Browse Source 
v2:
 - fix cancellation of concurrent readers
 - replace g_assert() usage with g_warn_if_fail()
v3:
 - fix indentation
 - fix loop code to not leak (silly me)

https://bugzilla.gnome.org/show_bug.cgi?id=679288
This commit is contained in:
Marc-André Lureau 2012-07-06 00:46:32 +02:00
parent 4b5d762d5d
commit b9d7b80897
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gio/gasynchelper.c
View File

@ -174,9 +174,9 @@ gboolean
_g_win32_overlap_wait_result (HANDLE hfile, _g_win32_overlap_wait_result (HANDLE hfile,
OVERLAPPED *overlap, OVERLAPPED *overlap,
DWORD *transferred, DWORD *transferred,
GCancellable *cancellable G_GNUC_UNUSED) GCancellable *cancellable)
{ {
GPollFD pollfd[1] = { 0, }; GPollFD pollfd[2];
gboolean result = FALSE; gboolean result = FALSE;
gint num, npoll; gint num, npoll;
@ -184,15 +184,36 @@ _g_win32_overlap_wait_result (HANDLE hfile,
pollfd[0].events = G_IO_IN; pollfd[0].events = G_IO_IN;
num = 1; num = 1;
if (g_cancellable_make_pollfd (cancellable, &pollfd[1]))
num++;
loop:
npoll = g_poll (pollfd, num, -1); npoll = g_poll (pollfd, num, -1);
if (npoll <= 0) if (npoll <= 0)
/* error out, should never happen */ /* error out, should never happen */
goto end; goto end;
/* either cancelled or IO completed, either way get the result */ if (g_cancellable_is_cancelled (cancellable))
result = GetOverlappedResult (overlap->hEvent, overlap, transferred, TRUE); {
/* CancelIO only cancels pending operations issued by the
* current thread and since we're doing only sync operations,
* this is safe.... */
/* CancelIoEx is only Vista+. Since we have only one overlap
* operaton on this thread, we can just use: */
result = CancelIo (hfile);
g_warn_if_fail (result);
}
result = GetOverlappedResult (overlap->hEvent, overlap, transferred, FALSE);
if (result == FALSE &&
GetLastError () == ERROR_IO_INCOMPLETE &&
!g_cancellable_is_cancelled (cancellable))
goto loop;
end: end:
if (num > 1)
g_cancellable_release_fd (cancellable);
return result; return result;
} }
#endif #endif