* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+/*
+ * MT safe
+ */
+
#include "glib.h"
hook_size,
hook_size * G_HOOKS_PREALLOC,
G_ALLOC_AND_FREE);
+ hook_list->hook_free = NULL;
+ hook_list->hook_destroy = NULL;
}
void
else
do
{
- register GHook *tmp;
+ GHook *tmp;
g_hook_ref (hook_list, hook);
g_hook_destroy_link (hook_list, hook);
hook->data = NULL;
hook->next = NULL;
hook->prev = NULL;
- hook->flags = G_HOOK_ACTIVE;
+ hook->flags = G_HOOK_FLAG_ACTIVE;
hook->ref_count = 0;
- hook->id = 0;
+ hook->hook_id = 0;
hook->func = NULL;
hook->destroy = NULL;
g_return_if_fail (hook_list->is_setup);
g_return_if_fail (hook != NULL);
g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
+
+ if (hook_list->hook_free)
+ hook_list->hook_free (hook_list, hook);
g_chunk_free (hook, hook_list->hook_memchunk);
}
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook != NULL);
- if (hook->id)
+ if (hook->hook_id)
{
- hook->id = 0;
- hook->flags &= ~G_HOOK_ACTIVE;
- if (hook->destroy)
+ hook->hook_id = 0;
+ hook->flags &= ~G_HOOK_FLAG_ACTIVE;
+ if (hook_list->hook_destroy)
+ {
+ hook_list->hook_destroy (hook_list, hook);
+ hook->destroy = NULL;
+ }
+ else if (hook->destroy)
{
- register GDestroyNotify destroy;
+ GDestroyNotify destroy;
destroy = hook->destroy;
hook->destroy = NULL;
gboolean
g_hook_destroy (GHookList *hook_list,
- guint id)
+ guint hook_id)
{
GHook *hook;
g_return_val_if_fail (hook_list != NULL, FALSE);
- g_return_val_if_fail (id > 0, FALSE);
+ g_return_val_if_fail (hook_id > 0, FALSE);
- hook = g_hook_get (hook_list, id);
+ hook = g_hook_get (hook_list, hook_id);
if (hook)
{
g_hook_destroy_link (hook_list, hook);
hook->ref_count--;
if (!hook->ref_count)
{
- g_return_if_fail (hook->id == 0);
- g_return_if_fail (!G_HOOK_IS_IN_CALL (hook));
+ g_return_if_fail (hook->hook_id == 0);
+ g_return_if_fail (!G_HOOK_IN_CALL (hook));
if (hook->prev)
hook->prev->next = hook->next;
}
hook->prev = NULL;
- g_chunk_free (hook, hook_list->hook_memchunk);
+ g_hook_free (hook_list, hook);
if (!hook_list->hooks &&
!hook_list->is_setup)
g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
g_return_if_fail (hook->func != NULL);
- hook->id = hook_list->seq_id++;
+ hook->hook_id = hook_list->seq_id++;
hook->ref_count = 1; /* counterpart to g_hook_destroy_link */
if (sibling)
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup);
-
- hook = g_hook_first_valid (hook_list);
+
+ hook = g_hook_first_valid (hook_list, may_recurse);
while (hook)
{
- register GHook *tmp;
- register GHookFunc func;
+ GHookFunc func;
gboolean was_in_call;
- g_hook_ref (hook_list, hook);
- func = hook->func;
+ func = (GHookFunc) hook->func;
- was_in_call = G_HOOK_IS_IN_CALL (hook);
- hook->flags |= G_HOOK_IN_CALL;
+ was_in_call = G_HOOK_IN_CALL (hook);
+ hook->flags |= G_HOOK_FLAG_IN_CALL;
func (hook->data);
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);
- else
- do
- tmp = g_hook_next_valid (hook);
- while (tmp && G_HOOK_IS_IN_CALL (tmp));
-
- g_hook_unref (hook_list, hook);
- hook = tmp;
+ hook = g_hook_next_valid (hook_list, hook, may_recurse);
}
}
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup);
- hook = g_hook_first_valid (hook_list);
+ hook = g_hook_first_valid (hook_list, may_recurse);
while (hook)
{
- register GHook *tmp;
- register GHookCheckFunc func;
+ GHookCheckFunc func;
gboolean was_in_call;
- register gboolean need_destroy;
+ gboolean need_destroy;
- g_hook_ref (hook_list, hook);
- func = hook->func;
+ func = (GHookCheckFunc) hook->func;
- was_in_call = G_HOOK_IS_IN_CALL (hook);
- hook->flags |= G_HOOK_IN_CALL;
+ was_in_call = G_HOOK_IN_CALL (hook);
+ hook->flags |= G_HOOK_FLAG_IN_CALL;
need_destroy = !func (hook->data);
if (!was_in_call)
- hook->flags &= ~G_HOOK_IN_CALL;
+ hook->flags &= ~G_HOOK_FLAG_IN_CALL;
if (need_destroy)
g_hook_destroy_link (hook_list, hook);
- if (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);
- hook = tmp;
+ hook = g_hook_next_valid (hook_list, hook, may_recurse);
}
}
void
-g_hook_list_marshall (GHookList *hook_list,
- gboolean may_recurse,
- GHookMarshaller marshaller,
- gpointer data)
+g_hook_list_marshal_check (GHookList *hook_list,
+ gboolean may_recurse,
+ GHookCheckMarshaller marshaller,
+ gpointer data)
{
GHook *hook;
g_return_if_fail (hook_list->is_setup);
g_return_if_fail (marshaller != NULL);
- hook = g_hook_first_valid (hook_list);
+ hook = g_hook_first_valid (hook_list, may_recurse);
while (hook)
{
- register GHook *tmp;
gboolean was_in_call;
+ gboolean need_destroy;
- g_hook_ref (hook_list, hook);
+ was_in_call = G_HOOK_IN_CALL (hook);
+ hook->flags |= G_HOOK_FLAG_IN_CALL;
+ need_destroy = !marshaller (hook, data);
+ if (!was_in_call)
+ hook->flags &= ~G_HOOK_FLAG_IN_CALL;
+ if (need_destroy)
+ g_hook_destroy_link (hook_list, hook);
+
+ hook = g_hook_next_valid (hook_list, hook, may_recurse);
+ }
+}
+
+void
+g_hook_list_marshal (GHookList *hook_list,
+ gboolean may_recurse,
+ GHookMarshaller marshaller,
+ gpointer data)
+{
+ GHook *hook;
+
+ g_return_if_fail (hook_list != NULL);
+ g_return_if_fail (hook_list->is_setup);
+ g_return_if_fail (marshaller != NULL);
+
+ hook = g_hook_first_valid (hook_list, may_recurse);
+ while (hook)
+ {
+ gboolean was_in_call;
- was_in_call = G_HOOK_IS_IN_CALL (hook);
- hook->flags |= G_HOOK_IN_CALL;
+ was_in_call = G_HOOK_IN_CALL (hook);
+ hook->flags |= G_HOOK_FLAG_IN_CALL;
marshaller (hook, data);
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);
- else
- do
- tmp = g_hook_next_valid (hook);
- while (tmp && G_HOOK_IS_IN_CALL (tmp));
-
- g_hook_unref (hook_list, hook);
- hook = tmp;
+ hook = g_hook_next_valid (hook_list, hook, may_recurse);
}
}
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);
hook = hook_list->hooks;
if (hook)
{
- if (G_HOOK_IS_VALID (hook))
+ g_hook_ref (hook_list, hook);
+ if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook)))
return hook;
else
- return g_hook_next_valid (hook);
+ return g_hook_next_valid (hook_list, hook, may_be_in_call);
}
}
}
GHook*
-g_hook_next_valid (GHook *hook)
+g_hook_next_valid (GHookList *hook_list,
+ GHook *hook,
+ gboolean may_be_in_call)
{
+ GHook *ohook = hook;
+
+ g_return_val_if_fail (hook_list != NULL, NULL);
+
if (!hook)
return NULL;
hook = hook->next;
while (hook)
{
- if (G_HOOK_IS_VALID (hook))
- return hook;
+ if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook)))
+ {
+ g_hook_ref (hook_list, hook);
+ g_hook_unref (hook_list, ohook);
+
+ return hook;
+ }
hook = hook->next;
}
-
+ g_hook_unref (hook_list, ohook);
+
return NULL;
}
GHook*
g_hook_get (GHookList *hook_list,
- guint id)
+ guint hook_id)
{
GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL);
- g_return_val_if_fail (id > 0, NULL);
+ g_return_val_if_fail (hook_id > 0, NULL);
hook = hook_list->hooks;
while (hook)
{
- if (hook->id == id)
+ if (hook->hook_id == hook_id)
return hook;
hook = hook->next;
}
g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL);
- hook = g_hook_first_valid (hook_list);
+ hook = hook_list->hooks;
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);
- if (func (hook, data) && 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);
return hook;
}
- tmp = g_hook_next_valid (hook);
+
+ tmp = hook->next;
g_hook_unref (hook_list, hook);
hook = tmp;
}
gboolean need_valids,
gpointer data)
{
- register GHook *hook;
+ GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL);
- hook = g_hook_first_valid (hook_list);
+ hook = hook_list->hooks;
while (hook)
{
- if (hook->data == data && 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;
-
- hook = g_hook_next_valid (hook);
+
+ hook = hook->next;
}
return NULL;
gboolean need_valids,
gpointer func)
{
- register GHook *hook;
+ GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL);
- hook = g_hook_first_valid (hook_list);
+ hook = hook_list->hooks;
while (hook)
{
- if (hook->func == func && 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;
-
- hook = g_hook_next_valid (hook);
+
+ hook = hook->next;
}
return NULL;
gpointer func,
gpointer data)
{
- register GHook *hook;
+ GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL);
- hook = g_hook_first_valid (hook_list);
+ hook = hook_list->hooks;
while (hook)
{
- if (hook->data == data && hook->func == func && 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;
-
- hook = g_hook_next_valid (hook);
+
+ hook = hook->next;
}
return NULL;
g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
g_return_if_fail (hook->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)
{
- register GHook *tmp;
+ GHook *tmp;
g_hook_ref (hook_list, sibling);
- if (func (hook, sibling) <= 0 && sibling->id)
+ if (func (hook, sibling) <= 0 && sibling->hook_id)
{
g_hook_unref (hook_list, sibling);
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);
sibling = tmp;
}
g_hook_compare_ids (GHook *new_hook,
GHook *sibling)
{
- return ((glong) new_hook->id) - ((glong) sibling->id);
+ return ((glong) new_hook->hook_id) - ((glong) sibling->hook_id);
}
projects / platform / upstream / glib.git / blobdiff