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

Reviewed by Tim Janik:

Browse Source 
2008-07-21  Michael Natterer  <mitch@imendio.com>

	Reviewed by Tim Janik:

	* gsignal.c (g_signal_chain_from_overridden_handler): allocate
	the temp GValue array with GSLice.

	(g_signal_emit_valist): dito. Remove optimization/obfuscation of
	allocating up to 16 GValues on the stack and always use GSLice.


svn path=/trunk/; revision=7229
This commit is contained in:
Michael Natterer 2008-07-21 10:36:03 +00:00 committed by Michael Natterer
parent 8f5b439685
commit 864fbce267
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/ChangeLog
View File

@ -1,3 +1,11 @@
2008-07-21 Michael Natterer <mitch@imendio.com>
* gsignal.c (g_signal_chain_from_overridden_handler): allocate
the temp GValue array with GSLice.
(g_signal_emit_valist): dito. Remove optimization/obfuscation of
allocating up to 16 GValues on the stack and always use GSLice.
2008-07-05 Matthias Clasen <mclasen@redhat.com> 2008-07-05 Matthias Clasen <mclasen@redhat.com>
Bug 539229 – gobject-query calls itself query Bug 539229 – gobject-query calls itself query

32
gobject/gsignal.c
View File

@ -104,10 +104,6 @@
*/ */
/* pre allocation configurations
*/
#define MAX_STACK_VALUES (16)
#define REPORT_BUG "please report occurrence circumstances to gtk-devel-list@gnome.org" #define REPORT_BUG "please report occurrence circumstances to gtk-devel-list@gnome.org"
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
#define IF_DEBUG(debug_type, cond) if ((_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) || cond) #define IF_DEBUG(debug_type, cond) if ((_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) || cond)
@ -1382,7 +1378,7 @@ g_signal_new (const gchar *signal_name,
* g_signal_override_class_closure() or * g_signal_override_class_closure() or
* g_signal_override_class_handler()and chained to with * g_signal_override_class_handler()and chained to with
* g_signal_chain_from_overridden() or * g_signal_chain_from_overridden() or
* g_signal_chain_from_overridden(). * g_signal_chain_from_overridden_handler().
* *
* See g_signal_new() for information about signal names. * See g_signal_new() for information about signal names.
* *
@ -1963,7 +1959,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
if (closure) if (closure)
{ {
GValue *instance_and_params, *free_me = NULL; GValue *instance_and_params;
GType signal_return_type; GType signal_return_type;
GValue *param_values; GValue *param_values;
va_list var_args; va_list var_args;
@ -1972,8 +1968,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
va_start (var_args, instance); va_start (var_args, instance);
signal_return_type = node->return_type; signal_return_type = node->return_type;
free_me = g_new (GValue, node->n_params + 1); instance_and_params = g_slice_alloc (sizeof (GValue) * (n_params + 1));
instance_and_params = free_me;
param_values = instance_and_params + 1; param_values = instance_and_params + 1;
for (i = 0; i < node->n_params; i++) for (i = 0; i < node->n_params; i++)
@ -2000,7 +1995,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
while (i--) while (i--)
g_value_unset (param_values + i); g_value_unset (param_values + i);
g_free (free_me); g_slice_free1 (sizeof (GValue) * (n_params + 1), instance_and_params);
va_end (var_args); va_end (var_args);
return; return;
} }
@ -2061,8 +2056,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
g_value_unset (param_values + i); g_value_unset (param_values + i);
g_value_unset (instance_and_params); g_value_unset (instance_and_params);
if (free_me) g_slice_free1 (sizeof (GValue) * (n_params + 1), instance_and_params);
g_free (free_me);
va_end (var_args); va_end (var_args);
@ -2906,7 +2900,7 @@ g_signal_emit_valist (gpointer instance,
GQuark detail, GQuark detail,
va_list var_args) va_list var_args)
{ {
GValue *instance_and_params, stack_values[MAX_STACK_VALUES], *free_me = NULL; GValue *instance_and_params;
GType signal_return_type; GType signal_return_type;
GValue *param_values; GValue *param_values;
SignalNode *node; SignalNode *node;
@ -2943,14 +2937,9 @@ g_signal_emit_valist (gpointer instance,
n_params = node->n_params; n_params = node->n_params;
signal_return_type = node->return_type; signal_return_type = node->return_type;
if (node->n_params < MAX_STACK_VALUES) instance_and_params = g_slice_alloc (sizeof (GValue) * (n_params + 1));
instance_and_params = stack_values;
else
{
free_me = g_new (GValue, node->n_params + 1);
instance_and_params = free_me;
}
param_values = instance_and_params + 1; param_values = instance_and_params + 1;
for (i = 0; i < node->n_params; i++) for (i = 0; i < node->n_params; i++)
{ {
gchar *error; gchar *error;
@ -2975,7 +2964,7 @@ g_signal_emit_valist (gpointer instance,
while (i--) while (i--)
g_value_unset (param_values + i); g_value_unset (param_values + i);
g_free (free_me); g_slice_free1 (sizeof (GValue) * (n_params + 1), instance_and_params);
return; return;
} }
SIGNAL_LOCK (); SIGNAL_LOCK ();
@ -3016,8 +3005,7 @@ g_signal_emit_valist (gpointer instance,
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
g_value_unset (param_values + i); g_value_unset (param_values + i);
g_value_unset (instance_and_params); g_value_unset (instance_and_params);
if (free_me) g_slice_free1 (sizeof (GValue) * (n_params + 1), instance_and_params);
g_free (free_me);
} }
/** /**