giounix.c: s/g_main_poll_add/g_main_remove_add/g

Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>

        * glib.h:
          giounix.c: s/g_main_poll_add/g_main_remove_add/g
                     s/g_main_poll_remove/g_main_remove_poll/g
                     s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
          (from Tim Janik)

        * gthread-posix.c: use g_free in mutex_free (from Tim Janik)
This commit is contained in:
CST 1998 Shawn T. Amundson 1998-12-17 04:36:04 +00:00 committed by Shawn Amundson
parent 6166dd889d
commit 77ccad4d2f
16 changed files with 89 additions and 21 deletions

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -1,3 +1,11 @@
Wed Dec 16 22:32:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* glib.h:
giounix.c: s/g_main_poll_add/g_main_remove_add/g
s/g_main_poll_remove/g_main_remove_poll/g
s/g_main_poll_add_unlocking/g_main_add_unlocking_poll/g
(from Tim Janik)
Wed Dec 16 20:04:10 PST 1998 Manish Singh <yosh@gimp.org>
* configure.in: check for pthread_attr_init in all cases, du4

View File

@ -131,7 +131,7 @@ g_io_unix_destroy (gpointer source_data)
{
GIOUnixWatch *data = source_data;
g_main_poll_remove (&data->pollfd);
g_main_remove_poll (&data->pollfd);
g_io_channel_unref (data->channel);
g_free (data);
}
@ -276,7 +276,7 @@ g_io_unix_add_watch (GIOChannel *channel,
watch->pollfd.fd = unix_channel->fd;
watch->pollfd.events = condition;
g_main_poll_add (priority, &watch->pollfd);
g_main_add_poll (priority, &watch->pollfd);
return g_source_add (priority, TRUE, &unix_watch_funcs, watch, user_data, notify);
}

4
glib.h
View File

@ -2472,9 +2472,9 @@ struct _GPollFD
gushort revents;
};
void g_main_poll_add (gint priority,
void g_main_add_poll (gint priority,
GPollFD *fd);
void g_main_poll_remove (GPollFD *fd);
void g_main_remove_poll (GPollFD *fd);
void g_main_set_poll_func (GPollFunc func);
GIOChannel* g_io_channel_unix_new (int fd);

View File

@ -131,7 +131,7 @@ g_io_unix_destroy (gpointer source_data)
{
GIOUnixWatch *data = source_data;
g_main_poll_remove (&data->pollfd);
g_main_remove_poll (&data->pollfd);
g_io_channel_unref (data->channel);
g_free (data);
}
@ -276,7 +276,7 @@ g_io_unix_add_watch (GIOChannel *channel,
watch->pollfd.fd = unix_channel->fd;
watch->pollfd.events = condition;
g_main_poll_add (priority, &watch->pollfd);
g_main_add_poll (priority, &watch->pollfd);
return g_source_add (priority, TRUE, &unix_watch_funcs, watch, user_data, notify);
}

View File

@ -2472,9 +2472,9 @@ struct _GPollFD
gushort revents;
};
void g_main_poll_add (gint priority,
void g_main_add_poll (gint priority,
GPollFD *fd);
void g_main_poll_remove (GPollFD *fd);
void g_main_remove_poll (GPollFD *fd);
void g_main_set_poll_func (GPollFunc func);
GIOChannel* g_io_channel_unix_new (int fd);

View File

@ -79,7 +79,7 @@ struct _GPollRec
static void g_main_poll (gint timeout,
gboolean use_priority,
gint priority);
static void g_main_poll_add_unlocking (gint priority,
static void g_main_add_unlocking_poll (gint priority,
GPollFD *fd);
static gboolean g_timeout_prepare (gpointer source_data,
@ -604,7 +604,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_unlocking (0, &wake_up_rec);
g_main_add_unlocking_poll (0, &wake_up_rec);
}
pollrec = poll_records;
@ -647,17 +647,17 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority)
}
void
g_main_poll_add (gint priority,
g_main_add_poll (gint priority,
GPollFD *fd)
{
G_LOCK (main_loop);
g_main_poll_add_unlocking (priority, fd);
g_main_add_unlocking_poll (priority, fd);
G_UNLOCK (main_loop);
}
/* HOLDS: main_loop_lock */
static void
g_main_poll_add_unlocking (gint priority,
g_main_add_unlocking_poll (gint priority,
GPollFD *fd)
{
GPollRec *lastrec, *pollrec, *newrec;
@ -695,7 +695,7 @@ g_main_poll_add_unlocking (gint priority,
}
void
g_main_poll_remove (GPollFD *fd)
g_main_remove_poll (GPollFD *fd)
{
GPollRec *pollrec, *lastrec;

12
gmain.c
View File

@ -79,7 +79,7 @@ struct _GPollRec
static void g_main_poll (gint timeout,
gboolean use_priority,
gint priority);
static void g_main_poll_add_unlocking (gint priority,
static void g_main_add_unlocking_poll (gint priority,
GPollFD *fd);
static gboolean g_timeout_prepare (gpointer source_data,
@ -604,7 +604,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_unlocking (0, &wake_up_rec);
g_main_add_unlocking_poll (0, &wake_up_rec);
}
pollrec = poll_records;
@ -647,17 +647,17 @@ g_main_poll (gint timeout, gboolean use_priority, gint priority)
}
void
g_main_poll_add (gint priority,
g_main_add_poll (gint priority,
GPollFD *fd)
{
G_LOCK (main_loop);
g_main_poll_add_unlocking (priority, fd);
g_main_add_unlocking_poll (priority, fd);
G_UNLOCK (main_loop);
}
/* HOLDS: main_loop_lock */
static void
g_main_poll_add_unlocking (gint priority,
g_main_add_unlocking_poll (gint priority,
GPollFD *fd)
{
GPollRec *lastrec, *pollrec, *newrec;
@ -695,7 +695,7 @@ g_main_poll_add_unlocking (gint priority,
}
void
g_main_poll_remove (GPollFD *fd)
g_main_remove_poll (GPollFD *fd)
{
GPollRec *pollrec, *lastrec;

View File

@ -1,3 +1,7 @@
Wed Dec 16 22:21:33 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* gthread-posix.c: use g_free in mutex_free (from Tim Janik)
Thu Dec 17 03:38:57 1998 Tim Janik <timj@gtk.org>
* Makefile.am: -DG_LOG_DOMAIN="GThread", we don't need an extern

View File

@ -51,7 +51,7 @@ static void
g_mutex_free_posix_impl (GMutex * mutex)
{
posix_check_for_error (pthread_mutex_destroy ((pthread_mutex_t *) mutex));
free (mutex);
g_free (mutex);
}
/* NOTE: the functions g_mutex_lock and g_mutex_unlock may not use