X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgasynchelper.c;h=7cf86f1b7d7b372fce7efde3a537672be40a0dab;hb=634b69219979c084837c59874e5b2aec01a1d3e4;hp=6387bf92283bc75b65df44cf6815e764de366179;hpb=10ba0c2e5c6ed069420ec926c1094331c44fb71e;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c
index 6387bf9..7cf86f1 100644
--- a/gio/gasynchelper.c
+++ b/gio/gasynchelper.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
@@ -24,136 +22,62 @@
#include "gasynchelper.h"
-#include "gioalias.h"
-/**
+/*< private >
* SECTION:gasynchelper
* @short_description: Asynchronous Helper Functions
* @include: gio/gio.h
- * @see_also: #GAsyncReady
+ * @see_also: #GAsyncResult
*
* Provides helper functions for asynchronous operations.
*
**/
-/*************************************************************************
- * fd source *
- ************************************************************************/
-
-typedef struct
-{
- GSource source;
- GPollFD pollfd;
- GCancellable *cancellable;
- gulong cancelled_tag;
- GObject *object;
-} FDSource;
-
-static gboolean
-fd_source_prepare (GSource *source,
- gint *timeout)
-{
- FDSource *fd_source = (FDSource *)source;
- *timeout = -1;
-
- return g_cancellable_is_cancelled (fd_source->cancellable);
-}
-
-static gboolean
-fd_source_check (GSource *source)
-{
- FDSource *fd_source = (FDSource *)source;
-
- return
- g_cancellable_is_cancelled (fd_source->cancellable) ||
- fd_source->pollfd.revents != 0;
-}
-
-static gboolean
-fd_source_dispatch (GSource *source,
- GSourceFunc callback,
- gpointer user_data)
-
-{
- GFDSourceFunc func = (GFDSourceFunc)callback;
- GFDSourceObjectFunc func2 = (GFDSourceObjectFunc)callback;
- FDSource *fd_source = (FDSource *)source;
-
- g_warn_if_fail (func != NULL);
-
- if (fd_source->object)
- return (*func2) (fd_source->object, fd_source->pollfd.revents, user_data);
- else
- return (*func) (user_data, fd_source->pollfd.revents, fd_source->pollfd.fd);
-}
-
-static void
-fd_source_finalize (GSource *source)
-{
- FDSource *fd_source = (FDSource *)source;
-
- if (fd_source->cancelled_tag)
- g_cancellable_disconnect (fd_source->cancellable,
- fd_source->cancelled_tag);
-
- if (fd_source->cancellable)
- g_object_unref (fd_source->cancellable);
-
- if (fd_source->object)
- g_object_unref (fd_source->object);
-}
-
-static GSourceFuncs fd_source_funcs = {
- fd_source_prepare,
- fd_source_check,
- fd_source_dispatch,
- fd_source_finalize
-};
-
-/* Might be called on another thread */
-static void
-fd_source_cancelled_cb (GCancellable *cancellable,
- gpointer data)
-{
- /* Wake up the mainloop in case we're waiting on async calls with FDSource */
- g_main_context_wakeup (NULL);
-}
-
-GSource *
-_g_fd_source_new_with_object (GObject *object,
- int fd,
- gushort events,
- GCancellable *cancellable)
-{
- GSource *source;
- FDSource *fd_source;
-
- source = g_source_new (&fd_source_funcs, sizeof (FDSource));
- fd_source = (FDSource *)source;
-
- if (cancellable)
- fd_source->cancellable = g_object_ref (cancellable);
-
- if (object)
- fd_source->object = g_object_ref (object);
-
- fd_source->pollfd.fd = fd;
- fd_source->pollfd.events = events;
- g_source_add_poll (source, &fd_source->pollfd);
-
- if (cancellable)
- fd_source->cancelled_tag =
- g_cancellable_connect (cancellable,
- (GCallback)fd_source_cancelled_cb,
- NULL, NULL);
-
- return source;
-}
-
-GSource *
-_g_fd_source_new (int fd,
- gushort events,
- GCancellable *cancellable)
+#ifdef G_OS_WIN32
+gboolean
+_g_win32_overlap_wait_result (HANDLE hfile,
+ OVERLAPPED *overlap,
+ DWORD *transferred,
+ GCancellable *cancellable)
{
- return _g_fd_source_new_with_object (NULL, fd, events, cancellable);
+ GPollFD pollfd[2];
+ gboolean result = FALSE;
+ gint num, npoll;
+
+ pollfd[0].fd = (gint)overlap->hEvent;
+ pollfd[0].events = G_IO_IN;
+ num = 1;
+
+ if (g_cancellable_make_pollfd (cancellable, &pollfd[1]))
+ num++;
+
+loop:
+ npoll = g_poll (pollfd, num, -1);
+ if (npoll <= 0)
+ /* error out, should never happen */
+ goto end;
+
+ if (g_cancellable_is_cancelled (cancellable))
+ {
+ /* 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:
+ if (num > 1)
+ g_cancellable_release_fd (cancellable);
+
+ return result;
}
+#endif