From bb19315fbdb4ae54704778e6dec7b7319c95419a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 19 Dec 1998 22:11:49 +0000 Subject: [PATCH] Allocate space for pollfd's _after_ adding poll wake-up-pipe record. Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's _after_ adding poll wake-up-pipe record. * gmain.c (g_main_add_poll): Changed name of internal function g_main_add_poll_unlocked() back from the non-sensical g_main_add_unlocking_poll(). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-12 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ glib/gmain.c | 14 ++++++++------ gmain.c | 14 ++++++++------ 10 files changed, 88 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0482d42b..d5ee525b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c0482d42b..d5ee525b9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * gmain.c (g_main_poll): Allocate space for pollfd's + _after_ adding poll wake-up-pipe record. + + * gmain.c (g_main_add_poll): Changed name + of internal function g_main_add_poll_unlocked() + back from the non-sensical g_main_add_unlocking_poll(). + Sat Dec 19 06:25:55 1998 Tim Janik * glib.m4: fixed a minor bug that would let configures bail out diff --git a/glib/gmain.c b/glib/gmain.c index 6821269f5..3fcc873d8 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -83,7 +83,7 @@ struct _GPollRec static void g_main_poll (gint timeout, gboolean use_priority, gint priority); -static void g_main_add_unlocking_poll (gint priority, +static void g_main_add_poll_unlocked (gint priority, GPollFD *fd); static gboolean g_timeout_prepare (gpointer source_data, @@ -649,7 +649,7 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority) { - GPollFD *fd_array = g_new (GPollFD, n_poll_records); + GPollFD *fd_array; GPollRec *pollrec; gint i; @@ -663,9 +663,11 @@ g_main_poll (gint timeout, wake_up_rec.fd = wake_up_pipe[0]; wake_up_rec.events = G_IO_IN; - g_main_add_unlocking_poll (0, &wake_up_rec); + g_main_add_poll_unlocked (0, &wake_up_rec); } + fd_array = g_new (GPollFD, n_poll_records); + pollrec = poll_records; i = 0; while (pollrec && (!use_priority || priority >= pollrec->priority)) @@ -710,14 +712,14 @@ g_main_add_poll (GPollFD *fd, gint priority) { G_LOCK (main_loop); - g_main_add_unlocking_poll (priority, fd); + g_main_add_poll_unlocked (priority, fd); G_UNLOCK (main_loop); } /* HOLDS: main_loop_lock */ static void -g_main_add_unlocking_poll (gint priority, - GPollFD *fd) +g_main_add_poll_unlocked (gint priority, + GPollFD *fd) { GPollRec *lastrec, *pollrec, *newrec; diff --git a/gmain.c b/gmain.c index 6821269f5..3fcc873d8 100644 --- a/gmain.c +++ b/gmain.c @@ -83,7 +83,7 @@ struct _GPollRec static void g_main_poll (gint timeout, gboolean use_priority, gint priority); -static void g_main_add_unlocking_poll (gint priority, +static void g_main_add_poll_unlocked (gint priority, GPollFD *fd); static gboolean g_timeout_prepare (gpointer source_data, @@ -649,7 +649,7 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority) { - GPollFD *fd_array = g_new (GPollFD, n_poll_records); + GPollFD *fd_array; GPollRec *pollrec; gint i; @@ -663,9 +663,11 @@ g_main_poll (gint timeout, wake_up_rec.fd = wake_up_pipe[0]; wake_up_rec.events = G_IO_IN; - g_main_add_unlocking_poll (0, &wake_up_rec); + g_main_add_poll_unlocked (0, &wake_up_rec); } + fd_array = g_new (GPollFD, n_poll_records); + pollrec = poll_records; i = 0; while (pollrec && (!use_priority || priority >= pollrec->priority)) @@ -710,14 +712,14 @@ g_main_add_poll (GPollFD *fd, gint priority) { G_LOCK (main_loop); - g_main_add_unlocking_poll (priority, fd); + g_main_add_poll_unlocked (priority, fd); G_UNLOCK (main_loop); } /* HOLDS: main_loop_lock */ static void -g_main_add_unlocking_poll (gint priority, - GPollFD *fd) +g_main_add_poll_unlocked (gint priority, + GPollFD *fd) { GPollRec *lastrec, *pollrec, *newrec;