luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 20:35:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed the #pragma } statement after extern "C" {. use (c-set-offset

Browse Source 
Wed Oct  7 05:31:24 1998  Tim Janik  <timj@gtk.org>

        * glib.h:
        removed the #pragma } statement after extern "C" {. use
        (c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.

        * glib.h:
        * ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
        G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
        changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
        G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
        fixed the g_hook_find* functions, so they iterate over non-active
        hooks as well.
        (g_hook_first_valid):
        (g_hook_next_valid): added an extra argument gboolean may_be_in_call,
        which indicates whether G_HOOK_IN_CALL() hooks are considered valid
        or not. these two functions are meant as iterators for the hook list
        invocation, so they need to a) provide functionality to implement
        may_recurse bahaviour and b) only walk active hooks.
This commit is contained in:
Tim Janik 1998-10-07 04:19:14 +00:00 committed by Tim Janik
parent 823a25beb6
commit 43cc1dbf96
12 changed files with 350 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-0
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-10
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-12
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-2
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-4
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-6
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

20
ChangeLog.pre-2-8
View File

@ -1,3 +1,23 @@
Wed Oct 7 05:31:24 1998 Tim Janik <timj@gtk.org>
* glib.h:
removed the #pragma } statement after extern "C" {. use
(c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.
* glib.h:
* ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
fixed the g_hook_find* functions, so they iterate over non-active
hooks as well.
(g_hook_first_valid):
(g_hook_next_valid): added an extra argument gboolean may_be_in_call,
which indicates whether G_HOOK_IN_CALL() hooks are considered valid
or not. these two functions are meant as iterators for the hook list
invocation, so they need to a) provide functionality to implement
may_recurse bahaviour and b) only walk active hooks.
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org> Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is

166
ghook.c
View File

@ -64,7 +64,7 @@ g_hook_list_clear (GHookList *hook_list)
else else
do do
{ {
register GHook *tmp; GHook *tmp;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
g_hook_destroy_link (hook_list, hook); g_hook_destroy_link (hook_list, hook);
@ -88,7 +88,7 @@ g_hook_alloc (GHookList *hook_list)
hook->data = NULL; hook->data = NULL;
hook->next = NULL; hook->next = NULL;
hook->prev = NULL; hook->prev = NULL;
hook->flags = G_HOOK_ACTIVE; hook->flags = G_HOOK_FLAG_ACTIVE;
hook->ref_count = 0; hook->ref_count = 0;
hook->hook_id = 0; hook->hook_id = 0;
hook->func = NULL; hook->func = NULL;
@ -119,10 +119,10 @@ g_hook_destroy_link (GHookList *hook_list,
if (hook->hook_id) if (hook->hook_id)
{ {
hook->hook_id = 0; hook->hook_id = 0;
hook->flags &= ~G_HOOK_ACTIVE; hook->flags &= ~G_HOOK_FLAG_ACTIVE;
if (hook->destroy) if (hook->destroy)
{ {
register GDestroyNotify destroy; GDestroyNotify destroy;
destroy = hook->destroy; destroy = hook->destroy;
hook->destroy = NULL; hook->destroy = NULL;
@ -163,7 +163,7 @@ g_hook_unref (GHookList *hook_list,
if (!hook->ref_count) if (!hook->ref_count)
{ {
g_return_if_fail (hook->hook_id == 0); g_return_if_fail (hook->hook_id == 0);
g_return_if_fail (!G_HOOK_IS_IN_CALL (hook)); g_return_if_fail (!G_HOOK_IN_CALL (hook));
if (hook->prev) if (hook->prev)
hook->prev->next = hook->next; hook->prev->next = hook->next;
@ -261,33 +261,23 @@ g_hook_list_invoke (GHookList *hook_list,
g_return_if_fail (hook_list != NULL); g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup); g_return_if_fail (hook_list->is_setup);
if (may_recurse) hook = g_hook_first_valid (hook_list, may_recurse);
hook = g_hook_first_valid (hook_list);
else
do
hook = g_hook_first_valid (hook_list);
while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
register GHookFunc func; GHookFunc func;
gboolean was_in_call; gboolean was_in_call;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
func = hook->func; func = hook->func;
was_in_call = G_HOOK_IS_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;
func (hook->data); func (hook->data);
if (!was_in_call) if (!was_in_call)
hook->flags &= ~G_HOOK_IN_CALL; hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (may_recurse) tmp = g_hook_next_valid (hook, may_recurse);
tmp = g_hook_next_valid (hook);
else
do
tmp = g_hook_next_valid (hook);
while (tmp && G_HOOK_IS_IN_CALL (tmp));
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
@ -303,36 +293,26 @@ g_hook_list_invoke_check (GHookList *hook_list,
g_return_if_fail (hook_list != NULL); g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup); g_return_if_fail (hook_list->is_setup);
if (may_recurse) hook = g_hook_first_valid (hook_list, may_recurse);
hook = g_hook_first_valid (hook_list);
else
do
hook = g_hook_first_valid (hook_list);
while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
register GHookCheckFunc func; GHookCheckFunc func;
gboolean was_in_call; gboolean was_in_call;
register gboolean need_destroy; gboolean need_destroy;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
func = hook->func; func = hook->func;
was_in_call = G_HOOK_IS_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;
need_destroy = !func (hook->data); need_destroy = !func (hook->data);
if (!was_in_call) if (!was_in_call)
hook->flags &= ~G_HOOK_IN_CALL; hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (need_destroy) if (need_destroy)
g_hook_destroy_link (hook_list, hook); g_hook_destroy_link (hook_list, hook);
if (may_recurse) tmp = g_hook_next_valid (hook, may_recurse);
tmp = g_hook_next_valid (hook);
else
do
tmp = g_hook_next_valid (hook);
while (tmp && G_HOOK_IS_IN_CALL (tmp));
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
@ -351,31 +331,21 @@ g_hook_list_marshal (GHookList *hook_list,
g_return_if_fail (hook_list->is_setup); g_return_if_fail (hook_list->is_setup);
g_return_if_fail (marshaller != NULL); g_return_if_fail (marshaller != NULL);
if (may_recurse) hook = g_hook_first_valid (hook_list, may_recurse);
hook = g_hook_first_valid (hook_list);
else
do
hook = g_hook_first_valid (hook_list);
while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
gboolean was_in_call; gboolean was_in_call;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
was_in_call = G_HOOK_IS_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;
marshaller (hook, data); marshaller (hook, data);
if (!was_in_call) if (!was_in_call)
hook->flags &= ~G_HOOK_IN_CALL; hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (may_recurse) tmp = g_hook_next_valid (hook, may_recurse);
tmp = g_hook_next_valid (hook);
else
do
tmp = g_hook_next_valid (hook);
while (tmp && G_HOOK_IS_IN_CALL (tmp));
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
@ -383,7 +353,8 @@ g_hook_list_marshal (GHookList *hook_list,
} }
GHook* GHook*
g_hook_first_valid (GHookList *hook_list) g_hook_first_valid (GHookList *hook_list,
gboolean may_be_in_call)
{ {
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
@ -394,10 +365,10 @@ g_hook_first_valid (GHookList *hook_list)
hook = hook_list->hooks; hook = hook_list->hooks;
if (hook) if (hook)
{ {
if (G_HOOK_IS_VALID (hook)) if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook)))
return hook; return hook;
else else
return g_hook_next_valid (hook); return g_hook_next_valid (hook, may_be_in_call);
} }
} }
@ -405,7 +376,8 @@ g_hook_first_valid (GHookList *hook_list)
} }
GHook* GHook*
g_hook_next_valid (GHook *hook) g_hook_next_valid (GHook *hook,
gboolean may_be_in_call)
{ {
if (!hook) if (!hook)
return NULL; return NULL;
@ -413,7 +385,7 @@ g_hook_next_valid (GHook *hook)
hook = hook->next; hook = hook->next;
while (hook) while (hook)
{ {
if (G_HOOK_IS_VALID (hook)) if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook)))
return hook; return hook;
hook = hook->next; hook = hook->next;
} }
@ -452,20 +424,28 @@ g_hook_find (GHookList *hook_list,
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL); g_return_val_if_fail (func != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
/* test only non-destroyed hooks */
if (!hook->hook_id)
{
hook = hook->next;
continue;
}
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
if (func (hook, data) && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) if (func (hook, data) && hook->hook_id && (!need_valids || G_HOOK_ACTIVE (hook)))
{ {
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
return hook; return hook;
} }
tmp = g_hook_next_valid (hook);
tmp = hook->next;
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
} }
@ -478,17 +458,20 @@ g_hook_find_data (GHookList *hook_list,
gboolean need_valids, gboolean need_valids,
gpointer data) gpointer data)
{ {
register GHook *hook; GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
if (hook->data == data && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) /* test only non-destroyed hooks */
if (hook->data == data &&
hook->hook_id &&
(!need_valids || G_HOOK_ACTIVE (hook)))
return hook; return hook;
hook = g_hook_next_valid (hook); hook = hook->next;
} }
return NULL; return NULL;
@ -499,18 +482,21 @@ g_hook_find_func (GHookList *hook_list,
gboolean need_valids, gboolean need_valids,
gpointer func) gpointer func)
{ {
register GHook *hook; GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL); g_return_val_if_fail (func != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
if (hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) /* test only non-destroyed hooks */
if (hook->func == func &&
hook->hook_id &&
(!need_valids || G_HOOK_ACTIVE (hook)))
return hook; return hook;
hook = g_hook_next_valid (hook); hook = hook->next;
} }
return NULL; return NULL;
@ -522,18 +508,22 @@ g_hook_find_func_data (GHookList *hook_list,
gpointer func, gpointer func,
gpointer data) gpointer data)
{ {
register GHook *hook; GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL); g_return_val_if_fail (func != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
if (hook->data == data && hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) /* test only non-destroyed hooks */
if (hook->data == data &&
hook->func == func &&
hook->hook_id &&
(!need_valids || G_HOOK_ACTIVE (hook)))
return hook; return hook;
hook = g_hook_next_valid (hook); hook = hook->next;
} }
return NULL; return NULL;
@ -552,12 +542,15 @@ g_hook_insert_sorted (GHookList *hook_list,
g_return_if_fail (G_HOOK_IS_UNLINKED (hook)); g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
g_return_if_fail (hook->func != NULL); g_return_if_fail (hook->func != NULL);
g_return_if_fail (func != NULL); g_return_if_fail (func != NULL);
sibling = g_hook_first_valid (hook_list); /* first non-destroyed hook */
sibling = hook_list->hooks;
while (sibling && !sibling->hook_id)
sibling = sibling->next;
while (sibling) while (sibling)
{ {
register GHook *tmp; GHook *tmp;
g_hook_ref (hook_list, sibling); g_hook_ref (hook_list, sibling);
if (func (hook, sibling) <= 0 && sibling->hook_id) if (func (hook, sibling) <= 0 && sibling->hook_id)
@ -565,7 +558,12 @@ g_hook_insert_sorted (GHookList *hook_list,
g_hook_unref (hook_list, sibling); g_hook_unref (hook_list, sibling);
break; break;
} }
tmp = g_hook_next_valid (sibling);
/* next non-destroyed hook */
tmp = sibling->next;
while (tmp && !tmp->hook_id)
tmp = tmp->next;
g_hook_unref (hook_list, sibling); g_hook_unref (hook_list, sibling);
sibling = tmp; sibling = tmp;
} }

28
glib.h
View File

@ -85,14 +85,8 @@
#endif /* HAVE_VALUES_H */ #endif /* HAVE_VALUES_H */
/* the #pragma } statment is used to fix up emacs' c-mode which gets
* confused by extern "C" {. the ansi standard says that compilers
* have to ignore #pragma directives that they don't know about,
* so we should be save in using this.
*/
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#pragma }
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -1010,8 +1004,8 @@ GNode* g_node_last_sibling (GNode *node);
#define G_HOOK_FLAG_USER_SHIFT (4) #define G_HOOK_FLAG_USER_SHIFT (4)
typedef enum typedef enum
{ {
G_HOOK_ACTIVE = 1 << 0, G_HOOK_FLAG_ACTIVE = 1 << 0,
G_HOOK_IN_CALL = 1 << 1, G_HOOK_FLAG_IN_CALL = 1 << 1,
G_HOOK_FLAG_MASK = 0x0f G_HOOK_FLAG_MASK = 0x0f
} GHookFlagMask; } GHookFlagMask;
@ -1036,12 +1030,12 @@ struct _GHook
GDestroyNotify destroy; GDestroyNotify destroy;
}; };
#define G_HOOK_IS_ACTIVE(hook) ((((GHook*) hook)->flags & \ #define G_HOOK_ACTIVE(hook) ((((GHook*) hook)->flags & \
G_HOOK_ACTIVE) != 0) G_HOOK_FLAG_ACTIVE) != 0)
#define G_HOOK_IS_IN_CALL(hook) ((((GHook*) hook)->flags & \ #define G_HOOK_IN_CALL(hook) ((((GHook*) hook)->flags & \
G_HOOK_IN_CALL) != 0) G_HOOK_FLAG_IN_CALL) != 0)
#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \ #define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \
G_HOOK_IS_ACTIVE (hook)) G_HOOK_ACTIVE (hook))
#define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \ #define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \
((GHook*) hook)->prev == NULL && \ ((GHook*) hook)->prev == NULL && \
((GHook*) hook)->hook_id == 0 && \ ((GHook*) hook)->hook_id == 0 && \
@ -1085,8 +1079,12 @@ GHook* g_hook_find_func_data (GHookList *hook_list,
gboolean need_valids, gboolean need_valids,
gpointer func, gpointer func,
gpointer data); gpointer data);
GHook* g_hook_first_valid (GHookList *hook_list); GHook* g_hook_first_valid (GHookList *hook_list,
GHook* g_hook_next_valid (GHook *hook); gboolean may_be_in_call);
GHook* g_hook_next_valid (GHook *hook,
gboolean may_be_in_call);
/* GHookCompareFunc implementation to insert hooks sorted by their id */
gint g_hook_compare_ids (GHook *new_hook, gint g_hook_compare_ids (GHook *new_hook,
GHook *sibling); GHook *sibling);

166
glib/ghook.c
View File

@ -64,7 +64,7 @@ g_hook_list_clear (GHookList *hook_list)
else else
do do
{ {
register GHook *tmp; GHook *tmp;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
g_hook_destroy_link (hook_list, hook); g_hook_destroy_link (hook_list, hook);
@ -88,7 +88,7 @@ g_hook_alloc (GHookList *hook_list)
hook->data = NULL; hook->data = NULL;
hook->next = NULL; hook->next = NULL;
hook->prev = NULL; hook->prev = NULL;
hook->flags = G_HOOK_ACTIVE; hook->flags = G_HOOK_FLAG_ACTIVE;
hook->ref_count = 0; hook->ref_count = 0;
hook->hook_id = 0; hook->hook_id = 0;
hook->func = NULL; hook->func = NULL;
@ -119,10 +119,10 @@ g_hook_destroy_link (GHookList *hook_list,
if (hook->hook_id) if (hook->hook_id)
{ {
hook->hook_id = 0; hook->hook_id = 0;
hook->flags &= ~G_HOOK_ACTIVE; hook->flags &= ~G_HOOK_FLAG_ACTIVE;
if (hook->destroy) if (hook->destroy)
{ {
register GDestroyNotify destroy; GDestroyNotify destroy;
destroy = hook->destroy; destroy = hook->destroy;
hook->destroy = NULL; hook->destroy = NULL;
@ -163,7 +163,7 @@ g_hook_unref (GHookList *hook_list,
if (!hook->ref_count) if (!hook->ref_count)
{ {
g_return_if_fail (hook->hook_id == 0); g_return_if_fail (hook->hook_id == 0);
g_return_if_fail (!G_HOOK_IS_IN_CALL (hook)); g_return_if_fail (!G_HOOK_IN_CALL (hook));
if (hook->prev) if (hook->prev)
hook->prev->next = hook->next; hook->prev->next = hook->next;
@ -261,33 +261,23 @@ g_hook_list_invoke (GHookList *hook_list,
g_return_if_fail (hook_list != NULL); g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup); g_return_if_fail (hook_list->is_setup);
if (may_recurse) hook = g_hook_first_valid (hook_list, may_recurse);
hook = g_hook_first_valid (hook_list);
else
do
hook = g_hook_first_valid (hook_list);
while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
register GHookFunc func; GHookFunc func;
gboolean was_in_call; gboolean was_in_call;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
func = hook->func; func = hook->func;
was_in_call = G_HOOK_IS_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;
func (hook->data); func (hook->data);
if (!was_in_call) if (!was_in_call)
hook->flags &= ~G_HOOK_IN_CALL; hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (may_recurse) tmp = g_hook_next_valid (hook, may_recurse);
tmp = g_hook_next_valid (hook);
else
do
tmp = g_hook_next_valid (hook);
while (tmp && G_HOOK_IS_IN_CALL (tmp));
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
@ -303,36 +293,26 @@ g_hook_list_invoke_check (GHookList *hook_list,
g_return_if_fail (hook_list != NULL); g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup); g_return_if_fail (hook_list->is_setup);
if (may_recurse) hook = g_hook_first_valid (hook_list, may_recurse);
hook = g_hook_first_valid (hook_list);
else
do
hook = g_hook_first_valid (hook_list);
while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
register GHookCheckFunc func; GHookCheckFunc func;
gboolean was_in_call; gboolean was_in_call;
register gboolean need_destroy; gboolean need_destroy;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
func = hook->func; func = hook->func;
was_in_call = G_HOOK_IS_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;
need_destroy = !func (hook->data); need_destroy = !func (hook->data);
if (!was_in_call) if (!was_in_call)
hook->flags &= ~G_HOOK_IN_CALL; hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (need_destroy) if (need_destroy)
g_hook_destroy_link (hook_list, hook); g_hook_destroy_link (hook_list, hook);
if (may_recurse) tmp = g_hook_next_valid (hook, may_recurse);
tmp = g_hook_next_valid (hook);
else
do
tmp = g_hook_next_valid (hook);
while (tmp && G_HOOK_IS_IN_CALL (tmp));
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
@ -351,31 +331,21 @@ g_hook_list_marshal (GHookList *hook_list,
g_return_if_fail (hook_list->is_setup); g_return_if_fail (hook_list->is_setup);
g_return_if_fail (marshaller != NULL); g_return_if_fail (marshaller != NULL);
if (may_recurse) hook = g_hook_first_valid (hook_list, may_recurse);
hook = g_hook_first_valid (hook_list);
else
do
hook = g_hook_first_valid (hook_list);
while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
gboolean was_in_call; gboolean was_in_call;
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
was_in_call = G_HOOK_IS_IN_CALL (hook); was_in_call = G_HOOK_IN_CALL (hook);
hook->flags |= G_HOOK_IN_CALL; hook->flags |= G_HOOK_FLAG_IN_CALL;
marshaller (hook, data); marshaller (hook, data);
if (!was_in_call) if (!was_in_call)
hook->flags &= ~G_HOOK_IN_CALL; hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (may_recurse) tmp = g_hook_next_valid (hook, may_recurse);
tmp = g_hook_next_valid (hook);
else
do
tmp = g_hook_next_valid (hook);
while (tmp && G_HOOK_IS_IN_CALL (tmp));
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
@ -383,7 +353,8 @@ g_hook_list_marshal (GHookList *hook_list,
} }
GHook* GHook*
g_hook_first_valid (GHookList *hook_list) g_hook_first_valid (GHookList *hook_list,
gboolean may_be_in_call)
{ {
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
@ -394,10 +365,10 @@ g_hook_first_valid (GHookList *hook_list)
hook = hook_list->hooks; hook = hook_list->hooks;
if (hook) if (hook)
{ {
if (G_HOOK_IS_VALID (hook)) if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook)))
return hook; return hook;
else else
return g_hook_next_valid (hook); return g_hook_next_valid (hook, may_be_in_call);
} }
} }
@ -405,7 +376,8 @@ g_hook_first_valid (GHookList *hook_list)
} }
GHook* GHook*
g_hook_next_valid (GHook *hook) g_hook_next_valid (GHook *hook,
gboolean may_be_in_call)
{ {
if (!hook) if (!hook)
return NULL; return NULL;
@ -413,7 +385,7 @@ g_hook_next_valid (GHook *hook)
hook = hook->next; hook = hook->next;
while (hook) while (hook)
{ {
if (G_HOOK_IS_VALID (hook)) if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook)))
return hook; return hook;
hook = hook->next; hook = hook->next;
} }
@ -452,20 +424,28 @@ g_hook_find (GHookList *hook_list,
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL); g_return_val_if_fail (func != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
register GHook *tmp; GHook *tmp;
/* test only non-destroyed hooks */
if (!hook->hook_id)
{
hook = hook->next;
continue;
}
g_hook_ref (hook_list, hook); g_hook_ref (hook_list, hook);
if (func (hook, data) && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) if (func (hook, data) && hook->hook_id && (!need_valids || G_HOOK_ACTIVE (hook)))
{ {
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
return hook; return hook;
} }
tmp = g_hook_next_valid (hook);
tmp = hook->next;
g_hook_unref (hook_list, hook); g_hook_unref (hook_list, hook);
hook = tmp; hook = tmp;
} }
@ -478,17 +458,20 @@ g_hook_find_data (GHookList *hook_list,
gboolean need_valids, gboolean need_valids,
gpointer data) gpointer data)
{ {
register GHook *hook; GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
if (hook->data == data && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) /* test only non-destroyed hooks */
if (hook->data == data &&
hook->hook_id &&
(!need_valids || G_HOOK_ACTIVE (hook)))
return hook; return hook;
hook = g_hook_next_valid (hook); hook = hook->next;
} }
return NULL; return NULL;
@ -499,18 +482,21 @@ g_hook_find_func (GHookList *hook_list,
gboolean need_valids, gboolean need_valids,
gpointer func) gpointer func)
{ {
register GHook *hook; GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL); g_return_val_if_fail (func != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
if (hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) /* test only non-destroyed hooks */
if (hook->func == func &&
hook->hook_id &&
(!need_valids || G_HOOK_ACTIVE (hook)))
return hook; return hook;
hook = g_hook_next_valid (hook); hook = hook->next;
} }
return NULL; return NULL;
@ -522,18 +508,22 @@ g_hook_find_func_data (GHookList *hook_list,
gpointer func, gpointer func,
gpointer data) gpointer data)
{ {
register GHook *hook; GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL); g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL); g_return_val_if_fail (func != NULL, NULL);
hook = g_hook_first_valid (hook_list); hook = hook_list->hooks;
while (hook) while (hook)
{ {
if (hook->data == data && hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook))) /* test only non-destroyed hooks */
if (hook->data == data &&
hook->func == func &&
hook->hook_id &&
(!need_valids || G_HOOK_ACTIVE (hook)))
return hook; return hook;
hook = g_hook_next_valid (hook); hook = hook->next;
} }
return NULL; return NULL;
@ -552,12 +542,15 @@ g_hook_insert_sorted (GHookList *hook_list,
g_return_if_fail (G_HOOK_IS_UNLINKED (hook)); g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
g_return_if_fail (hook->func != NULL); g_return_if_fail (hook->func != NULL);
g_return_if_fail (func != NULL); g_return_if_fail (func != NULL);
sibling = g_hook_first_valid (hook_list); /* first non-destroyed hook */
sibling = hook_list->hooks;
while (sibling && !sibling->hook_id)
sibling = sibling->next;
while (sibling) while (sibling)
{ {
register GHook *tmp; GHook *tmp;
g_hook_ref (hook_list, sibling); g_hook_ref (hook_list, sibling);
if (func (hook, sibling) <= 0 && sibling->hook_id) if (func (hook, sibling) <= 0 && sibling->hook_id)
@ -565,7 +558,12 @@ g_hook_insert_sorted (GHookList *hook_list,
g_hook_unref (hook_list, sibling); g_hook_unref (hook_list, sibling);
break; break;
} }
tmp = g_hook_next_valid (sibling);
/* next non-destroyed hook */
tmp = sibling->next;
while (tmp && !tmp->hook_id)
tmp = tmp->next;
g_hook_unref (hook_list, sibling); g_hook_unref (hook_list, sibling);
sibling = tmp; sibling = tmp;
} }

28
glib/glib.h
View File

@ -85,14 +85,8 @@
#endif /* HAVE_VALUES_H */ #endif /* HAVE_VALUES_H */
/* the #pragma } statment is used to fix up emacs' c-mode which gets
* confused by extern "C" {. the ansi standard says that compilers
* have to ignore #pragma directives that they don't know about,
* so we should be save in using this.
*/
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#pragma }
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -1010,8 +1004,8 @@ GNode* g_node_last_sibling (GNode *node);
#define G_HOOK_FLAG_USER_SHIFT (4) #define G_HOOK_FLAG_USER_SHIFT (4)
typedef enum typedef enum
{ {
G_HOOK_ACTIVE = 1 << 0, G_HOOK_FLAG_ACTIVE = 1 << 0,
G_HOOK_IN_CALL = 1 << 1, G_HOOK_FLAG_IN_CALL = 1 << 1,
G_HOOK_FLAG_MASK = 0x0f G_HOOK_FLAG_MASK = 0x0f
} GHookFlagMask; } GHookFlagMask;
@ -1036,12 +1030,12 @@ struct _GHook
GDestroyNotify destroy; GDestroyNotify destroy;
}; };
#define G_HOOK_IS_ACTIVE(hook) ((((GHook*) hook)->flags & \ #define G_HOOK_ACTIVE(hook) ((((GHook*) hook)->flags & \
G_HOOK_ACTIVE) != 0) G_HOOK_FLAG_ACTIVE) != 0)
#define G_HOOK_IS_IN_CALL(hook) ((((GHook*) hook)->flags & \ #define G_HOOK_IN_CALL(hook) ((((GHook*) hook)->flags & \
G_HOOK_IN_CALL) != 0) G_HOOK_FLAG_IN_CALL) != 0)
#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \ #define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \
G_HOOK_IS_ACTIVE (hook)) G_HOOK_ACTIVE (hook))
#define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \ #define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \
((GHook*) hook)->prev == NULL && \ ((GHook*) hook)->prev == NULL && \
((GHook*) hook)->hook_id == 0 && \ ((GHook*) hook)->hook_id == 0 && \
@ -1085,8 +1079,12 @@ GHook* g_hook_find_func_data (GHookList *hook_list,
gboolean need_valids, gboolean need_valids,
gpointer func, gpointer func,
gpointer data); gpointer data);
GHook* g_hook_first_valid (GHookList *hook_list); GHook* g_hook_first_valid (GHookList *hook_list,
GHook* g_hook_next_valid (GHook *hook); gboolean may_be_in_call);
GHook* g_hook_next_valid (GHook *hook,
gboolean may_be_in_call);
/* GHookCompareFunc implementation to insert hooks sorted by their id */
gint g_hook_compare_ids (GHook *new_hook, gint g_hook_compare_ids (GHook *new_hook,
GHook *sibling); GHook *sibling);