mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-27 07:56:14 +01:00
37e4b8c87e
Wed Mar 7 09:36:33 2001 Tim Janik <timj@gtk.org> * gboxed.[hc]: changed prototype of g_boxed_type_register_static() to contain an optional init function and a hint at whether the boxed structure uses ref counting internally. added g_value_set_boxed_take_ownership(). made G_TYPE_BOXED an abstract value type. * genums.[hc]: made G_TYPE_ENUM and G_TYPE_FLAGS abstract value types. * glib-genmarshal.c: argument type changes, preparation for third-party arg specification. * gobject.[hc]: cleaned up get/set property code. added g_strdup_value_contents() to improve warnings. * gparam.[hc]: added g_param_value_convert(), taking over responsibility of the old g_value_convert(). added G_PARAM_LAX_VALIDATION flag so validation alterations may be valid a part of the property setting process. * gparamspecs.[hc]: made value comparisons stable (for sort applications). added GParamSpecValueArray, a param spec for value arrays and GParamSpecClosure. nuked the value exchange functions and GParamSpecCCallback. * gtype.[hc]: catch unintialized usages of the type system with g_return_val_if_uninitialized(). introduced G_TYPE_FLAG_VALUE_ABSTRACT to flag types that introduce a value table, but can't be used for g_value_init(). cleaned up reserved type ids. * gvalue.[hc]: code cleanups and saner checking. nuked the value exchange API. implemented value transformations, we can't really "convert" values, rather transforms are an anylogy to C casts, real conversions need a param spec for validation, which is why g_param_value_convert() does real conversions now. * gvaluearray.[hc]: new files that implement a GValueArray, a struct that can hold inhomogeneous arrays of value (to that extend that it also allowes undefined values, i.e. G_VALUE_TYPE(value)==0). this is exposed to the type system as a boxed type. * gvaluetransform.c: new file implementing most of the former value exchange functions as single-sided transformations. * gvaluetypes.[hc]: nuked G_TYPE_CCALLBACK, added g_value_set_string_take_ownership(). * *.h: s/G_IS_VALUE_/G_VALUE_HOLDS_/. * *.[hc]: many fixes and cleanups. * many warning improvements. Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org> * gobject.c (g_object_get_valist): urg, pass G_VALUE_NOCOPY_CONTENTS into G_VALUE_LCOPY(), this needs proper documenting. * gparam.c: fixed G_PARAM_USER_MASK. * gtype.c (type_data_make_W): (type_data_last_unref_Wm): fixed invalid memory freeing. * gobject.c (g_object_last_unref): destroy signal handlers associated with object, right before finalization. * gsignal.c (g_signal_parse_name): catch destroyed nodes or signals that don't actually support details. * gobject.[hc]: got rid of property trailers. nuked GObject properties "data" and the "signal" variants. (g_object_connect): new convenience function to do multiple signal connections at once. (g_object_disconnect): likewise, for disconnections. * gparam.[hc] (g_param_spec_pool_lookup): took out trailer support. * gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer() as private (the latter got renamed from g_value_get_as_pointer()). Wed Mar 7 09:32:06 2001 Tim Janik <timj@gtk.org> * glib-object.h: add gvaluearray.h. * gstring.[hc]: fixup naming of g_string_sprint*. * gtypes.h: fixed GCompareDataFunc naming. Wed Mar 7 09:33:27 2001 Tim Janik <timj@gtk.org> * gobject/Makefile.am: shuffled rules to avoid excessive rebuilds. * gobject/gobject-sections.txt: updates. * gobject/tmpl/*: bunch of updates, added another patch from Eric Lemings <eric.b.lemings@lmco.com>.
170 lines
4.6 KiB
C
170 lines
4.6 KiB
C
/* GObject - GLib Type, Object, Parameter and Signal Library
|
|
* Copyright (C) 2000-2001 Tim Janik
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General
|
|
* Public License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
#define G_IMPLEMENT_INLINES 1
|
|
#define __G_BSEARCHARRAY_C__
|
|
#include "gbsearcharray.h"
|
|
|
|
#include <string.h>
|
|
|
|
|
|
/* --- structures --- */
|
|
static inline guint
|
|
upper_power2 (guint number)
|
|
{
|
|
#ifdef DISABLE_MEM_POOLS
|
|
return number;
|
|
#else /* !DISABLE_MEM_POOLS */
|
|
return number ? 1 << g_bit_storage (number - 1) : 0;
|
|
#endif /* !DISABLE_MEM_POOLS */
|
|
}
|
|
|
|
static inline gpointer
|
|
bsearch_array_insert (GBSearchArray *barray,
|
|
gconstpointer key_node,
|
|
gboolean replace)
|
|
{
|
|
gint sizeof_node;
|
|
guint8 *check;
|
|
|
|
sizeof_node = barray->sizeof_node;
|
|
if (barray->n_nodes == 0)
|
|
{
|
|
guint new_size = barray->sizeof_node;
|
|
|
|
if (barray->flags & G_BSEARCH_ALIGN_POWER2)
|
|
new_size = upper_power2 (new_size);
|
|
barray->nodes = g_realloc (barray->nodes, new_size);
|
|
barray->n_nodes = 1;
|
|
check = barray->nodes;
|
|
replace = TRUE;
|
|
}
|
|
else
|
|
{
|
|
GBSearchCompareFunc cmp_func = barray->cmp_func;
|
|
guint n_nodes = barray->n_nodes;
|
|
guint8 *nodes = barray->nodes;
|
|
gint cmp;
|
|
guint i;
|
|
|
|
nodes -= sizeof_node;
|
|
do
|
|
{
|
|
i = (n_nodes + 1) >> 1;
|
|
check = nodes + i * sizeof_node;
|
|
cmp = cmp_func (key_node, check);
|
|
if (cmp > 0)
|
|
{
|
|
n_nodes -= i;
|
|
nodes = check;
|
|
}
|
|
else if (cmp < 0)
|
|
n_nodes = i - 1;
|
|
else /* if (cmp == 0) */
|
|
goto SKIP_GROW;
|
|
}
|
|
while (n_nodes);
|
|
/* grow */
|
|
if (cmp > 0)
|
|
check += sizeof_node;
|
|
i = (check - ((guint8*) barray->nodes)) / sizeof_node;
|
|
n_nodes = barray->n_nodes++;
|
|
if (barray->flags & G_BSEARCH_ALIGN_POWER2)
|
|
{
|
|
guint new_size = upper_power2 (barray->n_nodes * sizeof_node);
|
|
guint old_size = upper_power2 (n_nodes * sizeof_node);
|
|
|
|
if (new_size != old_size)
|
|
barray->nodes = g_realloc (barray->nodes, new_size);
|
|
}
|
|
else
|
|
barray->nodes = g_realloc (barray->nodes, barray->n_nodes * sizeof_node);
|
|
check = ((guint8*) barray->nodes) + i * sizeof_node;
|
|
g_memmove (check + sizeof_node, check, (n_nodes - i) * sizeof_node);
|
|
replace = TRUE;
|
|
SKIP_GROW:
|
|
;
|
|
}
|
|
if (replace)
|
|
memcpy (check, key_node, sizeof_node);
|
|
|
|
return check;
|
|
}
|
|
|
|
gpointer
|
|
g_bsearch_array_insert (GBSearchArray *barray,
|
|
gconstpointer key_node,
|
|
gboolean replace_existing)
|
|
{
|
|
g_return_val_if_fail (barray != NULL, NULL);
|
|
g_return_val_if_fail (key_node != NULL, NULL);
|
|
|
|
return bsearch_array_insert (barray, key_node, replace_existing);
|
|
}
|
|
|
|
void
|
|
g_bsearch_array_remove_node (GBSearchArray *barray,
|
|
gpointer _node_in_array)
|
|
{
|
|
guint8 *nodes, *bound, *node_in_array = _node_in_array;
|
|
guint old_size;
|
|
|
|
g_return_if_fail (barray != NULL);
|
|
|
|
nodes = barray->nodes;
|
|
old_size = barray->sizeof_node;
|
|
old_size *= barray->n_nodes; /* beware of int widths */
|
|
bound = nodes + old_size;
|
|
|
|
g_return_if_fail (node_in_array >= nodes && node_in_array < bound);
|
|
|
|
bound -= barray->sizeof_node;
|
|
barray->n_nodes -= 1;
|
|
g_memmove (node_in_array, node_in_array + barray->sizeof_node, (bound - node_in_array) / barray->sizeof_node);
|
|
|
|
if ((barray->flags & G_BSEARCH_DEFER_SHRINK) == 0)
|
|
{
|
|
guint new_size = bound - nodes; /* old_size - barray->sizeof_node */
|
|
|
|
if (barray->flags & G_BSEARCH_ALIGN_POWER2)
|
|
{
|
|
new_size = upper_power2 (new_size);
|
|
old_size = upper_power2 (old_size);
|
|
if (old_size != new_size)
|
|
barray->nodes = g_realloc (barray->nodes, new_size);
|
|
}
|
|
else
|
|
barray->nodes = g_realloc (barray->nodes, new_size);
|
|
}
|
|
}
|
|
|
|
void
|
|
g_bsearch_array_remove (GBSearchArray *barray,
|
|
gconstpointer key_node)
|
|
{
|
|
gpointer node_in_array;
|
|
|
|
g_return_if_fail (barray != NULL);
|
|
|
|
node_in_array = g_bsearch_array_lookup (barray, key_node);
|
|
if (!node_in_array)
|
|
g_warning (G_STRLOC ": unable to remove unexistant node");
|
|
else
|
|
g_bsearch_array_remove_node (barray, node_in_array);
|
|
}
|