From 2e57a3643891f41c238c5ee3793afcd8706a4060 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 16 Dec 1998 09:34:30 +0000 Subject: [PATCH] Updated to reflect the existence of gthread. 1998-12-16 Sebastian Wilhelmi * docs/glib-config.1: Updated to reflect the existence of gthread. * gmain.c (g_main_poll_add_unlocking): Changed g_main_poll_add_unlocked to g_main_poll_add_unlocking to match semantic, (indeed, main_loop must be locked, when calling this function). Removed the unlocking from the end of that function, as that is not right. Made a 'HOLDS' comment above the function. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-12 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ docs/glib-config.1 | 4 ++-- glib/gmain.c | 21 ++++++++++----------- gmain.c | 21 ++++++++++----------- 11 files changed, 102 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 622b7eb..ff87d1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 622b7eb..ff87d1e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +1998-12-16 Sebastian Wilhelmi + + * docs/glib-config.1: Updated to reflect the existence of gthread. + + * gmain.c (g_main_poll_add_unlocking): Changed + g_main_poll_add_unlocked to g_main_poll_add_unlocking to match + semantic, (indeed, main_loop must be locked, when calling this + function). Removed the unlocking from the end of that function, as + that is not right. Made a 'HOLDS' comment above the function. + Wed Dec 16 03:16:58 1998 Tim Janik * configure.in: version bump to 1.1.8, binary age 0, interface age 0. diff --git a/docs/glib-config.1 b/docs/glib-config.1 index 0bd8606..d1dac9a 100644 --- a/docs/glib-config.1 +++ b/docs/glib-config.1 @@ -1,4 +1,4 @@ -.TH GLIB 1 "24 October 1998" Version 1.1.8 +.TH GLIB 1 "16 December 1998" Version 1.1.8 .SH NAME glib-config - script to get information about the installed version of GLib .SH SYNOPSIS @@ -15,7 +15,7 @@ to the .m4 macros for GNU autoconf that are included with \fIGLib\fP. \fIglib-config\fP accepts the following options: .TP 8 .B LIBRARIES -\fIGLib\fP has two libraries 'glib' and 'gmodule'. If you specify one of +\fIGLib\fP has three libraries 'glib', 'gmodule' and 'gthread'. If you specify one of them, only the appropriate things for that library will be printed. .TP 8 .B \-\-version diff --git a/glib/gmain.c b/glib/gmain.c index a6b0e5e..29bd9bf 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -70,11 +70,11 @@ struct _GPollRec { /* Forward declarations */ -static void g_main_poll (gint timeout, - gboolean use_priority, - gint priority); -static void g_main_poll_add_unlocked (gint priority, - GPollFD *fd); +static void g_main_poll (gint timeout, + gboolean use_priority, + gint priority); +static void g_main_poll_add_unlocking (gint priority, + GPollFD *fd); static gboolean g_timeout_prepare (gpointer source_data, GTimeVal *current_time, @@ -588,7 +588,7 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority) wake_up_rec.fd = wake_up_pipe[0]; wake_up_rec.events = G_IO_IN; - g_main_poll_add_unlocked (0, &wake_up_rec); + g_main_poll_add_unlocking (0, &wake_up_rec); } pollrec = poll_records; @@ -635,13 +635,14 @@ g_main_poll_add (gint priority, GPollFD *fd) { G_LOCK (main_loop); - g_main_poll_add_unlocked (priority, fd); + g_main_poll_add_unlocking (priority, fd); G_UNLOCK (main_loop); } +/* HOLDS: main_loop_lock */ static void -g_main_poll_add_unlocked (gint priority, - GPollFD *fd) +g_main_poll_add_unlocking (gint priority, + GPollFD *fd) { GPollRec *lastrec, *pollrec, *newrec; @@ -675,8 +676,6 @@ g_main_poll_add_unlocked (gint priority, newrec->next = pollrec; n_poll_records++; - - G_UNLOCK (main_loop); } void diff --git a/gmain.c b/gmain.c index a6b0e5e..29bd9bf 100644 --- a/gmain.c +++ b/gmain.c @@ -70,11 +70,11 @@ struct _GPollRec { /* Forward declarations */ -static void g_main_poll (gint timeout, - gboolean use_priority, - gint priority); -static void g_main_poll_add_unlocked (gint priority, - GPollFD *fd); +static void g_main_poll (gint timeout, + gboolean use_priority, + gint priority); +static void g_main_poll_add_unlocking (gint priority, + GPollFD *fd); static gboolean g_timeout_prepare (gpointer source_data, GTimeVal *current_time, @@ -588,7 +588,7 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority) wake_up_rec.fd = wake_up_pipe[0]; wake_up_rec.events = G_IO_IN; - g_main_poll_add_unlocked (0, &wake_up_rec); + g_main_poll_add_unlocking (0, &wake_up_rec); } pollrec = poll_records; @@ -635,13 +635,14 @@ g_main_poll_add (gint priority, GPollFD *fd) { G_LOCK (main_loop); - g_main_poll_add_unlocked (priority, fd); + g_main_poll_add_unlocking (priority, fd); G_UNLOCK (main_loop); } +/* HOLDS: main_loop_lock */ static void -g_main_poll_add_unlocked (gint priority, - GPollFD *fd) +g_main_poll_add_unlocking (gint priority, + GPollFD *fd) { GPollRec *lastrec, *pollrec, *newrec; @@ -675,8 +676,6 @@ g_main_poll_add_unlocked (gint priority, newrec->next = pollrec; n_poll_records++; - - G_UNLOCK (main_loop); } void -- 2.7.4