X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgmain.c;h=9c65c5aa50e17c1e892d3476300e3a978bc5cfb0;hb=5bc7729d16b641022f5eb8a4022515a163063ce9;hp=52b1c21eb900c2baa4165df8aa8d9c0580220232;hpb=4abb6c13bed8ad398c124e8880b8743617f8bee1;p=platform%2Fupstream%2Fglib.git diff --git a/glib/gmain.c b/glib/gmain.c index 52b1c21..9c65c5a 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -24,20 +24,36 @@ * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -/* +/* * MT safe */ #include "config.h" +#include "glibconfig.h" -/* uncomment the next line to get poll() debugging info */ +/* Uncomment the next line (and the corresponding line in gpoll.c) to + * enable debugging printouts if the environment variable + * G_MAIN_POLL_DEBUG is set to some value. + */ /* #define G_MAIN_POLL_DEBUG */ -#include "glib.h" -#include "gthreadprivate.h" +#ifdef _WIN32 +/* Always enable debugging printout on Windows, as it is more often + * needed there... + */ +#define G_MAIN_POLL_DEBUG +#endif + +#ifdef G_OS_UNIX +#include "glib-unix.h" +#ifdef HAVE_EVENTFD +#include +#endif +#endif + #include #include #include @@ -45,23 +61,11 @@ #ifdef HAVE_SYS_TIME_H #include #endif /* HAVE_SYS_TIME_H */ -#ifdef GLIB_HAVE_SYS_POLL_H -# include -# undef events /* AIX 4.1.5 & 4.3.2 define this for SVR3,4 compatibility */ -# undef revents /* AIX 4.1.5 & 4.3.2 define this for SVR3,4 compatibility */ - -/* The poll() emulation on OS/X doesn't handle fds=NULL, nfds=0, - * so we prefer our own poll emulation. - */ -#if defined(_POLL_EMUL_H_) || defined(BROKEN_POLL) -#undef HAVE_POLL -#endif - -#endif /* GLIB_HAVE_SYS_POLL_H */ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ #include +#include #ifdef G_OS_WIN32 #define STRICT @@ -73,17 +77,108 @@ #include #endif /* G_OS_BEOS */ -#ifdef G_OS_UNIX -#include -#include +#include "gmain.h" + +#include "garray.h" +#include "giochannel.h" +#include "ghash.h" +#include "ghook.h" +#include "gqueue.h" +#include "gstrfuncs.h" +#include "gtestutils.h" +#include "gthreadprivate.h" + +#ifdef G_OS_WIN32 +#include "gwin32.h" +#endif + +#ifdef G_MAIN_POLL_DEBUG +#include "gtimer.h" #endif -#include "galias.h" +#include "gwakeup.h" + +/** + * SECTION:main + * @title: The Main Event Loop + * @short_description: manages all available sources of events + * + * The main event loop manages all the available sources of events for + * GLib and GTK+ applications. These events can come from any number of + * different types of sources such as file descriptors (plain files, + * pipes or sockets) and timeouts. New types of event sources can also + * be added using g_source_attach(). + * + * To allow multiple independent sets of sources to be handled in + * different threads, each source is associated with a #GMainContext. + * A GMainContext can only be running in a single thread, but + * sources can be added to it and removed from it from other threads. + * + * Each event source is assigned a priority. The default priority, + * #G_PRIORITY_DEFAULT, is 0. Values less than 0 denote higher priorities. + * Values greater than 0 denote lower priorities. Events from high priority + * sources are always processed before events from lower priority sources. + * + * Idle functions can also be added, and assigned a priority. These will + * be run whenever no events with a higher priority are ready to be processed. + * + * The #GMainLoop data type represents a main event loop. A GMainLoop is + * created with g_main_loop_new(). After adding the initial event sources, + * g_main_loop_run() is called. This continuously checks for new events from + * each of the event sources and dispatches them. Finally, the processing of + * an event from one of the sources leads to a call to g_main_loop_quit() to + * exit the main loop, and g_main_loop_run() returns. + * + * It is possible to create new instances of #GMainLoop recursively. + * This is often used in GTK+ applications when showing modal dialog + * boxes. Note that event sources are associated with a particular + * #GMainContext, and will be checked and dispatched for all main + * loops associated with that GMainContext. + * + * GTK+ contains wrappers of some of these functions, e.g. gtk_main(), + * gtk_main_quit() and gtk_events_pending(). + * + * Creating new source types + * One of the unusual features of the #GMainLoop functionality + * is that new types of event source can be created and used in + * addition to the builtin type of event source. A new event source + * type is used for handling GDK events. A new source type is created + * by deriving from the #GSource structure. + * The derived type of source is represented by a structure that has + * the #GSource structure as a first element, and other elements specific + * to the new source type. To create an instance of the new source type, + * call g_source_new() passing in the size of the derived structure and + * a table of functions. These #GSourceFuncs determine the behavior of + * the new source type. + * New source types basically interact with the main context + * in two ways. Their prepare function in #GSourceFuncs can set a timeout + * to determine the maximum amount of time that the main loop will sleep + * before checking the source again. In addition, or as well, the source + * can add file descriptors to the set that the main context checks using + * g_source_add_poll(). + * + * Customizing the main loop iteration + * Single iterations of a #GMainContext can be run with + * g_main_context_iteration(). In some cases, more detailed control + * of exactly how the details of the main loop work is desired, for + * instance, when integrating the #GMainLoop with an external main loop. + * In such cases, you can call the component functions of + * g_main_context_iteration() directly. These functions are + * g_main_context_prepare(), g_main_context_query(), + * g_main_context_check() and g_main_context_dispatch(). + * The operation of these functions can best be seen in terms + * of a state diagram, as shown in . + *
States of a Main Context + * + *
+ * + */ /* Types */ typedef struct _GTimeoutSource GTimeoutSource; typedef struct _GChildWatchSource GChildWatchSource; +typedef struct _GUnixSignalWatchSource GUnixSignalWatchSource; typedef struct _GPollRec GPollRec; typedef struct _GSourceCallback GSourceCallback; @@ -93,7 +188,6 @@ typedef enum G_SOURCE_CAN_RECURSE = 1 << (G_HOOK_FLAG_USER_SHIFT + 1) } GSourceFlags; -#ifdef G_THREADS_ENABLED typedef struct _GMainWaiter GMainWaiter; struct _GMainWaiter @@ -101,19 +195,21 @@ struct _GMainWaiter GCond *cond; GMutex *mutex; }; -#endif typedef struct _GMainDispatch GMainDispatch; struct _GMainDispatch { gint depth; - GSList *source; /* stack of current sources */ + GSList *dispatching_sources; /* stack of current sources */ }; +#ifdef G_MAIN_POLL_DEBUG +gboolean _g_main_poll_debug = FALSE; +#endif + struct _GMainContext { -#ifdef G_THREADS_ENABLED /* The following lock is used for both the list of sources * and the list of poll records */ @@ -122,7 +218,6 @@ struct _GMainContext GThread *owner; guint owner_count; GSList *waiters; -#endif gint ref_count; @@ -133,31 +228,25 @@ struct _GMainContext GSource *source_list; gint in_check_or_prepare; - GPollRec *poll_records; + GPollRec *poll_records, *poll_records_tail; guint n_poll_records; GPollFD *cached_poll_array; guint cached_poll_array_size; -#ifdef G_THREADS_ENABLED -#ifndef G_OS_WIN32 -/* this pipe is used to wake up the main loop when a source is added. - */ - gint wake_up_pipe[2]; -#else /* G_OS_WIN32 */ - HANDLE wake_up_semaphore; -#endif /* G_OS_WIN32 */ + GWakeup *wakeup; GPollFD wake_up_rec; gboolean poll_waiting; /* Flag indicating whether the set of fd's changed during a poll */ gboolean poll_changed; -#endif /* G_THREADS_ENABLED */ GPollFunc poll_func; - GTimeVal current_time; - gboolean time_is_current; + gint64 time; + gboolean time_is_fresh; + gint64 real_time; + gboolean real_time_is_fresh; }; struct _GSourceCallback @@ -178,9 +267,9 @@ struct _GMainLoop struct _GTimeoutSource { GSource source; - GTimeVal expiration; + gint64 expiration; guint interval; - guint granularity; + gboolean seconds; }; struct _GChildWatchSource @@ -196,22 +285,30 @@ struct _GChildWatchSource #endif /* G_OS_WIN32 */ }; +struct _GUnixSignalWatchSource +{ + GSource source; + int signum; + gboolean pending; +}; + struct _GPollRec { GPollFD *fd; + GPollRec *prev; GPollRec *next; gint priority; }; -#ifdef G_THREADS_ENABLED +struct _GSourcePrivate +{ + GSList *child_sources; + GSource *parent_source; +}; + #define LOCK_CONTEXT(context) g_static_mutex_lock (&context->mutex) #define UNLOCK_CONTEXT(context) g_static_mutex_unlock (&context->mutex) #define G_THREAD_SELF g_thread_self () -#else -#define LOCK_CONTEXT(context) (void)0 -#define UNLOCK_CONTEXT(context) (void)0 -#define G_THREAD_SELF NULL -#endif #define SOURCE_DESTROYED(source) (((source)->flags & G_HOOK_FLAG_ACTIVE) == 0) #define SOURCE_BLOCKED(source) (((source)->flags & G_HOOK_FLAG_IN_CALL) != 0 && \ @@ -234,6 +331,9 @@ static void g_source_unref_internal (GSource *source, static void g_source_destroy_internal (GSource *source, GMainContext *context, gboolean have_lock); +static void g_source_set_priority_unlocked (GSource *source, + GMainContext *context, + gint priority); static void g_main_context_poll (GMainContext *context, gint timeout, gint priority, @@ -246,6 +346,8 @@ static void g_main_context_remove_poll_unlocked (GMainContext *context, GPollFD *fd); static void g_main_context_wakeup_unlocked (GMainContext *context); +static void _g_main_wake_up_all_contexts (void); + static gboolean g_timeout_prepare (GSource *source, gint *timeout); static gboolean g_timeout_check (GSource *source); @@ -258,6 +360,17 @@ static gboolean g_child_watch_check (GSource *source); static gboolean g_child_watch_dispatch (GSource *source, GSourceFunc callback, gpointer user_data); +#ifdef G_OS_UNIX +static gpointer unix_signal_helper_thread (gpointer data) G_GNUC_NORETURN; +static void g_unix_signal_handler (int signum); +static gboolean g_unix_signal_watch_prepare (GSource *source, + gint *timeout); +static gboolean g_unix_signal_watch_check (GSource *source); +static gboolean g_unix_signal_watch_dispatch (GSource *source, + GSourceFunc callback, + gpointer user_data); +static void g_unix_signal_watch_finalize (GSource *source); +#endif static gboolean g_idle_prepare (GSource *source, gint *timeout); static gboolean g_idle_check (GSource *source); @@ -270,21 +383,47 @@ static GMainContext *default_main_context; static GSList *main_contexts_without_pipe = NULL; #ifndef G_OS_WIN32 -/* Child status monitoring code */ + +/* The UNIX signal pipe contains a single byte specifying which + * signal was received. + */ +#define _UNIX_SIGNAL_PIPE_SIGCHLD_CHAR 'C' +#define _UNIX_SIGNAL_PIPE_SIGHUP_CHAR 'H' +#define _UNIX_SIGNAL_PIPE_SIGINT_CHAR 'I' +#define _UNIX_SIGNAL_PIPE_SIGTERM_CHAR 'T' +/* Guards all the data below */ +G_LOCK_DEFINE_STATIC (unix_signal_lock); enum { - CHILD_WATCH_UNINITIALIZED, - CHILD_WATCH_INITIALIZED_SINGLE, - CHILD_WATCH_INITIALIZED_THREADED + UNIX_SIGNAL_UNINITIALIZED = 0, + UNIX_SIGNAL_INITIALIZED_SINGLE, + UNIX_SIGNAL_INITIALIZED_THREADED }; -static gint child_watch_init_state = CHILD_WATCH_UNINITIALIZED; +static gint unix_signal_init_state = UNIX_SIGNAL_UNINITIALIZED; +typedef struct { + /* These are only used in the UNIX_SIGNAL_INITIALIZED_SINGLE case */ + gboolean sighup_delivered : 1; + gboolean sigint_delivered : 1; + gboolean sigterm_delivered : 1; +} UnixSignalState; +static sigset_t unix_signal_mask; +static UnixSignalState unix_signal_state; +static gint unix_signal_wake_up_pipe[2]; +GSList *unix_signal_watches; + +/* Not guarded ( FIXME should it be? ) */ static gint child_watch_count = 1; -static gint child_watch_wake_up_pipe[2] = {0, 0}; + +static GSourceFuncs g_unix_signal_funcs = +{ + g_unix_signal_watch_prepare, + g_unix_signal_watch_check, + g_unix_signal_watch_dispatch, + g_unix_signal_watch_finalize +}; #endif /* !G_OS_WIN32 */ G_LOCK_DEFINE_STATIC (main_context_list); static GSList *main_context_list = NULL; -static gint timer_perturb = -1; - GSourceFuncs g_timeout_funcs = { g_timeout_prepare, @@ -309,285 +448,6 @@ GSourceFuncs g_idle_funcs = NULL }; -#ifdef HAVE_POLL -/* SunOS has poll, but doesn't provide a prototype. */ -# if defined (sun) && !defined (__SVR4) -extern gint poll (GPollFD *ufds, guint nfsd, gint timeout); -# endif /* !sun */ -#else /* !HAVE_POLL */ - -#ifdef G_OS_WIN32 - -static gint -g_poll (GPollFD *fds, - guint nfds, - gint timeout) -{ - HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - gboolean poll_msgs = FALSE; - GPollFD *f; - DWORD ready; - MSG msg; - UINT timer; - gint nhandles = 0; - - for (f = fds; f < &fds[nfds]; ++f) - if (f->fd >= 0) - { - if (f->fd == G_WIN32_MSG_HANDLE) - poll_msgs = TRUE; - else if (nhandles == MAXIMUM_WAIT_OBJECTS) - { - g_warning (G_STRLOC ": Too many handles to wait for!\n"); - break; - } - else - { -#ifdef G_MAIN_POLL_DEBUG - g_print ("g_poll: waiting for %#x\n", f->fd); -#endif - handles[nhandles++] = (HANDLE) f->fd; - } - } - - if (timeout == -1) - timeout = INFINITE; - - if (poll_msgs) - { - /* Waiting for messages, and maybe events - * -> First PeekMessage - */ -#ifdef G_MAIN_POLL_DEBUG - g_print ("PeekMessage\n"); -#endif - if (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) - ready = WAIT_OBJECT_0 + nhandles; - else - { - if (nhandles == 0) - { - /* Waiting just for messages */ - if (timeout == INFINITE) - { - /* Infinite timeout - * -> WaitMessage - */ -#ifdef G_MAIN_POLL_DEBUG - g_print ("WaitMessage\n"); -#endif - if (!WaitMessage ()) - { - gchar *emsg = g_win32_error_message (GetLastError ()); - g_warning (G_STRLOC ": WaitMessage() failed: %s", emsg); - g_free (emsg); - } - ready = WAIT_OBJECT_0 + nhandles; - } - else if (timeout == 0) - { - /* Waiting just for messages, zero timeout. - * If we got here, there was no message - */ - ready = WAIT_TIMEOUT; - } - else - { - /* Waiting just for messages, some timeout - * -> Set a timer, wait for message, - * kill timer, use PeekMessage - */ - timer = SetTimer (NULL, 0, timeout, NULL); - if (timer == 0) - { - gchar *emsg = g_win32_error_message (GetLastError ()); - g_warning (G_STRLOC ": SetTimer() failed: %s", emsg); - g_free (emsg); - ready = WAIT_TIMEOUT; - } - else - { -#ifdef G_MAIN_POLL_DEBUG - g_print ("WaitMessage\n"); -#endif - WaitMessage (); - KillTimer (NULL, timer); -#ifdef G_MAIN_POLL_DEBUG - g_print ("PeekMessage\n"); -#endif - if (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE) - && msg.message != WM_TIMER) - ready = WAIT_OBJECT_0; - else - ready = WAIT_TIMEOUT; - } - } - } - else - { - /* Wait for either message or event - * -> Use MsgWaitForMultipleObjects - */ -#ifdef G_MAIN_POLL_DEBUG - g_print ("MsgWaitForMultipleObjects(%d, %d)\n", nhandles, timeout); -#endif - ready = MsgWaitForMultipleObjects (nhandles, handles, FALSE, - timeout, QS_ALLINPUT); - - if (ready == WAIT_FAILED) - { - gchar *emsg = g_win32_error_message (GetLastError ()); - g_warning (G_STRLOC ": MsgWaitForMultipleObjects() failed: %s", emsg); - g_free (emsg); - } - } - } - } - else if (nhandles == 0) - { - /* Wait for nothing (huh?) */ - return 0; - } - else - { - /* Wait for just events - * -> Use WaitForMultipleObjects - */ -#ifdef G_MAIN_POLL_DEBUG - g_print ("WaitForMultipleObjects(%d, %d)\n", nhandles, timeout); -#endif - ready = WaitForMultipleObjects (nhandles, handles, FALSE, timeout); - if (ready == WAIT_FAILED) - { - gchar *emsg = g_win32_error_message (GetLastError ()); - g_warning (G_STRLOC ": WaitForMultipleObjects() failed: %s", emsg); - g_free (emsg); - } - } - -#ifdef G_MAIN_POLL_DEBUG - g_print ("wait returns %ld%s\n", - ready, - (ready == WAIT_FAILED ? " (WAIT_FAILED)" : - (ready == WAIT_TIMEOUT ? " (WAIT_TIMEOUT)" : - (poll_msgs && ready == WAIT_OBJECT_0 + nhandles ? " (msg)" : "")))); -#endif - for (f = fds; f < &fds[nfds]; ++f) - f->revents = 0; - - if (ready == WAIT_FAILED) - return -1; - else if (ready == WAIT_TIMEOUT) - return 0; - else if (poll_msgs && ready == WAIT_OBJECT_0 + nhandles) - { - for (f = fds; f < &fds[nfds]; ++f) - if (f->fd >= 0) - { - if (f->events & G_IO_IN) - if (f->fd == G_WIN32_MSG_HANDLE) - f->revents |= G_IO_IN; - } - } - else if (ready >= WAIT_OBJECT_0 && ready < WAIT_OBJECT_0 + nhandles) - for (f = fds; f < &fds[nfds]; ++f) - { - if (f->fd == (gint) handles[ready - WAIT_OBJECT_0]) - { - f->revents = f->events; -#ifdef G_MAIN_POLL_DEBUG - g_print ("g_poll: got event %#x\n", f->fd); -#endif - } - } - - return 1; -} - -#else /* !G_OS_WIN32 */ - -/* The following implementation of poll() comes from the GNU C Library. - * Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc. - */ - -#include /* for bzero on BSD systems */ - -#ifdef HAVE_SYS_SELECT_H -#include -#endif /* HAVE_SYS_SELECT_H */ - -#ifdef G_OS_BEOS -#undef NO_FD_SET -#endif /* G_OS_BEOS */ - -#ifndef NO_FD_SET -# define SELECT_MASK fd_set -#else /* !NO_FD_SET */ -# ifndef _AIX -typedef long fd_mask; -# endif /* _AIX */ -# ifdef _IBMR2 -# define SELECT_MASK void -# else /* !_IBMR2 */ -# define SELECT_MASK int -# endif /* !_IBMR2 */ -#endif /* !NO_FD_SET */ - -static gint -g_poll (GPollFD *fds, - guint nfds, - gint timeout) -{ - struct timeval tv; - SELECT_MASK rset, wset, xset; - GPollFD *f; - int ready; - int maxfd = 0; - - FD_ZERO (&rset); - FD_ZERO (&wset); - FD_ZERO (&xset); - - for (f = fds; f < &fds[nfds]; ++f) - if (f->fd >= 0) - { - if (f->events & G_IO_IN) - FD_SET (f->fd, &rset); - if (f->events & G_IO_OUT) - FD_SET (f->fd, &wset); - if (f->events & G_IO_PRI) - FD_SET (f->fd, &xset); - if (f->fd > maxfd && (f->events & (G_IO_IN|G_IO_OUT|G_IO_PRI))) - maxfd = f->fd; - } - - tv.tv_sec = timeout / 1000; - tv.tv_usec = (timeout % 1000) * 1000; - - ready = select (maxfd + 1, &rset, &wset, &xset, - timeout == -1 ? NULL : &tv); - if (ready > 0) - for (f = fds; f < &fds[nfds]; ++f) - { - f->revents = 0; - if (f->fd >= 0) - { - if (FD_ISSET (f->fd, &rset)) - f->revents |= G_IO_IN; - if (FD_ISSET (f->fd, &wset)) - f->revents |= G_IO_OUT; - if (FD_ISSET (f->fd, &xset)) - f->revents |= G_IO_PRI; - } - } - - return ready; -} - -#endif /* !G_OS_WIN32 */ - -#endif /* !HAVE_POLL */ - /** * g_main_context_ref: * @context: a #GMainContext @@ -643,69 +503,40 @@ g_main_context_unref (GMainContext *context) source = next; } -#ifdef G_THREADS_ENABLED g_static_mutex_free (&context->mutex); -#endif g_ptr_array_free (context->pending_dispatches, TRUE); g_free (context->cached_poll_array); poll_rec_list_free (context, context->poll_records); -#ifdef G_THREADS_ENABLED if (g_thread_supported()) - { -#ifndef G_OS_WIN32 - close (context->wake_up_pipe[0]); - close (context->wake_up_pipe[1]); -#else - CloseHandle (context->wake_up_semaphore); -#endif - } + g_wakeup_free (context->wakeup); + else main_contexts_without_pipe = g_slist_remove (main_contexts_without_pipe, context); if (context->cond != NULL) g_cond_free (context->cond); -#endif - + g_free (context); } -#ifdef G_THREADS_ENABLED -static void +static void g_main_context_init_pipe (GMainContext *context) { -# ifndef G_OS_WIN32 - if (context->wake_up_pipe[0] != -1) - return; - if (pipe (context->wake_up_pipe) < 0) - g_error ("Cannot create pipe main loop wake-up: %s\n", - g_strerror (errno)); - - context->wake_up_rec.fd = context->wake_up_pipe[0]; - context->wake_up_rec.events = G_IO_IN; -# else - if (context->wake_up_semaphore != NULL) - return; - context->wake_up_semaphore = CreateSemaphore (NULL, 0, 100, NULL); - if (context->wake_up_semaphore == NULL) - g_error ("Cannot create wake-up semaphore: %s", - g_win32_error_message (GetLastError ())); - context->wake_up_rec.fd = (gint) context->wake_up_semaphore; - context->wake_up_rec.events = G_IO_IN; -# ifdef G_MAIN_POLL_DEBUG - g_print ("wake-up semaphore: %#x\n", (guint) context->wake_up_semaphore); -# endif -# endif + context->wakeup = g_wakeup_new (); + g_wakeup_get_pollfd (context->wakeup, &context->wake_up_rec); g_main_context_add_poll_unlocked (context, 0, &context->wake_up_rec); } void _g_main_thread_init (void) { - GSList *curr = main_contexts_without_pipe; + GSList *curr; + + curr = main_contexts_without_pipe; while (curr) { g_main_context_init_pipe ((GMainContext *)curr->data); @@ -714,7 +545,6 @@ _g_main_thread_init (void) g_slist_free (main_contexts_without_pipe); main_contexts_without_pipe = NULL; } -#endif /* G_THREADS_ENABLED */ /** * g_main_context_new: @@ -728,49 +558,54 @@ g_main_context_new (void) { GMainContext *context = g_new0 (GMainContext, 1); -#ifdef G_THREADS_ENABLED +#ifdef G_MAIN_POLL_DEBUG + { + static gboolean beenhere = FALSE; + + if (!beenhere) + { + if (getenv ("G_MAIN_POLL_DEBUG") != NULL) + _g_main_poll_debug = TRUE; + beenhere = TRUE; + } + } +#endif + g_static_mutex_init (&context->mutex); context->owner = NULL; context->waiters = NULL; -# ifndef G_OS_WIN32 - context->wake_up_pipe[0] = -1; - context->wake_up_pipe[1] = -1; -# else - context->wake_up_semaphore = NULL; -# endif -#endif - context->ref_count = 1; context->next_id = 1; context->source_list = NULL; -#if HAVE_POLL - context->poll_func = (GPollFunc)poll; -#else context->poll_func = g_poll; -#endif context->cached_poll_array = NULL; context->cached_poll_array_size = 0; context->pending_dispatches = g_ptr_array_new (); - context->time_is_current = FALSE; + context->time_is_fresh = FALSE; + context->real_time_is_fresh = FALSE; -#ifdef G_THREADS_ENABLED if (g_thread_supported ()) g_main_context_init_pipe (context); else main_contexts_without_pipe = g_slist_prepend (main_contexts_without_pipe, context); -#endif G_LOCK (main_context_list); main_context_list = g_slist_append (main_context_list, context); + +#ifdef G_MAIN_POLL_DEBUG + if (_g_main_poll_debug) + g_print ("created context=%p\n", context); +#endif + G_UNLOCK (main_context_list); return context; @@ -779,11 +614,12 @@ g_main_context_new (void) /** * g_main_context_default: * - * Returns the default main context. This is the main context used - * for main loop functions when a main loop is not explicitly - * specified. + * Returns the global default main context. This is the main context + * used for main loop functions when a main loop is not explicitly + * specified, and corresponds to the "main" main loop. See also + * g_main_context_get_thread_default(). * - * Return value: the default main context. + * Return value: (transfer none): the global default main context. **/ GMainContext * g_main_context_default (void) @@ -793,13 +629,154 @@ g_main_context_default (void) G_LOCK (main_loop); if (!default_main_context) - default_main_context = g_main_context_new (); + { + default_main_context = g_main_context_new (); +#ifdef G_MAIN_POLL_DEBUG + if (_g_main_poll_debug) + g_print ("default context=%p\n", default_main_context); +#endif + } G_UNLOCK (main_loop); return default_main_context; } +static GStaticPrivate thread_context_stack = G_STATIC_PRIVATE_INIT; + +static void +free_context_stack (gpointer data) +{ + GQueue *stack = data; + GMainContext *context; + + while (!g_queue_is_empty (stack)) + { + context = g_queue_pop_head (stack); + g_main_context_release (context); + if (context) + g_main_context_unref (context); + } + g_queue_free (stack); +} + +/** + * g_main_context_push_thread_default: + * @context: a #GMainContext, or %NULL for the global default context + * + * Acquires @context and sets it as the thread-default context for the + * current thread. This will cause certain asynchronous operations + * (such as most gio-based I/O) which are + * started in this thread to run under @context and deliver their + * results to its main loop, rather than running under the global + * default context in the main thread. Note that calling this function + * changes the context returned by + * g_main_context_get_thread_default(), not the + * one returned by g_main_context_default(), so it does not affect the + * context used by functions like g_idle_add(). + * + * Normally you would call this function shortly after creating a new + * thread, passing it a #GMainContext which will be run by a + * #GMainLoop in that thread, to set a new default context for all + * async operations in that thread. (In this case, you don't need to + * ever call g_main_context_pop_thread_default().) In some cases + * however, you may want to schedule a single operation in a + * non-default context, or temporarily use a non-default context in + * the main thread. In that case, you can wrap the call to the + * asynchronous operation inside a + * g_main_context_push_thread_default() / + * g_main_context_pop_thread_default() pair, but it is up to you to + * ensure that no other asynchronous operations accidentally get + * started while the non-default context is active. + * + * Beware that libraries that predate this function may not correctly + * handle being used from a thread with a thread-default context. Eg, + * see g_file_supports_thread_contexts(). + * + * Since: 2.22 + **/ +void +g_main_context_push_thread_default (GMainContext *context) +{ + GQueue *stack; + gboolean acquired_context; + + acquired_context = g_main_context_acquire (context); + g_return_if_fail (acquired_context); + + if (context == g_main_context_default ()) + context = NULL; + else if (context) + g_main_context_ref (context); + + stack = g_static_private_get (&thread_context_stack); + if (!stack) + { + stack = g_queue_new (); + g_static_private_set (&thread_context_stack, stack, + free_context_stack); + } + + g_queue_push_head (stack, context); +} + +/** + * g_main_context_pop_thread_default: + * @context: a #GMainContext object, or %NULL + * + * Pops @context off the thread-default context stack (verifying that + * it was on the top of the stack). + * + * Since: 2.22 + **/ +void +g_main_context_pop_thread_default (GMainContext *context) +{ + GQueue *stack; + + if (context == g_main_context_default ()) + context = NULL; + + stack = g_static_private_get (&thread_context_stack); + + g_return_if_fail (stack != NULL); + g_return_if_fail (g_queue_peek_head (stack) == context); + + g_queue_pop_head (stack); + + g_main_context_release (context); + if (context) + g_main_context_unref (context); +} + +/** + * g_main_context_get_thread_default: + * + * Gets the thread-default #GMainContext for this thread. Asynchronous + * operations that want to be able to be run in contexts other than + * the default one should call this method to get a #GMainContext to + * add their #GSources to. (Note that even in single-threaded + * programs applications may sometimes want to temporarily push a + * non-default context, so it is not safe to assume that this will + * always return %NULL if threads are not initialized.) + * + * Returns: (transfer none): the thread-default #GMainContext, or + * %NULL if the thread-default context is the global default context. + * + * Since: 2.22 + **/ +GMainContext * +g_main_context_get_thread_default (void) +{ + GQueue *stack; + + stack = g_static_private_get (&thread_context_stack); + if (stack) + return g_queue_peek_head (stack); + else + return NULL; +} + /* Hooks for adding to the main loop */ /** @@ -850,12 +827,21 @@ g_source_list_add (GSource *source, { GSource *tmp_source, *last_source; - last_source = NULL; - tmp_source = context->source_list; - while (tmp_source && tmp_source->priority <= source->priority) + if (source->priv && source->priv->parent_source) + { + /* Put the source immediately before its parent */ + tmp_source = source->priv->parent_source; + last_source = source->priv->parent_source->prev; + } + else { - last_source = tmp_source; - tmp_source = tmp_source->next; + last_source = NULL; + tmp_source = context->source_list; + while (tmp_source && tmp_source->priority <= source->priority) + { + last_source = tmp_source; + tmp_source = tmp_source->next; + } } source->next = tmp_source; @@ -887,13 +873,46 @@ g_source_list_remove (GSource *source, source->next = NULL; } +static guint +g_source_attach_unlocked (GSource *source, + GMainContext *context) +{ + guint result = 0; + GSList *tmp_list; + + source->context = context; + result = source->source_id = context->next_id++; + + source->ref_count++; + g_source_list_add (source, context); + + tmp_list = source->poll_fds; + while (tmp_list) + { + g_main_context_add_poll_unlocked (context, source->priority, tmp_list->data); + tmp_list = tmp_list->next; + } + + if (source->priv) + { + tmp_list = source->priv->child_sources; + while (tmp_list) + { + g_source_attach_unlocked (tmp_list->data, context); + tmp_list = tmp_list->next; + } + } + + return result; +} + /** * g_source_attach: * @source: a #GSource * @context: a #GMainContext (if %NULL, the default context will be used) * * Adds a #GSource to a @context so that it will be executed within - * that context. + * that context. Remove it by calling g_source_destroy(). * * Return value: the ID (greater than 0) for the source within the * #GMainContext. @@ -903,7 +922,6 @@ g_source_attach (GSource *source, GMainContext *context) { guint result = 0; - GSList *tmp_list; g_return_val_if_fail (source->context == NULL, 0); g_return_val_if_fail (!SOURCE_DESTROYED (source), 0); @@ -913,23 +931,10 @@ g_source_attach (GSource *source, LOCK_CONTEXT (context); - source->context = context; - result = source->source_id = context->next_id++; + result = g_source_attach_unlocked (source, context); - source->ref_count++; - g_source_list_add (source, context); - - tmp_list = source->poll_fds; - while (tmp_list) - { - g_main_context_add_poll_unlocked (context, source->priority, tmp_list->data); - tmp_list = tmp_list->next; - } - -#ifdef G_THREADS_ENABLED /* Now wake up the main loop if it is waiting in the poll() */ g_main_context_wakeup_unlocked (context); -#endif UNLOCK_CONTEXT (context); @@ -974,6 +979,24 @@ g_source_destroy_internal (GSource *source, tmp_list = tmp_list->next; } } + + if (source->priv && source->priv->child_sources) + { + /* This is safe because even if a child_source finalizer or + * closure notify tried to modify source->priv->child_sources + * from outside the lock, it would fail since + * SOURCE_DESTROYED(source) is now TRUE. + */ + tmp_list = source->priv->child_sources; + while (tmp_list) + { + g_source_destroy_internal (tmp_list->data, context, TRUE); + g_source_unref_internal (tmp_list->data, context, TRUE); + tmp_list = tmp_list->next; + } + g_slist_free (source->priv->child_sources); + source->priv->child_sources = NULL; + } g_source_unref_internal (source, context, TRUE); } @@ -1038,9 +1061,9 @@ g_source_get_id (GSource *source) * Gets the #GMainContext with which the source is associated. * Calling this function on a destroyed source is an error. * - * Return value: the #GMainContext with which the source is associated, - * or %NULL if the context has not yet been added - * to a source. + * Return value: (transfer none): the #GMainContext with which the + * source is associated, or %NULL if the context has not + * yet been added to a source. **/ GMainContext * g_source_get_context (GSource *source) @@ -1121,6 +1144,98 @@ g_source_remove_poll (GSource *source, } /** + * g_source_add_child_source: + * @source:a #GSource + * @child_source: a second #GSource that @source should "poll" + * + * Adds @child_source to @source as a "polled" source; when @source is + * added to a #GMainContext, @child_source will be automatically added + * with the same priority, when @child_source is triggered, it will + * cause @source to dispatch (in addition to calling its own + * callback), and when @source is destroyed, it will destroy + * @child_source as well. (@source will also still be dispatched if + * its own prepare/check functions indicate that it is ready.) + * + * If you don't need @child_source to do anything on its own when it + * triggers, you can call g_source_set_dummy_callback() on it to set a + * callback that does nothing (except return %TRUE if appropriate). + * + * @source will hold a reference on @child_source while @child_source + * is attached to it. + * + * Since: 2.28 + **/ +void +g_source_add_child_source (GSource *source, + GSource *child_source) +{ + GMainContext *context; + + g_return_if_fail (source != NULL); + g_return_if_fail (child_source != NULL); + g_return_if_fail (!SOURCE_DESTROYED (source)); + g_return_if_fail (!SOURCE_DESTROYED (child_source)); + g_return_if_fail (child_source->context == NULL); + g_return_if_fail (child_source->priv == NULL || child_source->priv->parent_source == NULL); + + context = source->context; + + if (context) + LOCK_CONTEXT (context); + + if (!source->priv) + source->priv = g_slice_new0 (GSourcePrivate); + if (!child_source->priv) + child_source->priv = g_slice_new0 (GSourcePrivate); + + source->priv->child_sources = g_slist_prepend (source->priv->child_sources, + g_source_ref (child_source)); + child_source->priv->parent_source = source; + g_source_set_priority_unlocked (child_source, context, source->priority); + + if (context) + { + UNLOCK_CONTEXT (context); + g_source_attach (child_source, context); + } +} + +/** + * g_source_remove_child_source: + * @source:a #GSource + * @child_source: a #GSource previously passed to + * g_source_add_child_source(). + * + * Detaches @child_source from @source and destroys it. + * + * Since: 2.28 + **/ +void +g_source_remove_child_source (GSource *source, + GSource *child_source) +{ + GMainContext *context; + + g_return_if_fail (source != NULL); + g_return_if_fail (child_source != NULL); + g_return_if_fail (child_source->priv != NULL && child_source->priv->parent_source == source); + g_return_if_fail (!SOURCE_DESTROYED (source)); + g_return_if_fail (!SOURCE_DESTROYED (child_source)); + + context = source->context; + + if (context) + LOCK_CONTEXT (context); + + source->priv->child_sources = g_slist_remove (source->priv->child_sources, child_source); + g_source_destroy_internal (child_source, context, TRUE); + g_source_unref_internal (child_source, context, TRUE); + + if (context) + UNLOCK_CONTEXT (context); +} + +/** * g_source_set_callback_indirect: * @source: the source * @callback_data: pointer to callback data "object" @@ -1265,53 +1380,72 @@ g_source_set_funcs (GSource *source, source->source_funcs = funcs; } +static void +g_source_set_priority_unlocked (GSource *source, + GMainContext *context, + gint priority) +{ + GSList *tmp_list; + + source->priority = priority; + + if (context) + { + /* Remove the source from the context's source and then + * add it back so it is sorted in the correct place + */ + g_source_list_remove (source, source->context); + g_source_list_add (source, source->context); + + if (!SOURCE_BLOCKED (source)) + { + tmp_list = source->poll_fds; + while (tmp_list) + { + g_main_context_remove_poll_unlocked (context, tmp_list->data); + g_main_context_add_poll_unlocked (context, priority, tmp_list->data); + + tmp_list = tmp_list->next; + } + } + } + + if (source->priv && source->priv->child_sources) + { + tmp_list = source->priv->child_sources; + while (tmp_list) + { + g_source_set_priority_unlocked (tmp_list->data, context, priority); + tmp_list = tmp_list->next; + } + } +} + /** * g_source_set_priority: * @source: a #GSource * @priority: the new priority. - * - * Sets the priority of a source. While the main loop is being - * run, a source will be dispatched if it is ready to be dispatched and no sources - * at a higher (numerically smaller) priority are ready to be dispatched. + * + * Sets the priority of a source. While the main loop is being run, a + * source will be dispatched if it is ready to be dispatched and no + * sources at a higher (numerically smaller) priority are ready to be + * dispatched. **/ void g_source_set_priority (GSource *source, gint priority) { - GSList *tmp_list; GMainContext *context; - + g_return_if_fail (source != NULL); context = source->context; if (context) LOCK_CONTEXT (context); - - source->priority = priority; - + g_source_set_priority_unlocked (source, context, priority); if (context) - { - /* Remove the source from the context's source and then - * add it back so it is sorted in the correct plcae - */ - g_source_list_remove (source, source->context); - g_source_list_add (source, source->context); - - if (!SOURCE_BLOCKED (source)) - { - tmp_list = source->poll_fds; - while (tmp_list) - { - g_main_context_remove_poll_unlocked (context, tmp_list->data); - g_main_context_add_poll_unlocked (context, priority, tmp_list->data); - - tmp_list = tmp_list->next; - } - } - - UNLOCK_CONTEXT (source->context); - } + UNLOCK_CONTEXT (source->context); } /** @@ -1379,6 +1513,88 @@ g_source_get_can_recurse (GSource *source) return (source->flags & G_SOURCE_CAN_RECURSE) != 0; } + +/** + * g_source_set_name: + * @source: a #GSource + * @name: debug name for the source + * + * Sets a name for the source, used in debugging and profiling. + * The name defaults to #NULL. + * + * The source name should describe in a human-readable way + * what the source does. For example, "X11 event queue" + * or "GTK+ repaint idle handler" or whatever it is. + * + * It is permitted to call this function multiple times, but is not + * recommended due to the potential performance impact. For example, + * one could change the name in the "check" function of a #GSourceFuncs + * to include details like the event type in the source name. + * + * Since: 2.26 + **/ +void +g_source_set_name (GSource *source, + const char *name) +{ + g_return_if_fail (source != NULL); + + /* setting back to NULL is allowed, just because it's + * weird if get_name can return NULL but you can't + * set that. + */ + + g_free (source->name); + source->name = g_strdup (name); +} + +/** + * g_source_get_name: + * @source: a #GSource + * + * Gets a name for the source, used in debugging and profiling. + * The name may be #NULL if it has never been set with + * g_source_set_name(). + * + * Return value: the name of the source + * Since: 2.26 + **/ +const char * +g_source_get_name (GSource *source) +{ + g_return_val_if_fail (source != NULL, NULL); + + return source->name; +} + +/** + * g_source_set_name_by_id: + * @tag: a #GSource ID + * @name: debug name for the source + * + * Sets the name of a source using its ID. + * + * This is a convenience utility to set source names from the return + * value of g_idle_add(), g_timeout_add(), etc. + * + * Since: 2.26 + **/ +void +g_source_set_name_by_id (guint tag, + const char *name) +{ + GSource *source; + + g_return_if_fail (tag > 0); + + source = g_main_context_find_source_by_id (NULL, tag); + if (source == NULL) + return; + + g_source_set_name (source, name); +} + + /** * g_source_ref: * @source: a #GSource @@ -1431,19 +1647,34 @@ g_source_unref_internal (GSource *source, source->callback_data = NULL; source->callback_funcs = NULL; - if (context && !SOURCE_DESTROYED (source)) + if (context) { - g_warning (G_STRLOC ": ref_count == 0, but source is still attached to a context!"); - source->ref_count++; + if (!SOURCE_DESTROYED (source)) + g_warning (G_STRLOC ": ref_count == 0, but source was still attached to a context!"); + g_source_list_remove (source, context); } - else if (context) - g_source_list_remove (source, context); if (source->source_funcs->finalize) - source->source_funcs->finalize (source); - + { + if (context) + UNLOCK_CONTEXT (context); + source->source_funcs->finalize (source); + if (context) + LOCK_CONTEXT (context); + } + + g_free (source->name); + source->name = NULL; + g_slist_free (source->poll_fds); source->poll_fds = NULL; + + if (source->priv) + { + g_slice_free (GSourcePrivate, source->priv); + source->priv = NULL; + } + g_free (source); } @@ -1485,7 +1716,7 @@ g_source_unref (GSource *source) * * Finds a #GSource given a pair of context and ID. * - * Return value: the #GSource if found, otherwise, %NULL + * Return value: (transfer none): the #GSource if found, otherwise, %NULL **/ GSource * g_main_context_find_source_by_id (GMainContext *context, @@ -1524,7 +1755,7 @@ g_main_context_find_source_by_id (GMainContext *context, * multiple sources exist with the same source function and user data, * the first one found will be returned. * - * Return value: the source, if one was found, otherwise %NULL + * Return value: (transfer none): the source, if one was found, otherwise %NULL **/ GSource * g_main_context_find_source_by_funcs_user_data (GMainContext *context, @@ -1572,7 +1803,7 @@ g_main_context_find_source_by_funcs_user_data (GMainContext *context, * multiple sources exist with the same user data, the first * one found will be returned. * - * Return value: the source, if one was found, otherwise %NULL + * Return value: (transfer none): the source, if one was found, otherwise %NULL **/ GSource * g_main_context_find_source_by_user_data (GMainContext *context, @@ -1618,7 +1849,8 @@ g_main_context_find_source_by_user_data (GMainContext *context, * g_timeout_add(), g_timeout_add_full(), g_child_watch_add(), * g_child_watch_add_full(), g_io_add_watch(), and g_io_add_watch_full(). * - * See also g_source_destroy(). + * See also g_source_destroy(). You must use g_source_destroy() for sources + * added to a non-default main context. * * Return value: %TRUE if the source was found and removed. **/ @@ -1693,8 +1925,10 @@ g_source_remove_by_funcs_user_data (GSourceFuncs *funcs, /** * g_get_current_time: * @result: #GTimeVal structure in which to store current time. - * + * * Equivalent to the UNIX gettimeofday() function, but portable. + * + * You may find g_get_real_time() to be more convenient. **/ void g_get_current_time (GTimeVal *result) @@ -1711,18 +1945,138 @@ g_get_current_time (GTimeVal *result) result->tv_usec = r.tv_usec; #else FILETIME ft; - guint64 *time64 = (guint64 *) &ft; + guint64 time64; + + g_return_if_fail (result != NULL); GetSystemTimeAsFileTime (&ft); + memmove (&time64, &ft, sizeof (FILETIME)); /* Convert from 100s of nanoseconds since 1601-01-01 * to Unix epoch. Yes, this is Y2038 unsafe. */ - *time64 -= G_GINT64_CONSTANT (116444736000000000); - *time64 /= 10; + time64 -= G_GINT64_CONSTANT (116444736000000000); + time64 /= 10; + + result->tv_sec = time64 / 1000000; + result->tv_usec = time64 % 1000000; +#endif +} + +/** + * g_get_real_time: + * + * Queries the system wall-clock time. + * + * This call is functionally equivalent to g_get_current_time() except + * that the return value is often more convenient than dealing with a + * #GTimeVal. + * + * You should only use this call if you are actually interested in the real + * wall-clock time. g_get_monotonic_time() is probably more useful for + * measuring intervals. + * + * Returns: the number of microseconds since January 1, 1970 UTC. + * + * Since: 2.28 + **/ +gint64 +g_get_real_time (void) +{ + GTimeVal tv; + + g_get_current_time (&tv); + + return (((gint64) tv.tv_sec) * 1000000) + tv.tv_usec; +} + +/** + * g_get_monotonic_time: + * + * Queries the system monotonic time, if available. + * + * On POSIX systems with clock_gettime() and %CLOCK_MONOTONIC this call + * is a very shallow wrapper for that. Otherwise, we make a best effort + * that probably involves returning the wall clock time (with at least + * microsecond accuracy, subject to the limitations of the OS kernel). + * + * It's important to note that POSIX %CLOCK_MONOTONIC does not count + * time spent while the machine is suspended. + * + * On Windows, "limitations of the OS kernel" is a rather substantial + * statement. Depending on the configuration of the system, the wall + * clock time is updated as infrequently as 64 times a second (which + * is approximately every 16ms). + * + * Returns: the monotonic time, in microseconds + * + * Since: 2.28 + **/ +gint64 +g_get_monotonic_time (void) +{ +#ifdef HAVE_CLOCK_GETTIME + /* librt clock_gettime() is our first choice */ + { +#ifdef HAVE_MONOTONIC_CLOCK + static volatile gsize clockid = 0; +#else + static clockid_t clockid = CLOCK_REALTIME; +#endif + struct timespec ts; + +#ifdef HAVE_MONOTONIC_CLOCK + if (g_once_init_enter (&clockid)) + { + clockid_t best_clockid; + + if (sysconf (_SC_MONOTONIC_CLOCK) >= 0) + best_clockid = CLOCK_MONOTONIC; + else + best_clockid = CLOCK_REALTIME; + g_once_init_leave (&clockid, (gsize)best_clockid); + } +#endif + + clock_gettime (clockid, &ts); + + /* In theory monotonic time can have any epoch. + * + * glib presently assumes the following: + * + * 1) The epoch comes some time after the birth of Jesus of Nazareth, but + * not more than 10000 years later. + * + * 2) The current time also falls sometime within this range. + * + * These two reasonable assumptions leave us with a maximum deviation from + * the epoch of 10000 years, or 315569520000000000 seconds. + * + * If we restrict ourselves to this range then the number of microseconds + * will always fit well inside the constraints of a int64 (by a factor of + * about 29). + * + * If you actually hit the following assertion, probably you should file a + * bug against your operating system for being excessively silly. + **/ + g_assert (G_GINT64_CONSTANT (-315569520000000000) < ts.tv_sec && + ts.tv_sec < G_GINT64_CONSTANT (315569520000000000)); + + return (((gint64) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000); + } +#else + /* It may look like we are discarding accuracy on Windows (since its + * current time is expressed in 100s of nanoseconds) but according to + * many sources, the time is only updated 64 times per second, so + * microsecond accuracy is more than enough. + */ + { + GTimeVal tv; + + g_get_current_time (&tv); - result->tv_sec = *time64 / 1000000; - result->tv_usec = *time64 % 1000000; + return (((gint64) tv.tv_sec) * 1000000) + tv.tv_usec; + } #endif } @@ -1756,7 +2110,7 @@ get_dispatch (void) * That is, when called from the toplevel, it gives 0. When * called from within a callback from g_main_context_iteration() * (or g_main_loop_run(), etc.) it returns 1. When called from within - * a callback to a recursive call to g_main_context_iterate(), + * a callback to a recursive call to g_main_context_iteration(), * it returns 2. And so forth. * * This function is useful in a situation like the following: @@ -1876,7 +2230,7 @@ g_main_depth (void) * * Returns the currently firing source for this thread. * - * Return value: The currently firing source or %NULL. + * Return value: (transfer none): The currently firing source or %NULL. * * Since: 2.12 */ @@ -1884,7 +2238,7 @@ GSource * g_main_current_source (void) { GMainDispatch *dispatch = get_dispatch (); - return dispatch->source ? dispatch->source->data : NULL; + return dispatch->dispatching_sources ? dispatch->dispatching_sources->data : NULL; } /** @@ -1897,7 +2251,7 @@ g_main_current_source (void) * from within idle handlers, but may have freed the object * before the dispatch of your idle handler. * - * + * |[ * static gboolean * idle_callback (gpointer data) * { @@ -1927,7 +2281,7 @@ g_main_current_source (void) * * G_OBJECT_CLASS (parent_class)->finalize (object); * } - * + * ]| * * This will fail in a multi-threaded application if the * widget is destroyed before the idle handler fires due @@ -1935,7 +2289,7 @@ g_main_current_source (void) * this particular problem, is to check to if the source * has already been destroy within the callback. * - * + * |[ * static gboolean * idle_callback (gpointer data) * { @@ -1950,7 +2304,7 @@ g_main_current_source (void) * * return FALSE; * } - * + * ]| * * Return value: %TRUE if the source has been destroyed * @@ -1962,7 +2316,6 @@ g_source_is_destroyed (GSource *source) return SOURCE_DESTROYED (source); } - /* Temporarily remove all this source's file descriptors from the * poll(), so that if data comes available for one of the file descriptors * we don't continually spin in the poll() @@ -2059,13 +2412,13 @@ g_main_dispatch (GMainContext *context) * This is a performance hack - do not revert to g_slist_prepend()! */ current_source_link.data = source; - current_source_link.next = current->source; - current->source = ¤t_source_link; + current_source_link.next = current->dispatching_sources; + current->dispatching_sources = ¤t_source_link; need_destroy = ! dispatch (source, callback, user_data); - g_assert (current->source == ¤t_source_link); - current->source = current_source_link.next; + g_assert (current->dispatching_sources == ¤t_source_link); + current->dispatching_sources = current_source_link.next; current->depth--; if (cb_funcs) @@ -2141,7 +2494,6 @@ next_valid_source (GMainContext *context, gboolean g_main_context_acquire (GMainContext *context) { -#ifdef G_THREADS_ENABLED gboolean result = FALSE; GThread *self = G_THREAD_SELF; @@ -2165,9 +2517,6 @@ g_main_context_acquire (GMainContext *context) UNLOCK_CONTEXT (context); return result; -#else /* !G_THREADS_ENABLED */ - return TRUE; -#endif /* G_THREADS_ENABLED */ } /** @@ -2182,7 +2531,6 @@ g_main_context_acquire (GMainContext *context) void g_main_context_release (GMainContext *context) { -#ifdef G_THREADS_ENABLED if (context == NULL) context = g_main_context_default (); @@ -2211,7 +2559,6 @@ g_main_context_release (GMainContext *context) } UNLOCK_CONTEXT (context); -#endif /* G_THREADS_ENABLED */ } /** @@ -2234,7 +2581,6 @@ g_main_context_wait (GMainContext *context, GCond *cond, GMutex *mutex) { -#ifdef G_THREADS_ENABLED gboolean result = FALSE; GThread *self = G_THREAD_SELF; gboolean loop_internal_waiter; @@ -2281,9 +2627,6 @@ g_main_context_wait (GMainContext *context, UNLOCK_CONTEXT (context); return result; -#else /* !G_THREADS_ENABLED */ - return TRUE; -#endif /* G_THREADS_ENABLED */ } /** @@ -2312,7 +2655,8 @@ g_main_context_prepare (GMainContext *context, LOCK_CONTEXT (context); - context->time_is_current = FALSE; + context->time_is_fresh = FALSE; + context->real_time_is_fresh = FALSE; if (context->in_check_or_prepare) { @@ -2322,7 +2666,6 @@ g_main_context_prepare (GMainContext *context, return FALSE; } -#ifdef G_THREADS_ENABLED if (context->poll_waiting) { g_warning("g_main_context_prepare(): main loop already active in another thread"); @@ -2331,7 +2674,6 @@ g_main_context_prepare (GMainContext *context, } context->poll_waiting = TRUE; -#endif /* G_THREADS_ENABLED */ #if 0 /* If recursing, finish up current dispatch, before starting over */ @@ -2387,7 +2729,15 @@ g_main_context_prepare (GMainContext *context, context->in_check_or_prepare--; if (result) - source->flags |= G_SOURCE_READY; + { + GSource *ready_source = source; + + while (ready_source) + { + ready_source->flags |= G_SOURCE_READY; + ready_source = ready_source->priv ? ready_source->priv->parent_source : NULL; + } + } } if (source->flags & G_SOURCE_READY) @@ -2421,8 +2771,9 @@ g_main_context_prepare (GMainContext *context, * g_main_context_query: * @context: a #GMainContext * @max_priority: maximum priority source to check - * @timeout_: location to store timeout to be used in polling - * @fds: location to store #GPollFD records that need to be polled. + * @timeout_: (out): location to store timeout to be used in polling + * @fds: (out caller-allocates) (array length=n_fds): location to + * store #GPollFD records that need to be polled. * @n_fds: length of @fds. * * Determines information necessary to poll this main loop. @@ -2447,34 +2798,37 @@ g_main_context_query (GMainContext *context, n_poll = 0; while (pollrec && max_priority >= pollrec->priority) { - if (pollrec->fd->events) + /* We need to include entries with fd->events == 0 in the array because + * otherwise if the application changes fd->events behind our back and + * makes it non-zero, we'll be out of sync when we check the fds[] array. + * (Changing fd->events after adding an FD wasn't an anticipated use of + * this API, but it occurs in practice.) */ + if (n_poll < n_fds) { - if (n_poll < n_fds) - { - fds[n_poll].fd = pollrec->fd->fd; - /* In direct contradiction to the Unix98 spec, IRIX runs into - * difficulty if you pass in POLLERR, POLLHUP or POLLNVAL - * flags in the events field of the pollfd while it should - * just ignoring them. So we mask them out here. - */ - fds[n_poll].events = pollrec->fd->events & ~(G_IO_ERR|G_IO_HUP|G_IO_NVAL); - fds[n_poll].revents = 0; - } - n_poll++; + fds[n_poll].fd = pollrec->fd->fd; + /* In direct contradiction to the Unix98 spec, IRIX runs into + * difficulty if you pass in POLLERR, POLLHUP or POLLNVAL + * flags in the events field of the pollfd while it should + * just ignoring them. So we mask them out here. + */ + fds[n_poll].events = pollrec->fd->events & ~(G_IO_ERR|G_IO_HUP|G_IO_NVAL); + fds[n_poll].revents = 0; } - + pollrec = pollrec->next; + n_poll++; } -#ifdef G_THREADS_ENABLED context->poll_changed = FALSE; -#endif if (timeout) { *timeout = context->timeout; if (*timeout != 0) - context->time_is_current = FALSE; + { + context->time_is_fresh = FALSE; + context->real_time_is_fresh = FALSE; + } } UNLOCK_CONTEXT (context); @@ -2486,8 +2840,8 @@ g_main_context_query (GMainContext *context, * g_main_context_check: * @context: a #GMainContext * @max_priority: the maximum numerical priority of sources to check - * @fds: array of #GPollFD's that was passed to the last call to - * g_main_context_query() + * @fds: (array length=n_fds): array of #GPollFD's that was passed to + * the last call to g_main_context_query() * @n_fds: return value of g_main_context_query() * * Passes the results of polling back to the main loop. @@ -2504,7 +2858,7 @@ g_main_context_check (GMainContext *context, GPollRec *pollrec; gint n_ready = 0; gint i; - + LOCK_CONTEXT (context); if (context->in_check_or_prepare) @@ -2515,14 +2869,9 @@ g_main_context_check (GMainContext *context, return FALSE; } -#ifdef G_THREADS_ENABLED if (!context->poll_waiting) - { -#ifndef G_OS_WIN32 - gchar a; - read (context->wake_up_pipe[0], &a, 1); -#endif - } + g_wakeup_acknowledge (context->wakeup); + else context->poll_waiting = FALSE; @@ -2534,18 +2883,16 @@ g_main_context_check (GMainContext *context, UNLOCK_CONTEXT (context); return FALSE; } -#endif /* G_THREADS_ENABLED */ pollrec = context->poll_records; i = 0; while (i < n_fds) { if (pollrec->fd->events) - { - pollrec->fd->revents = fds[i].revents; - i++; - } + pollrec->fd->revents = fds[i].revents; + pollrec = pollrec->next; + i++; } source = next_valid_source (context, NULL); @@ -2575,7 +2922,15 @@ g_main_context_check (GMainContext *context, context->in_check_or_prepare--; if (result) - source->flags |= G_SOURCE_READY; + { + GSource *ready_source = source; + + while (ready_source) + { + ready_source->flags |= G_SOURCE_READY; + ready_source = ready_source->priv ? ready_source->priv->parent_source : NULL; + } + } } if (source->flags & G_SOURCE_READY) @@ -2631,37 +2986,32 @@ g_main_context_iterate (GMainContext *context, gboolean some_ready; gint nfds, allocated_nfds; GPollFD *fds = NULL; - + UNLOCK_CONTEXT (context); -#ifdef G_THREADS_ENABLED if (!g_main_context_acquire (context)) { gboolean got_ownership; - + + LOCK_CONTEXT (context); + g_return_val_if_fail (g_thread_supported (), FALSE); if (!block) return FALSE; - LOCK_CONTEXT (context); - if (!context->cond) context->cond = g_cond_new (); - + got_ownership = g_main_context_wait (context, context->cond, g_static_mutex_get_mutex (&context->mutex)); if (!got_ownership) - { - UNLOCK_CONTEXT (context); - return FALSE; - } + return FALSE; } else LOCK_CONTEXT (context); -#endif /* G_THREADS_ENABLED */ if (!context->cached_poll_array) { @@ -2696,9 +3046,7 @@ g_main_context_iterate (GMainContext *context, if (dispatch) g_main_context_dispatch (context); -#ifdef G_THREADS_ENABLED g_main_context_release (context); -#endif /* G_THREADS_ENABLED */ LOCK_CONTEXT (context); @@ -2765,7 +3113,7 @@ g_main_context_iteration (GMainContext *context, gboolean may_block) /** * g_main_loop_new: - * @context: a #GMainContext (if %NULL, the default context will be used). + * @context: (allow-none): a #GMainContext (if %NULL, the default context will be used). * @is_running: set to %TRUE to indicate that the loop is running. This * is not very important since calling g_main_loop_run() will set this to * %TRUE anyway. @@ -2779,7 +3127,7 @@ g_main_loop_new (GMainContext *context, gboolean is_running) { GMainLoop *loop; - + if (!context) context = g_main_context_default(); @@ -2849,7 +3197,6 @@ g_main_loop_run (GMainLoop *loop) g_return_if_fail (loop != NULL); g_return_if_fail (g_atomic_int_get (&loop->ref_count) > 0); -#ifdef G_THREADS_ENABLED if (!g_main_context_acquire (loop->context)) { gboolean got_ownership = FALSE; @@ -2890,7 +3237,6 @@ g_main_loop_run (GMainLoop *loop) } else LOCK_CONTEXT (loop->context); -#endif /* G_THREADS_ENABLED */ if (loop->context->in_check_or_prepare) { @@ -2906,9 +3252,7 @@ g_main_loop_run (GMainLoop *loop) UNLOCK_CONTEXT (loop->context); -#ifdef G_THREADS_ENABLED g_main_context_release (loop->context); -#endif /* G_THREADS_ENABLED */ g_main_loop_unref (loop); } @@ -2933,10 +3277,8 @@ g_main_loop_quit (GMainLoop *loop) loop->is_running = FALSE; g_main_context_wakeup_unlocked (loop->context); -#ifdef G_THREADS_ENABLED if (loop->context->cond) g_cond_broadcast (loop->context->cond); -#endif /* G_THREADS_ENABLED */ UNLOCK_CONTEXT (loop->context); } @@ -2964,7 +3306,7 @@ g_main_loop_is_running (GMainLoop *loop) * * Returns the #GMainContext of @loop. * - * Return value: the #GMainContext of @loop + * Return value: (transfer none): the #GMainContext of @loop **/ GMainContext * g_main_loop_get_context (GMainLoop *loop) @@ -2994,8 +3336,12 @@ g_main_context_poll (GMainContext *context, if (n_fds || timeout != 0) { #ifdef G_MAIN_POLL_DEBUG - g_print ("g_main_poll(%d) timeout: %d\n", n_fds, timeout); - poll_timer = g_timer_new (); + if (_g_main_poll_debug) + { + g_print ("polling context=%p n=%d timeout=%d\n", + context, n_fds, timeout); + poll_timer = g_timer_new (); + } #endif LOCK_CONTEXT (context); @@ -3014,43 +3360,49 @@ g_main_context_poll (GMainContext *context, } #ifdef G_MAIN_POLL_DEBUG - LOCK_CONTEXT (context); - - g_print ("g_main_poll(%d) timeout: %d - elapsed %12.10f seconds", - n_fds, - timeout, - g_timer_elapsed (poll_timer, NULL)); - g_timer_destroy (poll_timer); - pollrec = context->poll_records; - i = 0; - while (i < n_fds) + if (_g_main_poll_debug) { - if (pollrec->fd->events) + LOCK_CONTEXT (context); + + g_print ("g_main_poll(%d) timeout: %d - elapsed %12.10f seconds", + n_fds, + timeout, + g_timer_elapsed (poll_timer, NULL)); + g_timer_destroy (poll_timer); + pollrec = context->poll_records; + + while (pollrec != NULL) { - if (fds[i].revents) + i = 0; + while (i < n_fds) { - g_print (" [%d:", fds[i].fd); - if (fds[i].revents & G_IO_IN) - g_print ("i"); - if (fds[i].revents & G_IO_OUT) - g_print ("o"); - if (fds[i].revents & G_IO_PRI) - g_print ("p"); - if (fds[i].revents & G_IO_ERR) - g_print ("e"); - if (fds[i].revents & G_IO_HUP) - g_print ("h"); - if (fds[i].revents & G_IO_NVAL) - g_print ("n"); - g_print ("]"); + if (fds[i].fd == pollrec->fd->fd && + pollrec->fd->events && + fds[i].revents) + { + g_print (" [" G_POLLFD_FORMAT " :", fds[i].fd); + if (fds[i].revents & G_IO_IN) + g_print ("i"); + if (fds[i].revents & G_IO_OUT) + g_print ("o"); + if (fds[i].revents & G_IO_PRI) + g_print ("p"); + if (fds[i].revents & G_IO_ERR) + g_print ("e"); + if (fds[i].revents & G_IO_HUP) + g_print ("h"); + if (fds[i].revents & G_IO_NVAL) + g_print ("n"); + g_print ("]"); + } + i++; } - i++; + pollrec = pollrec->next; } - pollrec = pollrec->next; + g_print ("\n"); + + UNLOCK_CONTEXT (context); } - g_print ("\n"); - - UNLOCK_CONTEXT (context); #endif } /* if (n_fds || timeout != 0) */ } @@ -3065,7 +3417,7 @@ g_main_context_poll (GMainContext *context, * file descriptor is polled whenever the results may be needed. * * Adds a file descriptor to the set of file descriptors polled for - * this context. This will very seldomly be used directly. Instead + * this context. This will very seldom be used directly. Instead * a typical event source will use g_source_add_poll() instead. **/ void @@ -3090,7 +3442,7 @@ g_main_context_add_poll_unlocked (GMainContext *context, gint priority, GPollFD *fd) { - GPollRec *lastrec, *pollrec; + GPollRec *prevrec, *nextrec; GPollRec *newrec = g_slice_new (GPollRec); /* This file descriptor may be checked before we ever poll */ @@ -3098,29 +3450,33 @@ g_main_context_add_poll_unlocked (GMainContext *context, newrec->fd = fd; newrec->priority = priority; - lastrec = NULL; - pollrec = context->poll_records; - while (pollrec && priority >= pollrec->priority) + prevrec = context->poll_records_tail; + nextrec = NULL; + while (prevrec && priority < prevrec->priority) { - lastrec = pollrec; - pollrec = pollrec->next; + nextrec = prevrec; + prevrec = prevrec->prev; } - - if (lastrec) - lastrec->next = newrec; + + if (prevrec) + prevrec->next = newrec; else context->poll_records = newrec; - newrec->next = pollrec; + newrec->prev = prevrec; + newrec->next = nextrec; + + if (nextrec) + nextrec->prev = newrec; + else + context->poll_records_tail = newrec; context->n_poll_records++; -#ifdef G_THREADS_ENABLED context->poll_changed = TRUE; /* Now wake up the main loop if it is waiting in the poll() */ g_main_context_wakeup_unlocked (context); -#endif } /** @@ -3150,35 +3506,39 @@ static void g_main_context_remove_poll_unlocked (GMainContext *context, GPollFD *fd) { - GPollRec *pollrec, *lastrec; + GPollRec *pollrec, *prevrec, *nextrec; - lastrec = NULL; + prevrec = NULL; pollrec = context->poll_records; while (pollrec) { + nextrec = pollrec->next; if (pollrec->fd == fd) { - if (lastrec != NULL) - lastrec->next = pollrec->next; + if (prevrec != NULL) + prevrec->next = nextrec; else - context->poll_records = pollrec->next; + context->poll_records = nextrec; + + if (nextrec != NULL) + nextrec->prev = prevrec; + else + context->poll_records_tail = prevrec; g_slice_free (GPollRec, pollrec); context->n_poll_records--; break; } - lastrec = pollrec; - pollrec = pollrec->next; + prevrec = pollrec; + pollrec = nextrec; } -#ifdef G_THREADS_ENABLED context->poll_changed = TRUE; /* Now wake up the main loop if it is waiting in the poll() */ g_main_context_wakeup_unlocked (context); -#endif } /** @@ -3191,6 +3551,8 @@ g_main_context_remove_poll_unlocked (GMainContext *context, * calling g_get_current_time() directly is that when * checking multiple sources, GLib can cache a single value * instead of having to repeatedly get the system time. + * + * Deprecated: 2.28: use g_source_get_time() instead **/ void g_source_get_current_time (GSource *source, @@ -3204,18 +3566,60 @@ g_source_get_current_time (GSource *source, LOCK_CONTEXT (context); - if (!context->time_is_current) + if (!context->real_time_is_fresh) { - g_get_current_time (&context->current_time); - context->time_is_current = TRUE; + context->real_time = g_get_real_time (); + context->real_time_is_fresh = TRUE; } - *timeval = context->current_time; + timeval->tv_sec = context->real_time / 1000000; + timeval->tv_usec = context->real_time % 1000000; UNLOCK_CONTEXT (context); } /** + * g_source_get_time: + * @source: a #GSource + * + * Gets the time to be used when checking this source. The advantage of + * calling this function over calling g_get_monotonic_time() directly is + * that when checking multiple sources, GLib can cache a single value + * instead of having to repeatedly get the system monotonic time. + * + * The time here is the system monotonic time, if available, or some + * other reasonable alternative otherwise. See g_get_monotonic_time(). + * + * Returns: the monotonic time in microseconds + * + * Since: 2.28 + **/ +gint64 +g_source_get_time (GSource *source) +{ + GMainContext *context; + gint64 result; + + g_return_val_if_fail (source->context != NULL, 0); + + context = source->context; + + LOCK_CONTEXT (context); + + if (!context->time_is_fresh) + { + context->time = g_get_monotonic_time (); + context->time_is_fresh = TRUE; + } + + result = context->time; + + UNLOCK_CONTEXT (context); + + return result; +} + +/** * g_main_context_set_poll_func: * @context: a #GMainContext * @func: the function to call to poll all file descriptors @@ -3242,13 +3646,7 @@ g_main_context_set_poll_func (GMainContext *context, if (func) context->poll_func = func; else - { -#ifdef HAVE_POLL - context->poll_func = (GPollFunc) poll; -#else - context->poll_func = (GPollFunc) g_poll; -#endif - } + context->poll_func = g_poll; UNLOCK_CONTEXT (context); } @@ -3278,22 +3676,35 @@ g_main_context_get_poll_func (GMainContext *context) return result; } +static void +_g_main_wake_up_all_contexts (void) +{ + GSList *list; + + /* We were woken up. Wake up all other contexts in all other threads */ + G_LOCK (main_context_list); + for (list = main_context_list; list; list = list->next) + { + GMainContext *context = list->data; + + LOCK_CONTEXT (context); + g_main_context_wakeup_unlocked (context); + UNLOCK_CONTEXT (context); + } + G_UNLOCK (main_context_list); +} + + /* HOLDS: context's lock */ /* Wake the main loop up from a poll() */ static void g_main_context_wakeup_unlocked (GMainContext *context) { -#ifdef G_THREADS_ENABLED if (g_thread_supported() && context->poll_waiting) { context->poll_waiting = FALSE; -#ifndef G_OS_WIN32 - write (context->wake_up_pipe[1], "A", 1); -#else - ReleaseSemaphore (context->wake_up_semaphore, 1, NULL); -#endif + g_wakeup_signal (context->wakeup); } -#endif } /** @@ -3321,7 +3732,7 @@ g_main_context_wakeup (GMainContext *context) * @context: a #GMainContext * * Determines whether this thread holds the (recursive) - * ownership of this #GMaincontext. This is useful to + * ownership of this #GMainContext. This is useful to * know before waiting on another thread that may be * blocking to get ownership of @context. * @@ -3337,175 +3748,108 @@ g_main_context_is_owner (GMainContext *context) if (!context) context = g_main_context_default (); -#ifdef G_THREADS_ENABLED LOCK_CONTEXT (context); is_owner = context->owner == G_THREAD_SELF; UNLOCK_CONTEXT (context); -#else - is_owner = TRUE; -#endif return is_owner; } -/* Timeouts */ - -static void -g_timeout_set_expiration (GTimeoutSource *timeout_source, - GTimeVal *current_time) -{ - guint seconds = timeout_source->interval / 1000; - guint msecs = timeout_source->interval - seconds * 1000; - - timeout_source->expiration.tv_sec = current_time->tv_sec + seconds; - timeout_source->expiration.tv_usec = current_time->tv_usec + msecs * 1000; - if (timeout_source->expiration.tv_usec >= 1000000) - { - timeout_source->expiration.tv_usec -= 1000000; - timeout_source->expiration.tv_sec++; - } - if (timer_perturb==-1) - { - /* - * we want a per machine/session unique 'random' value; try the dbus - * address first, that has a UUID in it. If there is no dbus, use the - * hostname for hashing. - */ - const char *session_bus_address = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); - if (!session_bus_address) - session_bus_address = g_getenv ("HOSTNAME"); - if (session_bus_address) - timer_perturb = g_str_hash (session_bus_address); - else - timer_perturb = 0; - } - if (timeout_source->granularity) - { - gint remainder; - gint gran; /* in usecs */ - gint perturb; - - gran = timeout_source->granularity * 1000; - perturb = timer_perturb % gran; - /* - * We want to give each machine a per machine pertubation; - * shift time back first, and forward later after the rounding - */ +/* Timeouts */ - timeout_source->expiration.tv_usec -= perturb; - if (timeout_source->expiration.tv_usec < 0) - { - timeout_source->expiration.tv_usec += 1000000; - timeout_source->expiration.tv_sec--; - } +static void +g_timeout_set_expiration (GTimeoutSource *timeout_source, + gint64 current_time) +{ + timeout_source->expiration = current_time + + (guint64) timeout_source->interval * 1000; - remainder = timeout_source->expiration.tv_usec % gran; - if (remainder >= gran/4) /* round up */ - timeout_source->expiration.tv_usec += gran; - timeout_source->expiration.tv_usec -= remainder; - /* shift back */ - timeout_source->expiration.tv_usec += perturb; + if (timeout_source->seconds) + { + gint64 remainder; + static gint timer_perturb = -1; - /* the rounding may have overflown tv_usec */ - while (timeout_source->expiration.tv_usec > 1000000) + if (timer_perturb == -1) { - timeout_source->expiration.tv_usec -= 1000000; - timeout_source->expiration.tv_sec++; + /* + * we want a per machine/session unique 'random' value; try the dbus + * address first, that has a UUID in it. If there is no dbus, use the + * hostname for hashing. + */ + const char *session_bus_address = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); + if (!session_bus_address) + session_bus_address = g_getenv ("HOSTNAME"); + if (session_bus_address) + timer_perturb = ABS ((gint) g_str_hash (session_bus_address)) % 1000000; + else + timer_perturb = 0; } + + /* We want the microseconds part of the timeout to land on the + * 'timer_perturb' mark, but we need to make sure we don't try to + * set the timeout in the past. We do this by ensuring that we + * always only *increase* the expiration time by adding a full + * second in the case that the microsecond portion decreases. + */ + timeout_source->expiration -= timer_perturb; + + remainder = timeout_source->expiration % 1000000; + if (remainder >= 1000000/4) + timeout_source->expiration += 1000000; + + timeout_source->expiration -= remainder; + timeout_source->expiration += timer_perturb; } } static gboolean g_timeout_prepare (GSource *source, - gint *timeout) + gint *timeout) { - glong sec; - glong msec; - GTimeVal current_time; - - GTimeoutSource *timeout_source = (GTimeoutSource *)source; + GTimeoutSource *timeout_source = (GTimeoutSource *) source; + gint64 now = g_source_get_time (source); - g_source_get_current_time (source, ¤t_time); - - sec = timeout_source->expiration.tv_sec - current_time.tv_sec; - msec = (timeout_source->expiration.tv_usec - current_time.tv_usec) / 1000; - - /* We do the following in a rather convoluted fashion to deal with - * the fact that we don't have an integral type big enough to hold - * the difference of two timevals in millseconds. - */ - if (sec < 0 || (sec == 0 && msec < 0)) - msec = 0; - else + if (now < timeout_source->expiration) { - glong interval_sec = timeout_source->interval / 1000; - glong interval_msec = timeout_source->interval % 1000; - - if (msec < 0) - { - msec += 1000; - sec -= 1; - } - - if (sec > interval_sec || - (sec == interval_sec && msec > interval_msec)) - { - /* The system time has been set backwards, so we - * reset the expiration time to now + timeout_source->interval; - * this at least avoids hanging for long periods of time. - */ - g_timeout_set_expiration (timeout_source, ¤t_time); - msec = MIN (G_MAXINT, timeout_source->interval); - } - else - { - msec = MIN (G_MAXINT, (guint)msec + 1000 * (guint)sec); - } + /* Round up to ensure that we don't try again too early */ + *timeout = (timeout_source->expiration - now + 999) / 1000; + return FALSE; } - *timeout = (gint)msec; - - return msec == 0; + *timeout = 0; + return TRUE; } static gboolean g_timeout_check (GSource *source) { - GTimeVal current_time; - GTimeoutSource *timeout_source = (GTimeoutSource *)source; + GTimeoutSource *timeout_source = (GTimeoutSource *) source; + gint64 now = g_source_get_time (source); - g_source_get_current_time (source, ¤t_time); - - return ((timeout_source->expiration.tv_sec < current_time.tv_sec) || - ((timeout_source->expiration.tv_sec == current_time.tv_sec) && - (timeout_source->expiration.tv_usec <= current_time.tv_usec))); + return timeout_source->expiration <= now; } static gboolean g_timeout_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data) + GSourceFunc callback, + gpointer user_data) { GTimeoutSource *timeout_source = (GTimeoutSource *)source; + gboolean again; if (!callback) { g_warning ("Timeout source dispatched without callback\n" - "You must call g_source_set_callback()."); + "You must call g_source_set_callback()."); return FALSE; } - - if (callback (user_data)) - { - GTimeVal current_time; - g_source_get_current_time (source, ¤t_time); - g_timeout_set_expiration (timeout_source, ¤t_time); + again = callback (user_data); - return TRUE; - } - else - return FALSE; + if (again) + g_timeout_set_expiration (timeout_source, g_source_get_time (source)); + + return again; } /** @@ -3517,6 +3861,9 @@ g_timeout_dispatch (GSource *source, * The source will not initially be associated with any #GMainContext * and must be added to one with g_source_attach() before it will be * executed. + * + * The interval given is in terms of monotonic time, not wall clock + * time. See g_get_monotonic_time(). * * Return value: the newly-created timeout source **/ @@ -3525,13 +3872,10 @@ g_timeout_source_new (guint interval) { GSource *source = g_source_new (&g_timeout_funcs, sizeof (GTimeoutSource)); GTimeoutSource *timeout_source = (GTimeoutSource *)source; - GTimeVal current_time; timeout_source->interval = interval; + g_timeout_set_expiration (timeout_source, g_get_monotonic_time ()); - g_get_current_time (¤t_time); - g_timeout_set_expiration (timeout_source, ¤t_time); - return source; } @@ -3548,6 +3892,9 @@ g_timeout_source_new (guint interval) * The scheduling granularity/accuracy of this timeout source will be * in seconds. * + * The interval given in terms of monotonic time, not wall clock time. + * See g_get_monotonic_time(). + * * Return value: the newly-created timeout source * * Since: 2.14 @@ -3557,13 +3904,11 @@ g_timeout_source_new_seconds (guint interval) { GSource *source = g_source_new (&g_timeout_funcs, sizeof (GTimeoutSource)); GTimeoutSource *timeout_source = (GTimeoutSource *)source; - GTimeVal current_time; - timeout_source->interval = 1000*interval; - timeout_source->granularity = 1000; + timeout_source->interval = 1000 * interval; + timeout_source->seconds = TRUE; - g_get_current_time (¤t_time); - g_timeout_set_expiration (timeout_source, ¤t_time); + g_timeout_set_expiration (timeout_source, g_get_monotonic_time ()); return source; } @@ -3591,8 +3936,16 @@ g_timeout_source_new_seconds (guint interval) * After each call to the timeout function, the time of the next * timeout is recalculated based on the current time and the given interval * (it does not try to 'catch up' time lost in delays). + * + * This internally creates a main loop source using g_timeout_source_new() + * and attaches it to the main loop context using g_source_attach(). You can + * do these steps manually if you need greater control. + * + * The interval given in terms of monotonic time, not wall clock time. + * See g_get_monotonic_time(). * * Return value: the ID (greater than 0) of the event source. + * Rename to: g_timeout_add **/ guint g_timeout_add_full (gint priority, @@ -3642,6 +3995,13 @@ g_timeout_add_full (gint priority, * g_timeout_add_seconds() function; this function allows for more * optimizations and more efficient system power usage. * + * This internally creates a main loop source using g_timeout_source_new() + * and attaches it to the main loop context using g_source_attach(). You can + * do these steps manually if you need greater control. + * + * The interval given is in terms of monotonic time, not wall clock + * time. See g_get_monotonic_time(). + * * Return value: the ID (greater than 0) of the event source. **/ guint @@ -3688,8 +4048,17 @@ g_timeout_add (guint32 interval, * and you don't require the first timer exactly one second from now, the * use of g_timeout_add_seconds() is preferred over g_timeout_add(). * + * This internally creates a main loop source using + * g_timeout_source_new_seconds() and attaches it to the main loop context + * using g_source_attach(). You can do these steps manually if you need + * greater control. + * + * The interval given is in terms of monotonic time, not wall clock + * time. See g_get_monotonic_time(). + * * Return value: the ID (greater than 0) of the event source. * + * Rename to: g_timeout_add_seconds * Since: 2.14 **/ guint @@ -3727,9 +4096,18 @@ g_timeout_add_seconds_full (gint priority, * it returns %FALSE, at which point the timeout is automatically destroyed * and the function will not be called again. * - * See g_timeout_add_seconds_full() for the differences between - * g_timeout_add() and g_timeout_add_seconds(). + * This internally creates a main loop source using + * g_timeout_source_new_seconds() and attaches it to the main loop context + * using g_source_attach(). You can do these steps manually if you need + * greater control. Also see g_timeout_add_seconds_full(). + * + * Note that the first call of the timer may not be precise for timeouts + * of one second. If you need finer precision and have such a timeout, + * you may want to use g_timeout_add() instead. * + * The interval given is in terms of monotonic time, not wall clock + * time. See g_get_monotonic_time(). + * * Return value: the ID (greater than 0) of the event source. * * Since: 2.14 @@ -3832,13 +4210,182 @@ g_child_watch_prepare (GSource *source, return check_for_child_exited (source); } - static gboolean g_child_watch_check (GSource *source) { return check_for_child_exited (source); } +static gboolean +check_for_signal_delivery (GSource *source) +{ + GUnixSignalWatchSource *unix_signal_source = (GUnixSignalWatchSource*) source; + gboolean delivered; + + G_LOCK (unix_signal_lock); + if (unix_signal_init_state == UNIX_SIGNAL_INITIALIZED_SINGLE) + { + switch (unix_signal_source->signum) + { + case SIGHUP: + delivered = unix_signal_state.sighup_delivered; + break; + case SIGINT: + delivered = unix_signal_state.sigint_delivered; + break; + case SIGTERM: + delivered = unix_signal_state.sigterm_delivered; + break; + default: + g_assert_not_reached (); + delivered = FALSE; + break; + } + } + else + { + g_assert (unix_signal_init_state == UNIX_SIGNAL_INITIALIZED_THREADED); + delivered = unix_signal_source->pending; + } + G_UNLOCK (unix_signal_lock); + + return delivered; +} + +static gboolean +g_unix_signal_watch_prepare (GSource *source, + gint *timeout) +{ + *timeout = -1; + + return check_for_signal_delivery (source); +} + +static gboolean +g_unix_signal_watch_check (GSource *source) +{ + return check_for_signal_delivery (source); +} + +static gboolean +g_unix_signal_watch_dispatch (GSource *source, + GSourceFunc callback, + gpointer user_data) +{ + GUnixSignalWatchSource *unix_signal_source; + + unix_signal_source = (GUnixSignalWatchSource *) source; + + if (!callback) + { + g_warning ("Unix signal source dispatched without callback\n" + "You must call g_source_set_callback()."); + return FALSE; + } + + (callback) (user_data); + + G_LOCK (unix_signal_lock); + if (unix_signal_init_state == UNIX_SIGNAL_INITIALIZED_SINGLE) + { + switch (unix_signal_source->signum) + { + case SIGHUP: + unix_signal_state.sighup_delivered = FALSE; + break; + case SIGINT: + unix_signal_state.sigint_delivered = FALSE; + break; + case SIGTERM: + unix_signal_state.sigterm_delivered = FALSE; + break; + } + } + else + { + g_assert (unix_signal_init_state == UNIX_SIGNAL_INITIALIZED_THREADED); + unix_signal_source->pending = FALSE; + } + G_UNLOCK (unix_signal_lock); + + return TRUE; +} + +static void +ensure_unix_signal_handler_installed_unlocked (int signum) +{ + struct sigaction action; + GError *error = NULL; + + if (unix_signal_init_state == UNIX_SIGNAL_UNINITIALIZED) + { + sigemptyset (&unix_signal_mask); + } + + if (unix_signal_init_state == UNIX_SIGNAL_UNINITIALIZED + || unix_signal_init_state == UNIX_SIGNAL_INITIALIZED_SINGLE) + { + if (!g_thread_supported ()) + { + /* There is nothing to do for initializing in the non-threaded + * case. + */ + if (unix_signal_init_state == UNIX_SIGNAL_UNINITIALIZED) + unix_signal_init_state = UNIX_SIGNAL_INITIALIZED_SINGLE; + } + else + { + if (!g_unix_open_pipe (unix_signal_wake_up_pipe, FD_CLOEXEC, &error)) + g_error ("Cannot create UNIX signal wake up pipe: %s\n", error->message); + g_unix_set_fd_nonblocking (unix_signal_wake_up_pipe[1], TRUE, NULL); + + /* We create a helper thread that polls on the wakeup pipe indefinitely */ + if (g_thread_create (unix_signal_helper_thread, NULL, FALSE, &error) == NULL) + g_error ("Cannot create a thread to monitor UNIX signals: %s\n", error->message); + + unix_signal_init_state = UNIX_SIGNAL_INITIALIZED_THREADED; + } + } + + if (sigismember (&unix_signal_mask, signum)) + return; + + sigaddset (&unix_signal_mask, signum); + + action.sa_handler = g_unix_signal_handler; + sigemptyset (&action.sa_mask); + action.sa_flags = SA_RESTART | SA_NOCLDSTOP; + sigaction (signum, &action, NULL); +} + +GSource * +_g_main_create_unix_signal_watch (int signum) +{ + GSource *source; + GUnixSignalWatchSource *unix_signal_source; + + source = g_source_new (&g_unix_signal_funcs, sizeof (GUnixSignalWatchSource)); + unix_signal_source = (GUnixSignalWatchSource *) source; + + unix_signal_source->signum = signum; + unix_signal_source->pending = FALSE; + + G_LOCK (unix_signal_lock); + ensure_unix_signal_handler_installed_unlocked (signum); + unix_signal_watches = g_slist_prepend (unix_signal_watches, unix_signal_source); + G_UNLOCK (unix_signal_lock); + + return source; +} + +static void +g_unix_signal_watch_finalize (GSource *source) +{ + G_LOCK (unix_signal_lock); + unix_signal_watches = g_slist_remove (unix_signal_watches, source); + G_UNLOCK (unix_signal_lock); +} + #endif /* G_OS_WIN32 */ static gboolean @@ -3867,120 +4414,159 @@ g_child_watch_dispatch (GSource *source, #ifndef G_OS_WIN32 static void -g_child_watch_signal_handler (int signum) +g_unix_signal_handler (int signum) { - child_watch_count ++; + if (signum == SIGCHLD) + child_watch_count ++; - if (child_watch_init_state == CHILD_WATCH_INITIALIZED_THREADED) + if (unix_signal_init_state == UNIX_SIGNAL_INITIALIZED_THREADED) { - write (child_watch_wake_up_pipe[1], "B", 1); + char buf[1]; + switch (signum) + { + case SIGCHLD: + buf[0] = _UNIX_SIGNAL_PIPE_SIGCHLD_CHAR; + break; + case SIGHUP: + buf[0] = _UNIX_SIGNAL_PIPE_SIGHUP_CHAR; + break; + case SIGINT: + buf[0] = _UNIX_SIGNAL_PIPE_SIGINT_CHAR; + break; + case SIGTERM: + buf[0] = _UNIX_SIGNAL_PIPE_SIGTERM_CHAR; + break; + default: + /* Shouldn't happen */ + return; + } + write (unix_signal_wake_up_pipe[1], buf, 1); } else { - /* We count on the signal interrupting the poll in the same thread. - */ + /* We count on the signal interrupting the poll in the same thread. */ + switch (signum) + { + case SIGCHLD: + /* Nothing to do - the handler will call waitpid() */ + break; + case SIGHUP: + unix_signal_state.sighup_delivered = TRUE; + break; + case SIGINT: + unix_signal_state.sigint_delivered = TRUE; + break; + case SIGTERM: + unix_signal_state.sigterm_delivered = TRUE; + break; + default: + g_assert_not_reached (); + break; + } } } static void -g_child_watch_source_init_single (void) +deliver_unix_signal (int signum) { - struct sigaction action; - - g_assert (! g_thread_supported()); - g_assert (child_watch_init_state == CHILD_WATCH_UNINITIALIZED); + GSList *iter; + g_assert (signum == SIGHUP || signum == SIGINT || signum == SIGTERM); - child_watch_init_state = CHILD_WATCH_INITIALIZED_SINGLE; + G_LOCK (unix_signal_lock); + for (iter = unix_signal_watches; iter; iter = iter->next) + { + GUnixSignalWatchSource *source = iter->data; - action.sa_handler = g_child_watch_signal_handler; - sigemptyset (&action.sa_mask); - action.sa_flags = SA_NOCLDSTOP; - sigaction (SIGCHLD, &action, NULL); + if (source->signum != signum) + continue; + + source->pending = TRUE; + } + G_UNLOCK (unix_signal_lock); } +/* + * This thread is created whenever anything in GLib needs + * to deal with UNIX signals; at present, just SIGCHLD + * from g_child_watch_source_new(). + * + * Note: We could eventually make this thread a more public interface + * and allow e.g. GDBus to use it instead of its own worker thread. + */ static gpointer -child_watch_helper_thread (gpointer data) +unix_signal_helper_thread (gpointer data) { while (1) { - gchar b[20]; - GSList *list; - - read (child_watch_wake_up_pipe[0], b, 20); - - /* We were woken up. Wake up all other contexts in all other threads */ - G_LOCK (main_context_list); - for (list = main_context_list; list; list = list->next) + gchar b[128]; + ssize_t i, bytes_read; + gboolean sigterm_received = FALSE; + gboolean sigint_received = FALSE; + gboolean sighup_received = FALSE; + + bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b)); + if (bytes_read < 0) + { + g_warning ("Failed to read from child watch wake up pipe: %s", + strerror (errno)); + /* Not much we can do here sanely; just wait a second and hope + * it was transient. + */ + g_usleep (G_USEC_PER_SEC); + continue; + } + for (i = 0; i < bytes_read; i++) { - GMainContext *context; - - context = list->data; - if (g_atomic_int_get (&context->ref_count) > 0) - /* Due to racing conditions we can find ref_count == 0, in - * that case, however, the context is still not destroyed - * and no poll can be active, otherwise the ref_count - * wouldn't be 0 */ - g_main_context_wakeup (context); + switch (b[i]) + { + case _UNIX_SIGNAL_PIPE_SIGCHLD_CHAR: + /* The child watch source will call waitpid() in its + * prepare() and check() methods; however, we don't + * know which pid exited, so we need to wake up + * all contexts. Note: actually we could get the pid + * from the "siginfo_t" via the handler, but to pass + * that info down the pipe would require a more structured + * data stream (as opposed to a single byte). + */ + break; + case _UNIX_SIGNAL_PIPE_SIGTERM_CHAR: + sigterm_received = TRUE; + break; + case _UNIX_SIGNAL_PIPE_SIGHUP_CHAR: + sighup_received = TRUE; + break; + case _UNIX_SIGNAL_PIPE_SIGINT_CHAR: + sigint_received = TRUE; + break; + default: + g_warning ("Invalid char '%c' read from child watch pipe", b[i]); + break; + } } - G_UNLOCK (main_context_list); + if (sigterm_received) + deliver_unix_signal (SIGTERM); + if (sigint_received) + deliver_unix_signal (SIGINT); + if (sighup_received) + deliver_unix_signal (SIGHUP); + _g_main_wake_up_all_contexts (); } - - return NULL; -} - -static void -g_child_watch_source_init_multi_threaded (void) -{ - GError *error = NULL; - struct sigaction action; - - g_assert (g_thread_supported()); - - if (pipe (child_watch_wake_up_pipe) < 0) - g_error ("Cannot create wake up pipe: %s\n", g_strerror (errno)); - fcntl (child_watch_wake_up_pipe[1], F_SETFL, O_NONBLOCK | fcntl (child_watch_wake_up_pipe[1], F_GETFL)); - - /* We create a helper thread that polls on the wakeup pipe indefinitely */ - /* FIXME: Think this through for races */ - if (g_thread_create (child_watch_helper_thread, NULL, FALSE, &error) == NULL) - g_error ("Cannot create a thread to monitor child exit status: %s\n", error->message); - child_watch_init_state = CHILD_WATCH_INITIALIZED_THREADED; - - action.sa_handler = g_child_watch_signal_handler; - sigemptyset (&action.sa_mask); - action.sa_flags = SA_RESTART | SA_NOCLDSTOP; - sigaction (SIGCHLD, &action, NULL); -} - -static void -g_child_watch_source_init_promote_single_to_threaded (void) -{ - g_child_watch_source_init_multi_threaded (); } static void g_child_watch_source_init (void) { - if (g_thread_supported()) - { - if (child_watch_init_state == CHILD_WATCH_UNINITIALIZED) - g_child_watch_source_init_multi_threaded (); - else if (child_watch_init_state == CHILD_WATCH_INITIALIZED_SINGLE) - g_child_watch_source_init_promote_single_to_threaded (); - } - else - { - if (child_watch_init_state == CHILD_WATCH_UNINITIALIZED) - g_child_watch_source_init_single (); - } + G_LOCK (unix_signal_lock); + ensure_unix_signal_handler_installed_unlocked (SIGCHLD); + G_UNLOCK (unix_signal_lock); } #endif /* !G_OS_WIN32 */ /** * g_child_watch_source_new: - * @pid: process id of a child process to watch. On Windows, a HANDLE - * for the process to watch (which actually doesn't have to be a child). + * @pid: process to watch. On POSIX the pid of a child process. On + * Windows a handle for a process (which doesn't have to be a child). * * Creates a new child_watch source. * @@ -4013,7 +4599,7 @@ g_child_watch_source_new (GPid pid) GChildWatchSource *child_watch_source = (GChildWatchSource *)source; #ifdef G_OS_WIN32 - child_watch_source->poll.fd = (int)pid; + child_watch_source->poll.fd = (gintptr) pid; child_watch_source->poll.events = G_IO_IN; g_source_add_poll (source, &child_watch_source->poll); @@ -4030,7 +4616,8 @@ g_child_watch_source_new (GPid pid) * g_child_watch_add_full: * @priority: the priority of the idle source. Typically this will be in the * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. - * @pid: process id of a child process to watch + * @pid: process to watch. On POSIX the pid of a child process. On + * Windows a handle for a process (which doesn't have to be a child). * @function: function to call * @data: data to pass to @function * @notify: function to call when the idle is removed, or %NULL @@ -4049,8 +4636,14 @@ g_child_watch_source_new (GPid pid) * * GLib supports only a single callback per process id. * + * This internally creates a main loop source using + * g_child_watch_source_new() and attaches it to the main loop context + * using g_source_attach(). You can do these steps manually if you + * need greater control. + * * Return value: the ID (greater than 0) of the event source. * + * Rename to: g_child_watch_add * Since: 2.4 **/ guint @@ -4079,7 +4672,8 @@ g_child_watch_add_full (gint priority, /** * g_child_watch_add: - * @pid: process id of a child process to watch + * @pid: process id to watch. On POSIX the pid of a child process. On + * Windows a handle for a process (which doesn't have to be a child). * @function: function to call * @data: data to pass to @function * @@ -4097,6 +4691,11 @@ g_child_watch_add_full (gint priority, * * GLib supports only a single callback per process id. * + * This internally creates a main loop source using + * g_child_watch_source_new() and attaches it to the main loop context + * using g_source_attach(). You can do these steps manually if you + * need greater control. + * * Return value: the ID (greater than 0) of the event source. * * Since: 2.4 @@ -4169,7 +4768,7 @@ g_idle_source_new (void) /** * g_idle_add_full: * @priority: the priority of the idle source. Typically this will be in the - * range btweeen #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. + * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. * @function: function to call * @data: data to pass to @function * @notify: function to call when the idle is removed, or %NULL @@ -4178,7 +4777,12 @@ g_idle_source_new (void) * events pending. If the function returns %FALSE it is automatically * removed from the list of event sources and will not be called again. * + * This internally creates a main loop source using g_idle_source_new() + * and attaches it to the main loop context using g_source_attach(). + * You can do these steps manually if you need greater control. + * * Return value: the ID (greater than 0) of the event source. + * Rename to: g_idle_add **/ guint g_idle_add_full (gint priority, @@ -4214,6 +4818,10 @@ g_idle_add_full (gint priority, * returns %FALSE it is automatically removed from the list of event * sources and will not be called again. * + * This internally creates a main loop source using g_idle_source_new() + * and attaches it to the main loop context using g_source_attach(). + * You can do these steps manually if you need greater control. + * * Return value: the ID (greater than 0) of the event source. **/ guint @@ -4237,5 +4845,112 @@ g_idle_remove_by_data (gpointer data) return g_source_remove_by_funcs_user_data (&g_idle_funcs, data); } -#define __G_MAIN_C__ -#include "galiasdef.c" +/** + * g_main_context_invoke: + * @context: (allow-none): a #GMainContext, or %NULL + * @function: function to call + * @data: data to pass to @function + * + * Invokes a function in such a way that @context is owned during the + * invocation of @function. + * + * If @context is %NULL then the global default main context — as + * returned by g_main_context_default() — is used. + * + * If @context is owned by the current thread, @function is called + * directly. Otherwise, if @context is the thread-default main context + * of the current thread and g_main_context_acquire() succeeds, then + * @function is called and g_main_context_release() is called + * afterwards. + * + * In any other case, an idle source is created to call @function and + * that source is attached to @context (presumably to be run in another + * thread). The idle source is attached with #G_PRIORITY_DEFAULT + * priority. If you want a different priority, use + * g_main_context_invoke_full(). + * + * Note that, as with normal idle functions, @function should probably + * return %FALSE. If it returns %TRUE, it will be continuously run in a + * loop (and may prevent this call from returning). + * + * Since: 2.28 + **/ +void +g_main_context_invoke (GMainContext *context, + GSourceFunc function, + gpointer data) +{ + g_main_context_invoke_full (context, + G_PRIORITY_DEFAULT, + function, data, NULL); +} + +/** + * g_main_context_invoke_full: + * @context: (allow-none): a #GMainContext, or %NULL + * @priority: the priority at which to run @function + * @function: function to call + * @data: data to pass to @function + * @notify: a function to call when @data is no longer in use, or %NULL. + * + * Invokes a function in such a way that @context is owned during the + * invocation of @function. + * + * This function is the same as g_main_context_invoke() except that it + * lets you specify the priority incase @function ends up being + * scheduled as an idle and also lets you give a #GDestroyNotify for @data. + * + * @notify should not assume that it is called from any particular + * thread or with any particular context acquired. + * + * Since: 2.28 + **/ +void +g_main_context_invoke_full (GMainContext *context, + gint priority, + GSourceFunc function, + gpointer data, + GDestroyNotify notify) +{ + g_return_if_fail (function != NULL); + + if (!context) + context = g_main_context_default (); + + if (g_main_context_is_owner (context)) + { + while (function (data)); + if (notify != NULL) + notify (data); + } + + else + { + GMainContext *thread_default; + + thread_default = g_main_context_get_thread_default (); + + if (!thread_default) + thread_default = g_main_context_default (); + + if (thread_default == context && g_main_context_acquire (context)) + { + while (function (data)); + + g_main_context_release (context); + + if (notify != NULL) + notify (data); + } + else + { + GSource *source; + + source = g_idle_source_new (); + g_source_set_priority (source, priority); + g_source_set_callback (source, function, data, notify); + g_source_attach (source, context); + g_source_unref (source); + } + } +}