From 7f237f6fcd00ad9888ef459ccdc8d02e12c311fd Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 19 Dec 1998 22:21:39 +0000 Subject: [PATCH] Add #defines defining scale of priorities. Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining scale of priorities. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib.h | 8 ++++++++ glib/glib.h | 8 ++++++++ glib/gmain.c | 7 ++++--- gmain.c | 7 ++++--- 12 files changed, 64 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5ee525b..84b2630a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d5ee525b..84b2630a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Dec 19 16:56:02 1998 Owen Taylor + + * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining + scale of priorities. + Sat Dec 19 16:56:02 1998 Owen Taylor * gmain.c (g_main_poll): Allocate space for pollfd's diff --git a/glib.h b/glib.h index 293dda96..19c6dd79 100644 --- a/glib.h +++ b/glib.h @@ -2386,6 +2386,14 @@ struct _GSourceFuncs GDestroyNotify destroy; }; +/* Standard priorities */ + +#define G_PRIORITY_HIGH -100 +#define G_PRIORITY_DEFAULT 0 +#define G_PRIORITY_HIGH_IDLE 100 +#define G_PRIORITY_DEFAULT_IDLE 200 +#define G_PRIORITY_LOW 300 + typedef gboolean (*GSourceFunc) (gpointer data); /* Hooks for adding to the main loop */ diff --git a/glib/glib.h b/glib/glib.h index 293dda96..19c6dd79 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -2386,6 +2386,14 @@ struct _GSourceFuncs GDestroyNotify destroy; }; +/* Standard priorities */ + +#define G_PRIORITY_HIGH -100 +#define G_PRIORITY_DEFAULT 0 +#define G_PRIORITY_HIGH_IDLE 100 +#define G_PRIORITY_DEFAULT_IDLE 200 +#define G_PRIORITY_LOW 300 + typedef gboolean (*GSourceFunc) (gpointer data); /* Hooks for adding to the main loop */ diff --git a/glib/gmain.c b/glib/gmain.c index 3fcc873d..c3586acc 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -287,7 +287,7 @@ g_source_remove (guint tag) if (hook) { GSource *source = (GSource *)hook; - + ((GSourceFuncs *) source->hook.func)->destroy (source->source_data); g_hook_destroy_link (&source_list, hook); } @@ -888,7 +888,8 @@ g_timeout_add (guint32 interval, GSourceFunc function, gpointer data) { - return g_timeout_add_full (0, interval, function, data, NULL); + return g_timeout_add_full (G_PRIORITY_DEFAULT, + interval, function, data, NULL); } /* Idle functions */ @@ -936,5 +937,5 @@ guint g_idle_add (GSourceFunc function, gpointer data) { - return g_idle_add_full (0, function, data, NULL); + return g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, function, data, NULL); } diff --git a/gmain.c b/gmain.c index 3fcc873d..c3586acc 100644 --- a/gmain.c +++ b/gmain.c @@ -287,7 +287,7 @@ g_source_remove (guint tag) if (hook) { GSource *source = (GSource *)hook; - + ((GSourceFuncs *) source->hook.func)->destroy (source->source_data); g_hook_destroy_link (&source_list, hook); } @@ -888,7 +888,8 @@ g_timeout_add (guint32 interval, GSourceFunc function, gpointer data) { - return g_timeout_add_full (0, interval, function, data, NULL); + return g_timeout_add_full (G_PRIORITY_DEFAULT, + interval, function, data, NULL); } /* Idle functions */ @@ -936,5 +937,5 @@ guint g_idle_add (GSourceFunc function, gpointer data) { - return g_idle_add_full (0, function, data, NULL); + return g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, function, data, NULL); } -- 2.34.1