luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-06 01:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for two threads calling g_main_iterate at once.

Browse Source 
Thu Apr  8 19:53:19 1999  Owen Taylor  <otaylor@redhat.com>

	* gmain.c (g_main_iterate): Check for two threads
	calling g_main_iterate at once.

	* gmain.c: If the set of poll file descriptors changes
	during a call to poll(), abort that call, and start
	a new poll. My test program still segfaults
	obscurely on glibc 2.0 (in read()!!!), but now it works on
	glibc 2.1, so I'll blame something else for the other segfault.
This commit is contained in:
Owen Taylor 1999-04-09 00:03:37 +00:00 committed by Owen Taylor
parent 6a1327a2ef
commit 7c1f07d1ef
10 changed files with 194 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-12
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Thu Apr 8 19:53:19 1999 Owen Taylor <otaylor@redhat.com>
* gmain.c (g_main_iterate): Check for two threads
calling g_main_iterate at once.
* gmain.c: If the set of poll file descriptors changes
during a call to poll(), abort that call, and start
a new poll. My test program still segfaults
obscurely on glibc 2.0 (in read()!!!), but now it works on
glibc 2.1, so I'll blame something else for the other segfault.
1999-03-31 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Fixed slight bug, that made configure hang on some

61
glib/gmain.c
View File

@ -113,6 +113,7 @@ static void g_main_poll (gint timeout,
gint priority);
static void g_main_add_poll_unlocked (gint priority,
GPollFD *fd);
static void g_main_wakeup (void);
static gboolean g_timeout_prepare (gpointer source_data,
GTimeVal *current_time,
@ -177,6 +178,9 @@ static HANDLE wake_up_semaphore = NULL;
#endif /* NATIVE_WIN32 */
static GPollFD wake_up_rec;
static gboolean poll_waiting = FALSE;
/* Flag indicating whether the set of fd's changed during a poll */
static gboolean poll_changed = FALSE;
#endif /* G_THREADS_ENABLED */
#ifdef HAVE_POLL
@ -476,17 +480,9 @@ g_source_add (gint priority,
#ifdef G_THREADS_ENABLED
/* Now wake up the main loop if it is waiting in the poll() */
g_main_wakeup ();
#endif
if (poll_waiting)
{
poll_waiting = FALSE;
#ifndef NATIVE_WIN32
write (wake_up_pipe[1], "A", 1);
#else
ReleaseSemaphore (wake_up_semaphore, 1, NULL);
#endif
}
#endif
G_UNLOCK (main_loop);
return return_val;
@ -716,6 +712,13 @@ g_main_iterate (gboolean block,
G_LOCK (main_loop);
if (poll_waiting)
{
g_warning("g_main_iterate(): main loop already active in another thread");
G_UNLOCK (main_loop);
return FALSE;
}
/* If recursing, finish up current dispatch, before starting over */
if (pending_dispatches)
{
@ -1002,6 +1005,7 @@ g_main_poll (gint timeout,
}
#ifdef G_THREADS_ENABLED
poll_waiting = TRUE;
poll_changed = FALSE;
#endif
npoll = i;
@ -1063,6 +1067,12 @@ g_main_poll (gint timeout,
}
else
poll_waiting = FALSE;
/* If the set of poll file descriptors changed, bail out
* and let the main loop rerun
*/
if (poll_changed)
return;
#endif
pollrec = poll_records;
@ -1126,6 +1136,13 @@ g_main_add_poll_unlocked (gint priority,
newrec->next = pollrec;
n_poll_records++;
#ifdef G_THREADS_ENABLED
poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
g_main_wakeup ();
#endif
}
void
@ -1157,6 +1174,13 @@ g_main_remove_poll (GPollFD *fd)
pollrec = pollrec->next;
}
#ifdef G_THREADS_ENABLED
poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
g_main_wakeup ();
#endif
G_UNLOCK (main_loop);
}
@ -1173,6 +1197,23 @@ g_main_set_poll_func (GPollFunc func)
#endif
}
/* Wake the main loop up from a poll() */
static void
g_main_wakeup (void)
{
#ifdef G_THREADS_ENABLED
if (poll_waiting)
{
poll_waiting = FALSE;
#ifndef NATIVE_WIN32
write (wake_up_pipe[1], "A", 1);
#else
ReleaseSemaphore (wake_up_semaphore, 1, NULL);
#endif
}
#endif
}
/* Timeouts */
static gboolean

61
gmain.c
View File

@ -113,6 +113,7 @@ static void g_main_poll (gint timeout,
gint priority);
static void g_main_add_poll_unlocked (gint priority,
GPollFD *fd);
static void g_main_wakeup (void);
static gboolean g_timeout_prepare (gpointer source_data,
GTimeVal *current_time,
@ -177,6 +178,9 @@ static HANDLE wake_up_semaphore = NULL;
#endif /* NATIVE_WIN32 */
static GPollFD wake_up_rec;
static gboolean poll_waiting = FALSE;
/* Flag indicating whether the set of fd's changed during a poll */
static gboolean poll_changed = FALSE;
#endif /* G_THREADS_ENABLED */
#ifdef HAVE_POLL
@ -476,17 +480,9 @@ g_source_add (gint priority,
#ifdef G_THREADS_ENABLED
/* Now wake up the main loop if it is waiting in the poll() */
g_main_wakeup ();
#endif
if (poll_waiting)
{
poll_waiting = FALSE;
#ifndef NATIVE_WIN32
write (wake_up_pipe[1], "A", 1);
#else
ReleaseSemaphore (wake_up_semaphore, 1, NULL);
#endif
}
#endif
G_UNLOCK (main_loop);
return return_val;
@ -716,6 +712,13 @@ g_main_iterate (gboolean block,
G_LOCK (main_loop);
if (poll_waiting)
{
g_warning("g_main_iterate(): main loop already active in another thread");
G_UNLOCK (main_loop);
return FALSE;
}
/* If recursing, finish up current dispatch, before starting over */
if (pending_dispatches)
{
@ -1002,6 +1005,7 @@ g_main_poll (gint timeout,
}
#ifdef G_THREADS_ENABLED
poll_waiting = TRUE;
poll_changed = FALSE;
#endif
npoll = i;
@ -1063,6 +1067,12 @@ g_main_poll (gint timeout,
}
else
poll_waiting = FALSE;
/* If the set of poll file descriptors changed, bail out
* and let the main loop rerun
*/
if (poll_changed)
return;
#endif
pollrec = poll_records;
@ -1126,6 +1136,13 @@ g_main_add_poll_unlocked (gint priority,
newrec->next = pollrec;
n_poll_records++;
#ifdef G_THREADS_ENABLED
poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
g_main_wakeup ();
#endif
}
void
@ -1157,6 +1174,13 @@ g_main_remove_poll (GPollFD *fd)
pollrec = pollrec->next;
}
#ifdef G_THREADS_ENABLED
poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
g_main_wakeup ();
#endif
G_UNLOCK (main_loop);
}
@ -1173,6 +1197,23 @@ g_main_set_poll_func (GPollFunc func)
#endif
}
/* Wake the main loop up from a poll() */
static void
g_main_wakeup (void)
{
#ifdef G_THREADS_ENABLED
if (poll_waiting)
{
poll_waiting = FALSE;
#ifndef NATIVE_WIN32
write (wake_up_pipe[1], "A", 1);
#else
ReleaseSemaphore (wake_up_semaphore, 1, NULL);
#endif
}
#endif
}
/* Timeouts */
static gboolean