#include <config.h>
#include "gsignal.h"
+
#include "gbsearcharray.h"
#include "gvaluecollector.h"
#include "gvaluetypes.h"
#include "gboxed.h"
+#include "gobject.h"
+#include "genums.h"
+
+#include "gobjectalias.h"
+
#include <string.h>
#include <signal.h>
/* pre allocation configurations
*/
#define MAX_STACK_VALUES (16)
-#define HANDLER_PRE_ALLOC (48)
-#define REPORT_BUG "please report occourance circumstances to gtk-devel-list@gnome.org"
+#define REPORT_BUG "please report occurrence circumstances to gtk-devel-list@gnome.org"
#ifdef G_ENABLE_DEBUG
#define IF_DEBUG(debug_type, cond) if ((_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) || cond)
static volatile gpointer g_trace_instance_signals = NULL;
#endif /* G_ENABLE_DEBUG */
-/* --- generic allocation --- */
-/* we special case allocations generically by replacing
- * these functions with more speed/memory aware variants
- */
-#ifndef DISABLE_MEM_POOLS
-static inline gpointer
-g_generic_node_alloc (GTrashStack **trash_stack_p,
- guint sizeof_node,
- guint nodes_pre_alloc)
-{
- gpointer node = g_trash_stack_pop (trash_stack_p);
-
- if (!node)
- {
- guint8 *block;
-
- nodes_pre_alloc = MAX (nodes_pre_alloc, 1);
- block = g_malloc (sizeof_node * nodes_pre_alloc);
- while (--nodes_pre_alloc)
- {
- g_trash_stack_push (trash_stack_p, block);
- block += sizeof_node;
- }
- node = block;
- }
-
- return node;
-}
-#define g_generic_node_free(trash_stack_p, node) g_trash_stack_push (trash_stack_p, node)
-#else /* !DISABLE_MEM_POOLS */
-#define g_generic_node_alloc(t,sizeof_node,p) g_malloc (sizeof_node)
-#define g_generic_node_free(t,node) g_free (node)
-#endif /* !DISABLE_MEM_POOLS */
-
-
/* --- typedefs --- */
typedef struct _SignalNode SignalNode;
typedef struct _SignalKey SignalKey;
/* permanent portion */
guint signal_id;
GType itype;
- gchar *name;
+ const gchar *name;
guint destroyed : 1;
/* reinitializable portion */
+ guint test_class_offset : 12;
guint flags : 8;
guint n_params : 8;
GType *param_types; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
GSignalCMarshaller c_marshaller;
GHookList *emission_hooks;
};
+#define MAX_TEST_CLASS_OFFSET (4096) /* 2^12, 12 bits for test_class_offset */
+#define TEST_CLASS_MAGIC (1) /* indicates NULL class closure, candidate for NOP optimization */
struct _SignalKey
{
{
guint signal_id;
Handler *handlers;
+ Handler *tail_before; /* normal signal handlers are appended here */
+ Handler *tail_after; /* CONNECT_AFTER handlers are appended here */
};
+
struct _Handler
{
gulong sequential_number;
Handler *next;
Handler *prev;
GQuark detail;
- guint ref_count : 16;
-#define HANDLER_MAX_REF_COUNT (1 << 16)
- guint block_count : 12;
-#define HANDLER_MAX_BLOCK_COUNT (1 << 12)
+ guint ref_count;
+ guint block_count : 16;
+#define HANDLER_MAX_BLOCK_COUNT (1 << 16)
guint after : 1;
GClosure *closure;
};
{
Handler *handler;
HandlerMatch *next;
- union {
- guint signal_id;
- gpointer dummy;
- } d;
+ guint signal_id;
};
typedef struct
/* --- variables --- */
static GBSearchArray *g_signal_key_bsa = NULL;
-static GBSearchConfig g_signal_key_bconfig = G_STATIC_BCONFIG (sizeof (SignalKey),
- signal_key_cmp,
- G_BSEARCH_ARRAY_ALIGN_POWER2);
-static GBSearchConfig g_signal_hlbsa_bconfig = G_STATIC_BCONFIG (sizeof (HandlerList),
- handler_lists_cmp,
- G_BSEARCH_ARRAY_DEFER_SHRINK);
-static GBSearchConfig g_class_closure_bconfig = G_STATIC_BCONFIG (sizeof (ClassClosure),
- class_closures_cmp,
- 0);
+static const GBSearchConfig g_signal_key_bconfig = {
+ sizeof (SignalKey),
+ signal_key_cmp,
+ G_BSEARCH_ARRAY_ALIGN_POWER2,
+};
+static GBSearchConfig g_signal_hlbsa_bconfig = {
+ sizeof (HandlerList),
+ handler_lists_cmp,
+ 0,
+};
+static GBSearchConfig g_class_closure_bconfig = {
+ sizeof (ClassClosure),
+ class_closures_cmp,
+ 0,
+};
static GHashTable *g_handler_list_bsa_ht = NULL;
static Emission *g_recursive_emissions = NULL;
static Emission *g_restart_emissions = NULL;
-#ifndef DISABLE_MEM_POOLS
-static GTrashStack *g_handler_ts = NULL;
-#endif
static gulong g_handler_sequential_number = 1;
G_LOCK_DEFINE_STATIC (g_signal_mutex);
#define SIGNAL_LOCK() G_LOCK (g_signal_mutex)
key.quark = quark;
- /* try looking up signals for this type and its anchestors */
+ /* try looking up signals for this type and its ancestors */
do
{
SignalKey *signal_key;
HandlerList key;
key.signal_id = signal_id;
- key.handlers = NULL;
+ key.handlers = NULL;
+ key.tail_before = NULL;
+ key.tail_after = NULL;
if (!hlbsa)
{
- hlbsa = g_bsearch_array_new (&g_signal_hlbsa_bconfig);
- hlbsa = g_bsearch_array_insert (hlbsa, &g_signal_hlbsa_bconfig, &key, FALSE);
+ hlbsa = g_bsearch_array_create (&g_signal_hlbsa_bconfig);
+ hlbsa = g_bsearch_array_insert (hlbsa, &g_signal_hlbsa_bconfig, &key);
g_hash_table_insert (g_handler_list_bsa_ht, instance, hlbsa);
}
else
{
GBSearchArray *o = hlbsa;
- hlbsa = g_bsearch_array_insert (o, &g_signal_hlbsa_bconfig, &key, FALSE);
+ hlbsa = g_bsearch_array_insert (o, &g_signal_hlbsa_bconfig, &key);
if (hlbsa != o)
g_hash_table_insert (g_handler_list_bsa_ht, instance, hlbsa);
}
{
HandlerMatch *node;
- /* yeah, we could use our own memchunk here, introducing yet more
- * rarely used cached nodes and extra allocation overhead.
- * instead, we use GList* nodes, since they are exactly the size
- * we need and are already cached. g_signal_init() asserts this.
- */
- node = (HandlerMatch*) g_list_alloc ();
+ node = g_slice_new (HandlerMatch);
node->handler = handler;
node->next = list;
- node->d.signal_id = signal_id;
+ node->signal_id = signal_id;
handler_ref (handler);
return node;
{
HandlerMatch *next = node->next;
- handler_unref_R (node->d.signal_id, instance, node->handler);
- g_list_free_1 ((GList*) node);
+ handler_unref_R (node->signal_id, instance, node->handler);
+ g_slice_free (HandlerMatch, node);
return next;
}
static inline Handler*
handler_new (gboolean after)
{
- Handler *handler = g_generic_node_alloc (&g_handler_ts,
- sizeof (Handler),
- HANDLER_PRE_ALLOC);
+ Handler *handler = g_slice_new (Handler);
#ifndef G_DISABLE_CHECKS
if (g_handler_sequential_number < 1)
g_error (G_STRLOC ": handler id overflow, %s", REPORT_BUG);
{
g_return_if_fail (handler->ref_count > 0);
-#ifndef G_DISABLE_CHECKS
- if (handler->ref_count >= HANDLER_MAX_REF_COUNT - 1)
- g_error (G_STRLOC ": handler ref_count overflow, %s", REPORT_BUG);
-#endif
-
- handler->ref_count += 1;
+ g_atomic_int_inc (&handler->ref_count);
}
static inline void
gpointer instance,
Handler *handler)
{
+ gboolean is_zero;
+
g_return_if_fail (handler->ref_count > 0);
- handler->ref_count -= 1;
- if (!handler->ref_count)
+ is_zero = g_atomic_int_dec_and_test (&handler->ref_count);
+
+ if (G_UNLIKELY (is_zero))
{
+ HandlerList *hlist = NULL;
+
if (handler->next)
handler->next->prev = handler->prev;
- if (handler->prev) /* watch out for g_signal_handlers_destroy()! */
+ if (handler->prev) /* watch out for g_signal_handlers_destroy()! */
handler->prev->next = handler->next;
else
{
- HandlerList *hlist = handler_list_lookup (signal_id, instance);
-
+ hlist = handler_list_lookup (signal_id, instance);
hlist->handlers = handler->next;
}
+
+ if (instance)
+ {
+ /* check if we are removing the handler pointed to by tail_before */
+ if (!handler->after && (!handler->next || handler->next->after))
+ {
+ if (!hlist)
+ hlist = handler_list_lookup (signal_id, instance);
+ if (hlist)
+ {
+ g_assert (hlist->tail_before == handler); /* paranoid */
+ hlist->tail_before = handler->prev;
+ }
+ }
+
+ /* check if we are removing the handler pointed to by tail_after */
+ if (!handler->next)
+ {
+ if (!hlist)
+ hlist = handler_list_lookup (signal_id, instance);
+ if (hlist)
+ {
+ g_assert (hlist->tail_after == handler); /* paranoid */
+ hlist->tail_after = handler->prev;
+ }
+ }
+ }
+
SIGNAL_UNLOCK ();
g_closure_unref (handler->closure);
SIGNAL_LOCK ();
- g_generic_node_free (&g_handler_ts, handler);
+ g_slice_free (Handler, handler);
}
}
hlist = handler_list_ensure (signal_id, instance);
if (!hlist->handlers)
- hlist->handlers = handler;
- else if (hlist->handlers->after && !handler->after)
{
- handler->next = hlist->handlers;
- hlist->handlers->prev = handler;
hlist->handlers = handler;
+ if (!handler->after)
+ hlist->tail_before = handler;
+ }
+ else if (handler->after)
+ {
+ handler->prev = hlist->tail_after;
+ hlist->tail_after->next = handler;
}
else
{
- Handler *tmp = hlist->handlers;
-
- if (handler->after)
- while (tmp->next)
- tmp = tmp->next;
- else
- while (tmp->next && !tmp->next->after)
- tmp = tmp->next;
- if (tmp->next)
- tmp->next->prev = handler;
- handler->next = tmp->next;
- handler->prev = tmp;
- tmp->next = handler;
+ if (hlist->tail_before)
+ {
+ handler->next = hlist->tail_before->next;
+ if (handler->next)
+ handler->next->prev = handler;
+ handler->prev = hlist->tail_before;
+ hlist->tail_before->next = handler;
+ }
+ else /* insert !after handler into a list of only after handlers */
+ {
+ handler->next = hlist->handlers;
+ if (handler->next)
+ handler->next->prev = handler;
+ hlist->handlers = handler;
+ }
+ hlist->tail_before = handler;
}
+
+ if (!handler->next)
+ hlist->tail_after = handler;
}
static inline void
}
void
-g_signal_init (void) /* sync with gtype.c */
+g_signal_init (void)
{
SIGNAL_LOCK ();
if (!g_n_signal_nodes)
{
- /* handler_id_node_prepend() requires this */
- g_assert (sizeof (GList) == sizeof (HandlerMatch));
-
/* setup handler list binary searchable array hash table (in german, that'd be one word ;) */
g_handler_list_bsa_ht = g_hash_table_new (g_direct_hash, NULL);
- g_signal_key_bsa = g_bsearch_array_new (&g_signal_key_bconfig);
+ g_signal_key_bsa = g_bsearch_array_create (&g_signal_key_bconfig);
/* invalid (0) signal_id */
g_n_signal_nodes = 1;
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_stop_emission:
- * @instance: the object whose signal handlers you wish to stop.
- * @signal_id: the signal identifier, as returned by g_signal_lookup().
- * @detail: the detail which the signal was emitted with.
- *
- * Stops a signal's current emission.
- *
- * This will prevent the default method from running, if the signal was
- * %G_SIGNAL_RUN_LAST and you connected normally (i.e. without the "after"
- * flag).
- *
- * Prints a warning if used on a signal which isn't being emitted.
- **/
void
g_signal_stop_emission (gpointer instance,
guint signal_id,
}
}
-/**
- * g_signal_add_emission_hook:
- * @signal_id: the signal identifier, as returned by g_signal_lookup().
- * @detail: the detail on which to call the hook.
- * @hook_func: a #GSignalEmissionHook function.
- * @hook_data: user data for @hook_func.
- * @data_destroy: a #GDestroyNotify for @hook_data.
- *
- * Adds an emission hook for a signal, which will get called for any emission
- * of that signal, independent of the instance.
- *
- * Return value: the hook id, for later use with
- * g_signal_remove_emission_hook().
- **/
gulong
g_signal_add_emission_hook (guint signal_id,
GQuark detail,
SIGNAL_LOCK ();
node = LOOKUP_SIGNAL_NODE (signal_id);
- if (!node || node->destroyed || (node->flags & G_SIGNAL_NO_HOOKS))
+ if (!node || node->destroyed)
{
g_warning ("%s: invalid signal id `%u'", G_STRLOC, signal_id);
SIGNAL_UNLOCK ();
return 0;
}
+ if (node->flags & G_SIGNAL_NO_HOOKS)
+ {
+ g_warning ("%s: signal id `%u' does not support emission hooks (G_SIGNAL_NO_HOOKS flag set)", G_STRLOC, signal_id);
+ SIGNAL_UNLOCK ();
+ return 0;
+ }
if (detail && !(node->flags & G_SIGNAL_DETAILED))
{
g_warning ("%s: signal id `%u' does not support detail (%u)", G_STRLOC, signal_id, detail);
return hook->hook_id;
}
-/**
- * g_signal_remove_emission_hook:
- * @signal_id: the id of the signal
- * @hook_id: the id of the emission hook, as returned by
- * g_signal_add_emission_hook()
- *
- * Deletes an emission hook.
- **/
void
g_signal_remove_emission_hook (guint signal_id,
gulong hook_id)
return signal_id;
}
-/**
- * g_signal_parse_name:
- * @detailed_signal: a string of the form "signal-name::detail".
- * @itype: The interface/instance type that introduced "signal-name".
- * @signal_id_p: Location to store the signal id.
- * @detail_p: Location to store the detail quark.
- * @force_detail_quark: %TRUE forces creation of a #GQuark for the detail.
- *
- * Internal function to parse a signal name into its @signal_id
- * and @detail quark.
- *
- * Return value: Whether the signal name could successfully be parsed and
- * @signal_id_p and @detail_p contain valid return values.
- **/
gboolean
g_signal_parse_name (const gchar *detailed_signal,
GType itype,
return TRUE;
}
-/**
- * g_signal_stop_emission_by_name:
- * @instance: the object whose signal handlers you wish to stop.
- * @detailed_signal: a string of the form "signal-name::detail".
- *
- * Stops a signal's current emission.
- *
- * This is just like g_signal_stop_emission() except it will look up the
- * signal id for you.
- **/
void
g_signal_stop_emission_by_name (gpointer instance,
const gchar *detailed_signal)
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_lookup:
- * @name: the signal's name.
- * @itype: the type that the signal operates on.
- *
- * Given the name of the signal and the type of object it connects to, gets
- * the signal's identifying integer. Emitting the signal by number is
- * somewhat faster than using the name each time.
- *
- * Also tries the ancestors of the given type.
- *
- * See g_signal_new() for details on allowed signal names.
- *
- * Return value: the signal's identifying number, or 0 if no signal was found.
- **/
guint
g_signal_lookup (const gchar *name,
GType itype)
return signal_id;
}
-/**
- * g_signal_list_ids:
- * @itype: Instance or interface type.
- * @n_ids: Location to store the number of signal ids for @itype.
- *
- * Lists the signals by id that a certain instance or interface type
- * created. Further information about the signals can be acquired through
- * g_signal_query().
- *
- * Return value: Newly allocated array of signal IDs.
- **/
guint*
g_signal_list_ids (GType itype,
guint *n_ids)
g_return_val_if_fail (n_ids != NULL, NULL);
SIGNAL_LOCK ();
- keys = G_BSEARCH_ARRAY_NODES (g_signal_key_bsa);
- n_nodes = g_signal_key_bsa->n_nodes;
+ keys = g_bsearch_array_get_nth (g_signal_key_bsa, &g_signal_key_bconfig, 0);
+ n_nodes = g_bsearch_array_get_n_nodes (g_signal_key_bsa);
result = g_array_new (FALSE, FALSE, sizeof (guint));
for (i = 0; i < n_nodes; i++)
return (guint*) g_array_free (result, FALSE);
}
-/**
- * g_signal_name:
- * @signal_id: the signal's identifying number.
- *
- * Given the signal's identifier, finds its name.
- *
- * Two different signals may have the same name, if they have differing types.
- *
- * Return value: the signal name, or %NULL if the signal number was invalid.
- **/
G_CONST_RETURN gchar*
g_signal_name (guint signal_id)
{
SignalNode *node;
- gchar *name;
+ const gchar *name;
SIGNAL_LOCK ();
node = LOOKUP_SIGNAL_NODE (signal_id);
name = node ? node->name : NULL;
SIGNAL_UNLOCK ();
- return name;
-}
-
-/**
- * g_signal_query:
- * @signal_id: The signal id of the signal to query information for.
- * @query: A user provided structure that is filled in with constant
- * values upon success.
- *
- * Queries the signal system for in-depth information about a
- * specific signal. This function will fill in a user-provided
- * structure to hold signal-specific information. If an invalid
- * signal id is passed in, the @signal_id member of the #GSignalQuery
- * is 0. All members filled into the #GSignalQuery structure should
- * be considered constant and have to be left untouched.
- **/
+ return (char*) name;
+}
+
void
g_signal_query (guint signal_id,
GSignalQuery *query)
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_new:
- * @signal_name: the name for the signal
- * @itype: the type this signal pertains to. It will also pertain to
- * types which are derived from this type.
- * @signal_flags: a combination of #GSignalFlags specifying detail of when
- * the default handler is to be invoked. You should at least specify
- * %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST.
- * @class_offset: The offset of the function pointer in the class structure
- * for this type. Used to invoke a class method generically.
- * @accumulator: the accumulator for this signal; may be %NULL.
- * @accu_data: user data for the @accumulator.
- * @c_marshaller: the function to translate arrays of parameter values to
- * signal emissions into C language callback invocations.
- * @return_type: the type of return value, or #G_TYPE_NONE for a signal
- * without a return value.
- * @n_params: the number of parameter types to follow.
- * @Varargs: a list of types, one for each parameter.
- *
- * Creates a new signal. (This is usually done in the class initializer.)
- *
- * A signal name consists of segments consisting of ASCII letters and
- * digits, separated by either the '-' or '_' character. The first
- * character of a signal names must be a letter. Names which violate these
- * rules lead to undefined behaviour of the GSignal system.
- *
- * When registering a signal and looking up a signal, either separator can
- * be used, but they cannot be mixed.
- *
- * Return value: the signal id
- **/
guint
g_signal_new (const gchar *signal_name,
GType itype,
return_type, n_params, args);
va_end (args);
+
+ /* optimize NOP emissions with NULL class handlers */
+ if (signal_id && G_TYPE_IS_INSTANTIATABLE (itype) && return_type == G_TYPE_NONE &&
+ class_offset && class_offset < MAX_TEST_CLASS_OFFSET)
+ {
+ SignalNode *node;
+
+ SIGNAL_LOCK ();
+ node = LOOKUP_SIGNAL_NODE (signal_id);
+ node->test_class_offset = class_offset;
+ SIGNAL_UNLOCK ();
+ }
return signal_id;
}
{
ClassClosure *cc;
- if (node->class_closure_bsa && node->class_closure_bsa->n_nodes == 1)
- cc = G_BSEARCH_ARRAY_NODES (node->class_closure_bsa);
+ if (node->class_closure_bsa && g_bsearch_array_get_n_nodes (node->class_closure_bsa) == 1)
+ cc = g_bsearch_array_get_nth (node->class_closure_bsa, &g_class_closure_bconfig, 0);
else
cc = signal_find_class_closure (node, G_TYPE_FROM_INSTANCE (instance));
return cc ? cc->closure : NULL;
{
ClassClosure key;
+ /* can't optimize NOP emissions with overridden class closures */
+ node->test_class_offset = 0;
+
if (!node->class_closure_bsa)
- node->class_closure_bsa = g_bsearch_array_new (&g_class_closure_bconfig);
+ node->class_closure_bsa = g_bsearch_array_create (&g_class_closure_bconfig);
key.instance_type = itype;
key.closure = g_closure_ref (closure);
node->class_closure_bsa = g_bsearch_array_insert (node->class_closure_bsa,
&g_class_closure_bconfig,
- &key,
- FALSE);
+ &key);
g_closure_sink (closure);
if (node->c_marshaller && closure && G_CLOSURE_NEEDS_MARSHAL (closure))
g_closure_set_marshal (closure, node->c_marshaller);
}
-/**
- * g_signal_newv:
- * @signal_name: the name for the signal
- * @itype: the type this signal pertains to. It will also pertain to
- * types which are derived from this type.
- * @signal_flags: a combination of #GSignalFlags specifying detail of when
- * the default handler is to be invoked. You should at least specify
- * %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST.
- * @class_closure: The closure to invoke on signal emission.
- * @accumulator: the accumulator for this signal; may be %NULL.
- * @accu_data: user data for the @accumulator.
- * @c_marshaller: the function to translate arrays of parameter values to
- * signal emissions into C language callback invocations.
- * @return_type: the type of return value, or #G_TYPE_NONE for a signal
- * without a return value.
- * @n_params: the length of @param_types.
- * @param_types: an array types, one for each parameter.
- *
- * Creates a new signal. (This is usually done in the class initializer.)
- *
- * See g_signal_new() for details on allowed signal names.
- *
- * Return value: the signal id
- **/
guint
g_signal_newv (const gchar *signal_name,
GType itype,
key.itype = itype;
key.quark = g_quark_from_string (node->name);
key.signal_id = signal_id;
- g_signal_key_bsa = g_bsearch_array_insert (g_signal_key_bsa, &g_signal_key_bconfig, &key, FALSE);
- g_strdelimit (node->name, "_", '-');
- key.quark = g_quark_from_static_string (node->name);
- g_signal_key_bsa = g_bsearch_array_insert (g_signal_key_bsa, &g_signal_key_bconfig, &key, FALSE);
+ g_signal_key_bsa = g_bsearch_array_insert (g_signal_key_bsa, &g_signal_key_bconfig, &key);
+ g_strdelimit (name, "_", '-');
+ node->name = g_intern_string (name);
+ key.quark = g_quark_from_string (name);
+ g_signal_key_bsa = g_bsearch_array_insert (g_signal_key_bsa, &g_signal_key_bconfig, &key);
}
node->destroyed = FALSE;
-
+ node->test_class_offset = 0;
+
/* setup reinitializable portion */
node->flags = signal_flags & G_SIGNAL_FLAGS_MASK;
node->n_params = n_params;
node->emission_hooks = NULL;
if (class_closure)
signal_add_class_closure (node, 0, class_closure);
+ else if (G_TYPE_IS_INSTANTIATABLE (itype) && return_type == G_TYPE_NONE)
+ {
+ /* optimize NOP emissions */
+ node->test_class_offset = TEST_CLASS_MAGIC;
+ }
SIGNAL_UNLOCK ();
+ g_free (name);
+
return signal_id;
}
-/**
- * g_signal_new_valist:
- * @signal_name: the name for the signal
- * @itype: the type this signal pertains to. It will also pertain to
- * types which are derived from this type.
- * @signal_flags: a combination of #GSignalFlags specifying detail of when
- * the default handler is to be invoked. You should at least specify
- * %G_SIGNAL_RUN_FIRST or %G_SIGNAL_RUN_LAST.
- * @class_closure: The closure to invoke on signal emission.
- * @accumulator: the accumulator for this signal; may be %NULL.
- * @accu_data: user data for the @accumulator.
- * @c_marshaller: the function to translate arrays of parameter values to
- * signal emissions into C language callback invocations.
- * @return_type: the type of return value, or #G_TYPE_NONE for a signal
- * without a return value.
- * @n_params: the number of parameter types in @args.
- * @args: va_list of #GType, one for each parameter.
- *
- * Creates a new signal. (This is usually done in the class initializer.)
- *
- * See g_signal_new() for details on allowed signal names.
- *
- * Return value: the signal id
- **/
guint
g_signal_new_valist (const gchar *signal_name,
GType itype,
signal_node->destroyed = TRUE;
/* reentrancy caution, zero out real contents first */
+ signal_node->test_class_offset = 0;
signal_node->n_params = 0;
signal_node->param_types = NULL;
signal_node->return_type = 0;
g_closure_unref (cc->closure);
}
- g_bsearch_array_destroy (node.class_closure_bsa, &g_class_closure_bconfig);
+ g_bsearch_array_free (node.class_closure_bsa, &g_class_closure_bconfig);
}
g_free (node.accumulator);
if (node.emission_hooks)
SIGNAL_LOCK ();
}
-/**
- * g_signal_override_class_closure:
- * @signal_id: the signal id
- * @instance_type: the instance type on which to override the class closure
- * for the signal.
- * @class_closure: the closure.
- *
- * Overrides the class closure (i.e. the default handler) for the given signal
- * for emissions on instances of @instance_type. @instance_type must be derived
- * from the type to which the signal belongs.
- **/
void
g_signal_override_class_closure (guint signal_id,
GType instance_type,
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_chain_from_overridden:
- * @instance_and_params: the argument list of the signal emission. The first
- * element in the array is a #GValue for the instance the signal is
- * being emitted on. The rest are any arguments to be passed to the
- * signal.
- * @return_value: Location for the return value.
- *
- * Calls the original class closure of a signal. This function should only
- * be called from an overridden class closure; see
- * g_signal_override_class_closure().
- **/
void
g_signal_chain_from_overridden (const GValue *instance_and_params,
GValue *return_value)
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_get_invocation_hint:
- * @instance: the instance to query
- *
- * Returns the invocation hint of the innermost signal emission of instance.
- *
- * Return value: the invocation hint of the innermost signal emission.
- **/
GSignalInvocationHint*
g_signal_get_invocation_hint (gpointer instance)
{
return emission ? &emission->ihint : NULL;
}
-/**
- * g_signal_connect_closure_by_id:
- * @instance: the instance to connect to.
- * @signal_id: the id of the signal.
- * @detail: the detail.
- * @closure: the closure to connect.
- * @after: whether the handler should be called before or after the
- * default handler of the signal.
- *
- * Connects a closure to a signal for a particular object.
- *
- * Return value: the handler id
- **/
gulong
g_signal_connect_closure_by_id (gpointer instance,
guint signal_id,
return handler_seq_no;
}
-/**
- * g_signal_connect_closure:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @closure: the closure to connect.
- * @after: whether the handler should be called before or after the
- * default handler of the signal.
- *
- * Connects a closure to a signal for a particular object.
- *
- * Return value: the handler id
- **/
gulong
g_signal_connect_closure (gpointer instance,
const gchar *detailed_signal,
return handler_seq_no;
}
-/**
- * g_signal_connect_data:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * @destroy_data: a #GDestroyNotify for @data.
- * @connect_flags: a combination of #GConnectFlags.
- *
- * Connects a #GCallback function to a signal for a particular object.
- *
- * Return value: the handler id
- **/
gulong
g_signal_connect_data (gpointer instance,
const gchar *detailed_signal,
return handler_seq_no;
}
-/**
- * g_signal_handler_block:
- * @instance: The instance to block the signal handler of.
- * @handler_id: Handler id of the handler to be blocked.
- *
- * Blocks a handler of an instance so it will not be called during
- * any signal emissions unless it is unblocked again. Thus "blocking"
- * a signal handler means to temporarily deactive it, a signal handler
- * has to be unblocked exactly the same amount of times it has been
- * blocked before to become active again.
- *
- * The @handler_id has to be a valid signal handler id, connected to a
- * signal of @instance.
- **/
void
g_signal_handler_block (gpointer instance,
gulong handler_id)
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_handler_unblock:
- * @instance: The instance to unblock the signal handler of.
- * @handler_id: Handler id of the handler to be unblocked.
- *
- * Undoes the effect of a previous g_signal_handler_block() call.
- * A blocked handler is skipped during signal emissions and will not be
- * invoked, unblocking it (for exactly the amount of times it has been
- * blocked before) reverts its "blocked" state, so the handler will be
- * recognized by the signal system and is called upon future or currently
- * ongoing signal emissions (since the order in which handlers are
- * called during signal emissions is deterministic, whether the
- * unblocked handler in question is called as part of a currently
- * ongoing emission depends on how far that emission has proceeded
- * yet).
- *
- * The @handler_id has to be a valid id of a signal handler that is
- * connected to a signal of @instance and is currently blocked.
- **/
void
g_signal_handler_unblock (gpointer instance,
gulong handler_id)
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_handler_disconnect:
- * @instance: The instance to remove the signal handler from.
- * @handler_id: Handler id of the handler to be disconnected.
- *
- * Disconnects a handler from an instance so it will not be called during
- * any future or currently ongoing emissions of the signal it has been
- * connected to. The @handler_id becomes invalid and may be reused.
- *
- * The @handler_id has to be a valid signal handler id, connected to a
- * signal of @instance.
- **/
void
g_signal_handler_disconnect (gpointer instance,
gulong handler_id)
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_handler_is_connected:
- * @instance: The instance where a signal handler is sought.
- * @handler_id: the handler id.
- *
- * Returns whether @handler_id is the id of a handler connected to @instance.
- *
- * Return value: whether @handler_id identifies a handler connected to
- * @instance.
- **/
gboolean
g_signal_handler_is_connected (gpointer instance,
gulong handler_id)
gboolean connected;
g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), FALSE);
- g_return_val_if_fail (handler_id > 0, FALSE);
SIGNAL_LOCK ();
handler = handler_lookup (instance, handler_id, NULL);
return connected;
}
-/**
- * g_signal_handlers_destroy:
- * @instance: The instance whose signal handlers are to be destroyed
- *
- * Destroys all the signal handlers connected to an object. This is done
- * automatically when the object is destroyed.
- *
- * This function is labeled private.
- **/
void
g_signal_handlers_destroy (gpointer instance)
{
}
}
}
- g_bsearch_array_destroy (hlbsa, &g_signal_hlbsa_bconfig);
+ g_bsearch_array_free (hlbsa, &g_signal_hlbsa_bconfig);
}
SIGNAL_UNLOCK ();
}
-/**
- * g_signal_handler_find:
- * @instance: The instance owning the signal handler to be found.
- * @mask: Mask indicating which of @signal_id, @detail, @closure, @func
- * and/or @data the handler has to match.
- * @signal_id: Signal the handler has to be connected to.
- * @detail: Signal detail the handler has to be connected to.
- * @closure: The closure the handler will invoke.
- * @func: The C closure callback of the handler (useless for non-C closures).
- * @data: The closure data of the handler's closure.
- *
- * Finds the first signal handler that matches certain selection criteria.
- * The criteria mask is passed as an OR-ed combination of #GSignalMatchType
- * flags, and the criteria values are passed as arguments.
- * The match @mask has to be non-0 for successful matches.
- * If no handler was found, 0 is returned.
- *
- * Return value: A valid non-0 signal handler id for a successful match.
- **/
gulong
g_signal_handler_find (gpointer instance,
GSignalMatchType mask,
return n_handlers;
}
-/**
- * g_signal_handlers_block_matched:
- * @instance: The instance to block handlers from.
- * @mask: Mask indicating which of @signal_id, @detail, @closure, @func
- * and/or @data the handlers have to match.
- * @signal_id: Signal the handlers have to be connected to.
- * @detail: Signal detail the handlers have to be connected to.
- * @closure: The closure the handlers will invoke.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- *
- * Blocks all handlers on an instance that match a certain selection criteria.
- * The criteria mask is passed as an OR-ed combination of #GSignalMatchType
- * flags, and the criteria values are passed as arguments.
- * Passing at least one of the %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC
- * or %G_SIGNAL_MATCH_DATA match flags is required for successful matches.
- * If no handlers were found, 0 is returned, the number of blocked handlers
- * otherwise.
- *
- * Return value: The amount of handlers that got blocked.
- **/
guint
g_signal_handlers_block_matched (gpointer instance,
GSignalMatchType mask,
{
guint n_handlers = 0;
- g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), FALSE);
- g_return_val_if_fail ((mask & ~G_SIGNAL_MATCH_MASK) == 0, FALSE);
+ g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), 0);
+ g_return_val_if_fail ((mask & ~G_SIGNAL_MATCH_MASK) == 0, 0);
if (mask & (G_SIGNAL_MATCH_CLOSURE | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA))
{
return n_handlers;
}
-/**
- * g_signal_handlers_unblock_matched:
- * @instance: The instance to unblock handlers from.
- * @mask: Mask indicating which of @signal_id, @detail, @closure, @func
- * and/or @data the handlers have to match.
- * @signal_id: Signal the handlers have to be connected to.
- * @detail: Signal detail the handlers have to be connected to.
- * @closure: The closure the handlers will invoke.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- *
- * Unblocks all handlers on an instance that match a certain selection
- * criteria. The criteria mask is passed as an OR-ed combination of
- * #GSignalMatchType flags, and the criteria values are passed as arguments.
- * Passing at least one of the %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC
- * or %G_SIGNAL_MATCH_DATA match flags is required for successful matches.
- * If no handlers were found, 0 is returned, the number of unblocked handlers
- * otherwise. The match criteria should not apply to any handlers that are
- * not currently blocked.
- *
- * Return value: The amount of handlers that got unblocked.
- **/
guint
g_signal_handlers_unblock_matched (gpointer instance,
GSignalMatchType mask,
{
guint n_handlers = 0;
- g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), FALSE);
- g_return_val_if_fail ((mask & ~G_SIGNAL_MATCH_MASK) == 0, FALSE);
+ g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), 0);
+ g_return_val_if_fail ((mask & ~G_SIGNAL_MATCH_MASK) == 0, 0);
if (mask & (G_SIGNAL_MATCH_CLOSURE | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA))
{
return n_handlers;
}
-/**
- * g_signal_handlers_disconnect_matched:
- * @instance: The instance to remove handlers from.
- * @mask: Mask indicating which of @signal_id, @detail, @closure, @func
- * and/or @data the handlers have to match.
- * @signal_id: Signal the handlers have to be connected to.
- * @detail: Signal detail the handlers have to be connected to.
- * @closure: The closure the handlers will invoke.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- *
- * Disconnects all handlers on an instance that match a certain selection
- * criteria. The criteria mask is passed as an OR-ed combination of
- * #GSignalMatchType flags, and the criteria values are passed as arguments.
- * Passing at least one of the %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC
- * or %G_SIGNAL_MATCH_DATA match flags is required for successful matches.
- * If no handlers were found, 0 is returned, the number of disconnected
- * handlers otherwise.
- *
- * Return value: The amount of handlers that got disconnected.
- **/
guint
g_signal_handlers_disconnect_matched (gpointer instance,
GSignalMatchType mask,
{
guint n_handlers = 0;
- g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), FALSE);
- g_return_val_if_fail ((mask & ~G_SIGNAL_MATCH_MASK) == 0, FALSE);
+ g_return_val_if_fail (G_TYPE_CHECK_INSTANCE (instance), 0);
+ g_return_val_if_fail ((mask & ~G_SIGNAL_MATCH_MASK) == 0, 0);
if (mask & (G_SIGNAL_MATCH_CLOSURE | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA))
{
return n_handlers;
}
-/**
- * g_signal_has_handler_pending:
- * @instance: the object whose signal handlers are sought.
- * @signal_id: the signal id.
- * @detail: the detail.
- * @may_be_blocked: whether blocked handlers should count as match.
- *
- * Returns whether there are any handlers connected to @instance for the
- * given signal id and detail.
- *
- * One example of when you might use this is when the arguments to the
- * signal are difficult to compute. A class implementor may opt to not emit
- * the signal if no one is attached anyway, thus saving the cost of building
- * the arguments.
- *
- * Return value: %TRUE if a handler is connected to the signal,
- * %FALSE otherwise.
- **/
gboolean
g_signal_has_handler_pending (gpointer instance,
guint signal_id,
return has_pending;
}
-/**
- * g_signal_emitv:
- * @instance_and_params: argument list for the signal emission. The first
- * element in the array is a #GValue for the instance the signal is
- * being emitted on. The rest are any arguments to be passed to the
- * signal.
- * @signal_id: the signal id
- * @detail: the detail
- * @return_value: Location to store the return value of the signal emission.
- *
- * Emits a signal.
- *
- * Note that g_signal_emitv() doesn't change @return_value if no handlers are
- * connected, in contrast to g_signal_emit() and g_signal_emit_valist().
- **/
+static inline gboolean
+signal_check_skip_emission (SignalNode *node,
+ gpointer instance,
+ GQuark detail)
+{
+ HandlerList *hlist;
+
+ /* are we able to check for NULL class handlers? */
+ if (!node->test_class_offset)
+ return FALSE;
+
+ /* are there emission hooks pending? */
+ if (node->emission_hooks && node->emission_hooks->hooks)
+ return FALSE;
+
+ /* is there a non-NULL class handler? */
+ if (node->test_class_offset != TEST_CLASS_MAGIC)
+ {
+ GTypeClass *class = G_TYPE_INSTANCE_GET_CLASS (instance, G_TYPE_FROM_INSTANCE (instance), GTypeClass);
+
+ if (G_STRUCT_MEMBER (gpointer, class, node->test_class_offset))
+ return FALSE;
+ }
+
+ /* are signals being debugged? */
+#ifdef G_ENABLE_DEBUG
+ IF_DEBUG (SIGNALS, g_trace_instance_signals || g_trap_instance_signals)
+ return FALSE;
+#endif /* G_ENABLE_DEBUG */
+
+ /* is this a no-recurse signal already in emission? */
+ if (node->flags & G_SIGNAL_NO_RECURSE &&
+ emission_find (g_restart_emissions, node->signal_id, detail, instance))
+ return FALSE;
+
+ /* do we have pending handlers? */
+ hlist = handler_list_lookup (node->signal_id, instance);
+ if (hlist && hlist->handlers)
+ return FALSE;
+
+ /* none of the above, no emission required */
+ return TRUE;
+}
+
void
g_signal_emitv (const GValue *instance_and_params,
guint signal_id,
GQuark detail,
GValue *return_value)
{
- const GValue *param_values;
gpointer instance;
SignalNode *node;
#ifdef G_ENABLE_DEBUG
+ const GValue *param_values;
guint i;
#endif
g_return_if_fail (G_TYPE_CHECK_INSTANCE (instance));
g_return_if_fail (signal_id > 0);
+#ifdef G_ENABLE_DEBUG
param_values = instance_and_params + 1;
-
+#endif
+
SIGNAL_LOCK ();
node = LOOKUP_SIGNAL_NODE (signal_id);
if (!node || !g_type_is_a (G_TYPE_FROM_INSTANCE (instance), node->itype))
return_value = NULL;
#endif /* G_ENABLE_DEBUG */
+ /* optimize NOP emissions */
+ if (signal_check_skip_emission (node, instance, detail))
+ {
+ /* nothing to do to emit this signal */
+ SIGNAL_UNLOCK ();
+ /* g_printerr ("omitting emission of \"%s\"\n", node->name); */
+ return;
+ }
+
SIGNAL_UNLOCK ();
signal_emit_unlocked_R (node, detail, instance, return_value, instance_and_params);
}
-/**
- * g_signal_emit_valist:
- * @instance: the instance the signal is being emitted on.
- * @signal_id: the signal id
- * @detail: the detail
- * @var_args: a list of parameters to be passed to the signal, followed by a
- * location for the return value. If the return type of the signal
- * is #G_TYPE_NONE, the return value location can be omitted.
- *
- * Emits a signal.
- *
- * Note that g_signal_emit_valist() resets the return value to the default
- * if no handlers are connected, in contrast to g_signal_emitv().
- **/
void
g_signal_emit_valist (gpointer instance,
guint signal_id,
}
#endif /* !G_DISABLE_CHECKS */
+ /* optimize NOP emissions */
+ if (signal_check_skip_emission (node, instance, detail))
+ {
+ /* nothing to do to emit this signal */
+ SIGNAL_UNLOCK ();
+ /* g_printerr ("omitting emission of \"%s\"\n", node->name); */
+ return;
+ }
+
n_params = node->n_params;
signal_return_type = node->return_type;
if (node->n_params < MAX_STACK_VALUES)
g_free (error);
/* we purposely leak the value here, it might not be
- * in a sane state if an error condition occoured
+ * in a sane state if an error condition occured
*/
}
}
g_free (free_me);
}
-/**
- * g_signal_emit:
- * @instance: the instance the signal is being emitted on.
- * @signal_id: the signal id
- * @detail: the detail
- * @Varargs: parameters to be passed to the signal, followed by a
- * location for the return value. If the return type of the signal
- * is #G_TYPE_NONE, the return value location can be omitted.
- *
- * Emits a signal.
- *
- * Note that g_signal_emit() resets the return value to the default
- * if no handlers are connected, in contrast to g_signal_emitv().
- **/
void
g_signal_emit (gpointer instance,
guint signal_id,
va_end (var_args);
}
-/**
- * g_signal_emit_by_name:
- * @instance: the instance the signal is being emitted on.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @Varargs: parameters to be passed to the signal, followed by a
- * location for the return value. If the return type of the signal
- * is #G_TYPE_NONE, the return value location can be omitted.
- *
- * Emits a signal.
- *
- * Note that g_signal_emit_by_name() resets the return value to the default
- * if no handlers are connected, in contrast to g_signal_emitv().
- **/
void
g_signal_emit_by_name (gpointer instance,
const gchar *detailed_signal,
return "<invalid>";
}
+gboolean
+g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
+ GValue *return_accu,
+ const GValue *handler_return,
+ gpointer dummy)
+{
+ gboolean continue_emission;
+ gboolean signal_handled;
+
+ signal_handled = g_value_get_boolean (handler_return);
+ g_value_set_boolean (return_accu, signal_handled);
+ continue_emission = !signal_handled;
+
+ return continue_emission;
+}
+
/* --- compile standard marshallers --- */
-#include "gobject.h"
-#include "genums.h"
#include "gmarshal.c"
+
+#define __G_SIGNAL_C__
+#include "gobjectaliasdef.c"
projects / platform / upstream / glib.git / blobdiff