callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix two more potential races that could happen when an application is

Browse Source 
2007-04-28  Ronald Bultje  <rbultje@ronald.bitfreak.net>

        * gdk/quartz/gdkeventloop-quartz.c: (select_thread_func),
        (poll_func): fix two more potential races that could happen when
        an application is polling in the mainloop and a separate thread
        tries to wake it up using g_idle_add(). Fixes #425271 comment 5.


svn path=/trunk/; revision=17680
This commit is contained in:
Ronald Bultje
2007-04-28 18:14:19 +00:00
committed by Ronald Bultje
parent 0b4b5d5ee0
commit 92563b7d22
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-04-28 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gdk/quartz/gdkeventloop-quartz.c: (select_thread_func),
(poll_func): fix two more potential races that could happen when
an application is polling in the mainloop and a separate thread
tries to wake it up using g_idle_add(). Fixes #425271 comment 5.
2007-04-28 Matthias Clasen <mclasen@redhat.com> 2007-04-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (gtk_entry_grab_focus): * gtk/gtkentry.c (gtk_entry_grab_focus):

16
gdk/quartz/gdkeventloop-quartz.c
View File

@ -13,7 +13,7 @@ static NSEvent *current_event;
static GPollFunc old_poll_func; static GPollFunc old_poll_func;
static gboolean select_fd_waiting = FALSE; static gboolean select_fd_waiting = FALSE, ready_for_poll = FALSE;
static pthread_t select_thread = 0; static pthread_t select_thread = 0;
static int wakeup_pipe[2]; static int wakeup_pipe[2];
static pthread_mutex_t pollfd_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t pollfd_mutex = PTHREAD_MUTEX_INITIALIZER;
@ -118,20 +118,23 @@ select_thread_func (void *arg)
int n_active_fds; int n_active_fds;
pthread_mutex_lock (&pollfd_mutex); pthread_mutex_lock (&pollfd_mutex);
pthread_cond_signal (&ready_cond);
while (1) while (1)
{ {
char c; char c;
int n; int n;
ready_for_poll = TRUE;
pthread_cond_signal (&ready_cond);
pthread_cond_wait (&ready_cond, &pollfd_mutex); pthread_cond_wait (&ready_cond, &pollfd_mutex);
ready_for_poll = FALSE;
pthread_mutex_unlock (&pollfd_mutex);
select_fd_waiting = TRUE; select_fd_waiting = TRUE;
pthread_cond_signal (&ready_cond);
pthread_mutex_unlock (&pollfd_mutex);
n_active_fds = old_poll_func (pollfds, n_pollfds, -1); n_active_fds = old_poll_func (pollfds, n_pollfds, -1);
select_fd_waiting = FALSE;
pthread_mutex_lock (&pollfd_mutex); pthread_mutex_lock (&pollfd_mutex);
select_fd_waiting = FALSE;
n = read (pipe_pollfd->fd, &c, 1); n = read (pipe_pollfd->fd, &c, 1);
if (n == 1) if (n == 1)
{ {
@ -177,10 +180,12 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
pthread_mutex_lock (&pollfd_mutex); pthread_mutex_lock (&pollfd_mutex);
pthread_create (&select_thread, NULL, select_thread_func, NULL); pthread_create (&select_thread, NULL, select_thread_func, NULL);
pthread_cond_wait (&ready_cond, &pollfd_mutex);
} else } else
pthread_mutex_lock (&pollfd_mutex); pthread_mutex_lock (&pollfd_mutex);
while (!ready_for_poll)
pthread_cond_wait (&ready_cond, &pollfd_mutex);
n_pollfds = nfds; n_pollfds = nfds;
g_free (pollfds); g_free (pollfds);
pollfds = g_memdup (ufds, sizeof (GPollFD) * nfds); pollfds = g_memdup (ufds, sizeof (GPollFD) * nfds);
@ -198,6 +203,7 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
/* Start our thread */ /* Start our thread */
pthread_cond_signal (&ready_cond); pthread_cond_signal (&ready_cond);
pthread_cond_wait (&ready_cond, &pollfd_mutex);
pthread_mutex_unlock (&pollfd_mutex); pthread_mutex_unlock (&pollfd_mutex);
} }