luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

implemented g_datalist_* along the lines of g_dataset, but operates on an

Browse Source 
Thu Sep 17 06:36:25 1998  Tim Janik  <timj@gtk.org>

        * glib.h:
        * gdataset.c: implemented g_datalist_* along the lines of g_dataset,
        but operates on an opaque gpointer *datalist; pointer, e.g. for the
        implementation of GtkObject named data.
        we cache a certain portion of the already freed data entries now, to
        gain a slight performance improve with data reallocation.

Thu Sep 17 06:34:22 1998  Tim Janik  <timj@gtk.org>

        * gmodule.h:
        * gmodule.c: implemented g_module_make_resident() which can be
        used to make modules resident.
        fixed a buglet about the optional "g_module_de_init" function in
        modules, which could get invoked twice on very obscure occasions.
This commit is contained in:
Tim Janik 1998-09-17 04:59:41 +00:00 committed by Tim Janik
parent 7cc610b064
commit ea4b8e4c02
15 changed files with 737 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-12
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Thu Sep 17 06:36:25 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gdataset.c: implemented g_datalist_* along the lines of g_dataset,
but operates on an opaque gpointer *datalist; pointer, e.g. for the
implementation of GtkObject named data.
we cache a certain portion of the already freed data entries now, to
gain a slight performance improve with data reallocation.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am glib-config.in l*: Update to libtool-1.2b, * Makefile.am glib-config.in l*: Update to libtool-1.2b,

412
gdataset.c
View File

@ -24,17 +24,18 @@
/* --- defines --- */ /* --- defines --- */
#define G_DATASET_BLOCK_SIZE (512) #define G_QUARK_BLOCK_SIZE (512)
#define G_DATASET_MEM_CHUNK_PREALLOC (64) #define G_DATA_MEM_CHUNK_PREALLOC (128)
#define G_DATASET_DATA_MEM_CHUNK_PREALLOC (128) #define G_DATA_CACHE_MAX (512)
#define G_DATASET_MEM_CHUNK_PREALLOC (32)
/* --- structures --- */ /* --- structures --- */
typedef struct _GDatasetData GDatasetData; typedef struct _GData GData;
typedef struct _GDataset GDataset; typedef struct _GDataset GDataset;
struct _GDatasetData struct _GData
{ {
GDatasetData *next; GData *next;
guint id; guint id;
gpointer data; gpointer data;
GDestroyNotify destroy_func; GDestroyNotify destroy_func;
@ -43,15 +44,21 @@ struct _GDatasetData
struct _GDataset struct _GDataset
{ {
gconstpointer location; gconstpointer location;
GDatasetData *data_list; gpointer datalist;
}; };
/* --- prototypes --- */ /* --- prototypes --- */
static inline GDataset* g_dataset_lookup (gconstpointer dataset_location); static inline GDataset* g_dataset_lookup (gconstpointer dataset_location);
static inline void g_dataset_destroy_i (GDataset *dataset); static inline void g_datalist_clear_i (gpointer *datalist);
static void g_dataset_initialize (void); static void g_dataset_destroy_internal (GDataset *dataset);
static inline GQuark g_quark_new (const gchar *string); static inline void g_data_set_internal (gpointer *datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func,
GDataset *d_dataset);
static void g_data_initialize (void);
static inline GQuark g_quark_new (const gchar *string);
/* --- variables --- */ /* --- variables --- */
@ -61,11 +68,52 @@ static GQuark g_quark_seq_id = 0;
static GHashTable *g_dataset_location_ht = NULL; static GHashTable *g_dataset_location_ht = NULL;
static GDataset *g_dataset_cached = NULL; static GDataset *g_dataset_cached = NULL;
static GMemChunk *g_dataset_mem_chunk = NULL; static GMemChunk *g_dataset_mem_chunk = NULL;
static GMemChunk *g_dataset_data_mem_chunk = NULL; static GMemChunk *g_data_mem_chunk = NULL;
static GData *g_data_cache = NULL;
static guint g_data_cache_length = 0;
/* --- functions --- */ /* --- functions --- */
static inline void
g_datalist_clear_i (gpointer *datalist)
{
register GData *list;
/* unlink *all* items before walking their destructors
*/
list = *datalist;
*datalist = NULL;
while (list)
{
register GData *prev;
prev = list;
list = prev->next;
if (prev->destroy_func)
prev->destroy_func (prev->data);
if (g_data_cache_length < G_DATA_CACHE_MAX)
{
prev->next = g_data_cache;
g_data_cache = prev;
g_data_cache_length++;
}
else
g_mem_chunk_free (g_data_mem_chunk, prev);
}
}
void
g_datalist_clear (gpointer *datalist)
{
g_return_if_fail (datalist != NULL);
while (*datalist)
g_datalist_clear_i (datalist);
}
static inline GDataset* static inline GDataset*
g_dataset_lookup (gconstpointer dataset_location) g_dataset_lookup (gconstpointer dataset_location)
{ {
@ -74,9 +122,6 @@ g_dataset_lookup (gconstpointer dataset_location)
if (g_dataset_cached && g_dataset_cached->location == dataset_location) if (g_dataset_cached && g_dataset_cached->location == dataset_location)
return g_dataset_cached; return g_dataset_cached;
if (!g_dataset_location_ht)
g_dataset_initialize ();
dataset = g_hash_table_lookup (g_dataset_location_ht, dataset_location); dataset = g_hash_table_lookup (g_dataset_location_ht, dataset_location);
if (dataset) if (dataset)
g_dataset_cached = dataset; g_dataset_cached = dataset;
@ -84,30 +129,19 @@ g_dataset_lookup (gconstpointer dataset_location)
return dataset; return dataset;
} }
static inline void static void
g_dataset_destroy_i (GDataset *dataset) g_dataset_destroy_internal (GDataset *dataset)
{ {
register GDatasetData *list; gpointer datalist;
if (dataset == g_dataset_cached) if (dataset == g_dataset_cached)
g_dataset_cached = NULL; g_dataset_cached = NULL;
g_hash_table_remove (g_dataset_location_ht, dataset->location); g_hash_table_remove (g_dataset_location_ht, dataset->location);
list = dataset->data_list; datalist = dataset->datalist;
g_mem_chunk_free (g_dataset_mem_chunk, dataset); g_mem_chunk_free (g_dataset_mem_chunk, dataset);
while (list) g_datalist_clear_i (&datalist);
{
register GDatasetData *prev;
prev = list;
list = prev->next;
if (prev->destroy_func)
prev->destroy_func (prev->data);
g_mem_chunk_free (g_dataset_data_mem_chunk, prev);
}
} }
void void
@ -117,91 +151,27 @@ g_dataset_destroy (gconstpointer dataset_location)
g_return_if_fail (dataset_location != NULL); g_return_if_fail (dataset_location != NULL);
dataset = g_dataset_lookup (dataset_location); if (g_dataset_location_ht)
if (dataset)
g_dataset_destroy_i (dataset);
}
void
g_dataset_id_set_destroy (gconstpointer dataset_location,
GQuark key_id,
GDestroyNotify destroy_func)
{
g_return_if_fail (dataset_location != NULL);
if (key_id)
{ {
register GDataset *dataset;
dataset = g_dataset_lookup (dataset_location); dataset = g_dataset_lookup (dataset_location);
if (dataset) if (dataset)
{ g_dataset_destroy_internal (dataset);
register GDatasetData *list;
list = dataset->data_list;
while (list)
{
if (list->id == key_id)
{
list->destroy_func = destroy_func;
return;
}
}
}
} }
} }
gpointer static inline void
g_dataset_id_get_data (gconstpointer dataset_location, g_data_set_internal (gpointer *datalist,
GQuark key_id) GQuark key_id,
gpointer data,
GDestroyNotify destroy_func,
GDataset *d_dataset)
{ {
g_return_val_if_fail (dataset_location != NULL, NULL); register GData *list;
if (key_id) list = *datalist;
{
register GDataset *dataset;
dataset = g_dataset_lookup (dataset_location);
if (dataset)
{
register GDatasetData *list;
for (list = dataset->data_list; list; list = list->next)
if (list->id == key_id)
return list->data;
}
}
return NULL;
}
void
g_dataset_id_set_data_full (gconstpointer dataset_location,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func)
{
register GDataset *dataset;
register GDatasetData *list;
g_return_if_fail (dataset_location != NULL);
g_return_if_fail (key_id > 0);
dataset = g_dataset_lookup (dataset_location);
if (!dataset)
{
dataset = g_chunk_new (GDataset, g_dataset_mem_chunk);
dataset->location = dataset_location;
dataset->data_list = NULL;
g_hash_table_insert (g_dataset_location_ht,
(gpointer) dataset->location, /* Yuck */
dataset);
}
list = dataset->data_list;
if (!data) if (!data)
{ {
register GDatasetData *prev; register GData *prev;
prev = NULL; prev = NULL;
while (list) while (list)
@ -212,18 +182,29 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
prev->next = list->next; prev->next = list->next;
else else
{ {
dataset->data_list = list->next; *datalist = list->next;
if (!dataset->data_list) /* the dataset destruction *must* be done
g_dataset_destroy_i (dataset); * prior to invokation of the data destroy function
*/
if (!*datalist && d_dataset)
g_dataset_destroy_internal (d_dataset);
} }
/* we need to have unlinked before invoking the destroy function /* the GData struct *must* already be unlinked
* when invoking the destroy function
*/ */
if (list->destroy_func) if (list->destroy_func)
list->destroy_func (list->data); list->destroy_func (list->data);
g_mem_chunk_free (g_dataset_data_mem_chunk, list); if (g_data_cache_length < G_DATA_CACHE_MAX)
{
list->next = g_data_cache;
g_data_cache = list;
g_data_cache_length++;
}
else
g_mem_chunk_free (g_data_mem_chunk, list);
return; return;
} }
@ -238,19 +219,26 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
{ {
if (list->id == key_id) if (list->id == key_id)
{ {
register GDestroyNotify dfunc; if (!list->destroy_func)
register gpointer ddata; {
list->data = data;
list->destroy_func = destroy_func;
}
else
{
register GDestroyNotify dfunc;
register gpointer ddata;
dfunc = list->destroy_func; dfunc = list->destroy_func;
ddata = list->data; ddata = list->data;
list->data = data; list->data = data;
list->destroy_func = destroy_func; list->destroy_func = destroy_func;
/* we need to have updated all structures prior to /* we need to have updated all structures prior to
* invokation of the destroy function * invokation of the destroy function
*/ */
if (dfunc) dfunc (ddata);
dfunc (ddata); }
return; return;
} }
@ -258,17 +246,171 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
list = list->next; list = list->next;
} }
list = g_chunk_new (GDatasetData, g_dataset_data_mem_chunk); if (g_data_cache)
list->next = dataset->data_list; {
list = g_data_cache;
g_data_cache = list->next;
g_data_cache_length--;
}
else
list = g_chunk_new (GData, g_data_mem_chunk);
list->next = *datalist;
list->id = key_id; list->id = key_id;
list->data = data; list->data = data;
list->destroy_func = destroy_func; list->destroy_func = destroy_func;
dataset->data_list = list; *datalist = list;
} }
} }
void
g_dataset_id_set_data_full (gconstpointer dataset_location,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func)
{
register GDataset *dataset;
g_return_if_fail (dataset_location != NULL);
if (!key_id)
{
if (data)
g_return_if_fail (key_id > 0);
else
return;
}
if (!g_dataset_location_ht)
g_data_initialize ();
dataset = g_dataset_lookup (dataset_location);
if (!dataset)
{
dataset = g_chunk_new (GDataset, g_dataset_mem_chunk);
dataset->location = dataset_location;
dataset->datalist = NULL;
g_hash_table_insert (g_dataset_location_ht,
(gpointer) dataset->location,
dataset);
}
g_data_set_internal (&dataset->datalist, key_id, data, destroy_func, dataset);
}
void
g_datalist_id_set_data_full (gpointer *datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func)
{
g_return_if_fail (datalist != NULL);
if (!key_id)
{
if (data)
g_return_if_fail (key_id > 0);
else
return;
}
g_data_set_internal (datalist, key_id, data, destroy_func, NULL);
}
void
g_dataset_id_set_destroy (gconstpointer dataset_location,
GQuark key_id,
GDestroyNotify destroy_func)
{
register GDataset *dataset;
g_return_if_fail (dataset_location != NULL);
g_return_if_fail (key_id > 0);
if (g_dataset_location_ht)
{
dataset = g_dataset_lookup (dataset_location);
if (dataset)
{
register GData *list;
for (list = dataset->datalist; list; list = list->next)
if (list->id == key_id)
{
list->destroy_func = destroy_func;
break;
}
}
}
}
void
g_datalist_id_set_destroy (gpointer *datalist,
GQuark key_id,
GDestroyNotify destroy_func)
{
register GData *list;
g_return_if_fail (datalist != NULL);
g_return_if_fail (key_id > 0);
for (list = *datalist; list; list = list->next)
if (list->id == key_id)
{
list->destroy_func = destroy_func;
break;
}
}
gpointer
g_dataset_id_get_data (gconstpointer dataset_location,
GQuark key_id)
{
g_return_val_if_fail (dataset_location != NULL, NULL);
if (key_id && g_dataset_location_ht)
{
register GDataset *dataset;
dataset = g_dataset_lookup (dataset_location);
if (dataset)
{
register GData *list;
for (list = dataset->datalist; list; list = list->next)
if (list->id == key_id)
return list->data;
}
}
return NULL;
}
gpointer
g_datalist_id_get_data (gpointer *datalist,
GQuark key_id)
{
g_return_val_if_fail (datalist != NULL, NULL);
if (key_id)
{
register GData *list;
for (list = *datalist; list; list = list->next)
if (list->id == key_id)
return list->data;
}
return NULL;
}
void
g_datalist_init (gpointer *datalist)
{
g_return_if_fail (datalist != NULL);
*datalist = NULL;
}
static void static void
g_dataset_initialize (void) g_data_initialize (void)
{ {
if (!g_dataset_location_ht) if (!g_dataset_location_ht)
{ {
@ -280,10 +422,10 @@ g_dataset_initialize (void)
sizeof (GDataset), sizeof (GDataset),
sizeof (GDataset) * G_DATASET_MEM_CHUNK_PREALLOC, sizeof (GDataset) * G_DATASET_MEM_CHUNK_PREALLOC,
G_ALLOC_AND_FREE); G_ALLOC_AND_FREE);
g_dataset_data_mem_chunk = g_data_mem_chunk =
g_mem_chunk_new ("GDatasetData MemChunk", g_mem_chunk_new ("GData MemChunk",
sizeof (GDatasetData), sizeof (GData),
sizeof (GDatasetData) * G_DATASET_DATA_MEM_CHUNK_PREALLOC, sizeof (GData) * G_DATA_MEM_CHUNK_PREALLOC,
G_ALLOC_AND_FREE); G_ALLOC_AND_FREE);
} }
} }
@ -307,7 +449,7 @@ g_quark_from_string (const gchar *string)
g_return_val_if_fail (string != NULL, 0); g_return_val_if_fail (string != NULL, 0);
if (!g_quark_ht) if (!g_quark_ht)
g_dataset_initialize (); g_data_initialize ();
quark = (gulong) g_hash_table_lookup (g_quark_ht, string); quark = (gulong) g_hash_table_lookup (g_quark_ht, string);
if (!quark) if (!quark)
@ -324,7 +466,7 @@ g_quark_from_static_string (const gchar *string)
g_return_val_if_fail (string != NULL, 0); g_return_val_if_fail (string != NULL, 0);
if (!g_quark_ht) if (!g_quark_ht)
g_dataset_initialize (); g_data_initialize ();
quark = (gulong) g_hash_table_lookup (g_quark_ht, string); quark = (gulong) g_hash_table_lookup (g_quark_ht, string);
if (!quark) if (!quark)
@ -347,9 +489,9 @@ g_quark_new (const gchar *string)
{ {
GQuark quark; GQuark quark;
if (g_quark_seq_id % G_DATASET_BLOCK_SIZE == 0) if (g_quark_seq_id % G_QUARK_BLOCK_SIZE == 0)
g_quarks = g_realloc (g_quarks, g_quarks = g_realloc (g_quarks,
(g_quark_seq_id + G_DATASET_BLOCK_SIZE) * sizeof (gchar*)); (g_quark_seq_id + G_QUARK_BLOCK_SIZE) * sizeof (gchar*));
g_quarks[g_quark_seq_id] = (gchar*) string; g_quarks[g_quark_seq_id] = (gchar*) string;

41
glib.h
View File

@ -1441,7 +1441,36 @@ GQuark g_quark_from_string (const gchar *string);
gchar* g_quark_to_string (GQuark quark); gchar* g_quark_to_string (GQuark quark);
/* Location Associated Data /* Keyed Data List
*/
void g_datalist_init (gpointer *datalist);
void g_datalist_clear (gpointer *datalist);
gpointer g_datalist_id_get_data (gpointer *datalist,
GQuark key_id);
void g_datalist_id_set_data_full (gpointer *datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func);
void g_datalist_id_set_destroy (gpointer *datalist,
GQuark key_id,
GDestroyNotify destroy_func);
#define g_datalist_id_set_data(dl, q, d) \
g_datalist_id_set_data_full ((dl), (q), (d), NULL)
#define g_datalist_id_remove_data(dl, q) \
g_datalist_id_set_data ((dl), (q), NULL)
#define g_datalist_get_data(dl, k) \
(g_datalist_id_get_data ((dl), g_quark_try_string ((k))))
#define g_datalist_set_data_full(dl, k, d, f) \
g_datalist_id_set_data_full ((dl), g_quark_from_string ((k)), (d), (f))
#define g_datalist_set_destroy(dl, k, f) \
g_datalist_id_set_destroy ((dl), g_quark_try_string ((k)), (f))
#define g_datalist_set_data(dl, k, d) \
g_datalist_set_data_full ((dl), (k), (d), NULL)
#define g_datalist_remove_data(dl, k) \
g_datalist_id_set_data ((dl), g_quark_try_string ((k)), NULL)
/* Location Associated Keyed Data
*/ */
void g_dataset_destroy (gconstpointer dataset_location); void g_dataset_destroy (gconstpointer dataset_location);
gpointer g_dataset_id_get_data (gconstpointer dataset_location, gpointer g_dataset_id_get_data (gconstpointer dataset_location,
@ -1458,15 +1487,15 @@ void g_dataset_id_set_destroy (gconstpointer dataset_location,
#define g_dataset_id_remove_data(l, k) \ #define g_dataset_id_remove_data(l, k) \
g_dataset_id_set_data ((l), (k), NULL) g_dataset_id_set_data ((l), (k), NULL)
#define g_dataset_get_data(l, k) \ #define g_dataset_get_data(l, k) \
(g_dataset_id_get_data ((l), g_quark_try_string (k))) (g_dataset_id_get_data ((l), g_quark_try_string ((k))))
#define g_dataset_set_data_full(l, k, d, f) \ #define g_dataset_set_data_full(l, k, d, f) \
g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f)) g_dataset_id_set_data_full ((l), g_quark_from_string ((k)), (d), (f))
#define g_dataset_set_destroy(l, k, f) \ #define g_dataset_set_destroy(l, k, f) \
g_dataset_id_set_destroy ((l), g_quark_from_string (k), (f)) g_dataset_id_set_destroy ((l), g_quark_try_string ((k)), (f))
#define g_dataset_set_data(l, k, d) \ #define g_dataset_set_data(l, k, d) \
g_dataset_set_data_full ((l), (k), (d), NULL) g_dataset_set_data_full ((l), (k), (d), NULL)
#define g_dataset_remove_data(l,k) \ #define g_dataset_remove_data(l, k) \
g_dataset_set_data ((l), (k), NULL) g_dataset_id_set_data ((l), g_quark_try_string ((k)), NULL)
/* GScanner: Flexible lexical scanner for general purpose. /* GScanner: Flexible lexical scanner for general purpose.

412
glib/gdataset.c
View File

@ -24,17 +24,18 @@
/* --- defines --- */ /* --- defines --- */
#define G_DATASET_BLOCK_SIZE (512) #define G_QUARK_BLOCK_SIZE (512)
#define G_DATASET_MEM_CHUNK_PREALLOC (64) #define G_DATA_MEM_CHUNK_PREALLOC (128)
#define G_DATASET_DATA_MEM_CHUNK_PREALLOC (128) #define G_DATA_CACHE_MAX (512)
#define G_DATASET_MEM_CHUNK_PREALLOC (32)
/* --- structures --- */ /* --- structures --- */
typedef struct _GDatasetData GDatasetData; typedef struct _GData GData;
typedef struct _GDataset GDataset; typedef struct _GDataset GDataset;
struct _GDatasetData struct _GData
{ {
GDatasetData *next; GData *next;
guint id; guint id;
gpointer data; gpointer data;
GDestroyNotify destroy_func; GDestroyNotify destroy_func;
@ -43,15 +44,21 @@ struct _GDatasetData
struct _GDataset struct _GDataset
{ {
gconstpointer location; gconstpointer location;
GDatasetData *data_list; gpointer datalist;
}; };
/* --- prototypes --- */ /* --- prototypes --- */
static inline GDataset* g_dataset_lookup (gconstpointer dataset_location); static inline GDataset* g_dataset_lookup (gconstpointer dataset_location);
static inline void g_dataset_destroy_i (GDataset *dataset); static inline void g_datalist_clear_i (gpointer *datalist);
static void g_dataset_initialize (void); static void g_dataset_destroy_internal (GDataset *dataset);
static inline GQuark g_quark_new (const gchar *string); static inline void g_data_set_internal (gpointer *datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func,
GDataset *d_dataset);
static void g_data_initialize (void);
static inline GQuark g_quark_new (const gchar *string);
/* --- variables --- */ /* --- variables --- */
@ -61,11 +68,52 @@ static GQuark g_quark_seq_id = 0;
static GHashTable *g_dataset_location_ht = NULL; static GHashTable *g_dataset_location_ht = NULL;
static GDataset *g_dataset_cached = NULL; static GDataset *g_dataset_cached = NULL;
static GMemChunk *g_dataset_mem_chunk = NULL; static GMemChunk *g_dataset_mem_chunk = NULL;
static GMemChunk *g_dataset_data_mem_chunk = NULL; static GMemChunk *g_data_mem_chunk = NULL;
static GData *g_data_cache = NULL;
static guint g_data_cache_length = 0;
/* --- functions --- */ /* --- functions --- */
static inline void
g_datalist_clear_i (gpointer *datalist)
{
register GData *list;
/* unlink *all* items before walking their destructors
*/
list = *datalist;
*datalist = NULL;
while (list)
{
register GData *prev;
prev = list;
list = prev->next;
if (prev->destroy_func)
prev->destroy_func (prev->data);
if (g_data_cache_length < G_DATA_CACHE_MAX)
{
prev->next = g_data_cache;
g_data_cache = prev;
g_data_cache_length++;
}
else
g_mem_chunk_free (g_data_mem_chunk, prev);
}
}
void
g_datalist_clear (gpointer *datalist)
{
g_return_if_fail (datalist != NULL);
while (*datalist)
g_datalist_clear_i (datalist);
}
static inline GDataset* static inline GDataset*
g_dataset_lookup (gconstpointer dataset_location) g_dataset_lookup (gconstpointer dataset_location)
{ {
@ -74,9 +122,6 @@ g_dataset_lookup (gconstpointer dataset_location)
if (g_dataset_cached && g_dataset_cached->location == dataset_location) if (g_dataset_cached && g_dataset_cached->location == dataset_location)
return g_dataset_cached; return g_dataset_cached;
if (!g_dataset_location_ht)
g_dataset_initialize ();
dataset = g_hash_table_lookup (g_dataset_location_ht, dataset_location); dataset = g_hash_table_lookup (g_dataset_location_ht, dataset_location);
if (dataset) if (dataset)
g_dataset_cached = dataset; g_dataset_cached = dataset;
@ -84,30 +129,19 @@ g_dataset_lookup (gconstpointer dataset_location)
return dataset; return dataset;
} }
static inline void static void
g_dataset_destroy_i (GDataset *dataset) g_dataset_destroy_internal (GDataset *dataset)
{ {
register GDatasetData *list; gpointer datalist;
if (dataset == g_dataset_cached) if (dataset == g_dataset_cached)
g_dataset_cached = NULL; g_dataset_cached = NULL;
g_hash_table_remove (g_dataset_location_ht, dataset->location); g_hash_table_remove (g_dataset_location_ht, dataset->location);
list = dataset->data_list; datalist = dataset->datalist;
g_mem_chunk_free (g_dataset_mem_chunk, dataset); g_mem_chunk_free (g_dataset_mem_chunk, dataset);
while (list) g_datalist_clear_i (&datalist);
{
register GDatasetData *prev;
prev = list;
list = prev->next;
if (prev->destroy_func)
prev->destroy_func (prev->data);
g_mem_chunk_free (g_dataset_data_mem_chunk, prev);
}
} }
void void
@ -117,91 +151,27 @@ g_dataset_destroy (gconstpointer dataset_location)
g_return_if_fail (dataset_location != NULL); g_return_if_fail (dataset_location != NULL);
dataset = g_dataset_lookup (dataset_location); if (g_dataset_location_ht)
if (dataset)
g_dataset_destroy_i (dataset);
}
void
g_dataset_id_set_destroy (gconstpointer dataset_location,
GQuark key_id,
GDestroyNotify destroy_func)
{
g_return_if_fail (dataset_location != NULL);
if (key_id)
{ {
register GDataset *dataset;
dataset = g_dataset_lookup (dataset_location); dataset = g_dataset_lookup (dataset_location);
if (dataset) if (dataset)
{ g_dataset_destroy_internal (dataset);
register GDatasetData *list;
list = dataset->data_list;
while (list)
{
if (list->id == key_id)
{
list->destroy_func = destroy_func;
return;
}
}
}
} }
} }
gpointer static inline void
g_dataset_id_get_data (gconstpointer dataset_location, g_data_set_internal (gpointer *datalist,
GQuark key_id) GQuark key_id,
gpointer data,
GDestroyNotify destroy_func,
GDataset *d_dataset)
{ {
g_return_val_if_fail (dataset_location != NULL, NULL); register GData *list;
if (key_id) list = *datalist;
{
register GDataset *dataset;
dataset = g_dataset_lookup (dataset_location);
if (dataset)
{
register GDatasetData *list;
for (list = dataset->data_list; list; list = list->next)
if (list->id == key_id)
return list->data;
}
}
return NULL;
}
void
g_dataset_id_set_data_full (gconstpointer dataset_location,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func)
{
register GDataset *dataset;
register GDatasetData *list;
g_return_if_fail (dataset_location != NULL);
g_return_if_fail (key_id > 0);
dataset = g_dataset_lookup (dataset_location);
if (!dataset)
{
dataset = g_chunk_new (GDataset, g_dataset_mem_chunk);
dataset->location = dataset_location;
dataset->data_list = NULL;
g_hash_table_insert (g_dataset_location_ht,
(gpointer) dataset->location, /* Yuck */
dataset);
}
list = dataset->data_list;
if (!data) if (!data)
{ {
register GDatasetData *prev; register GData *prev;
prev = NULL; prev = NULL;
while (list) while (list)
@ -212,18 +182,29 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
prev->next = list->next; prev->next = list->next;
else else
{ {
dataset->data_list = list->next; *datalist = list->next;
if (!dataset->data_list) /* the dataset destruction *must* be done
g_dataset_destroy_i (dataset); * prior to invokation of the data destroy function
*/
if (!*datalist && d_dataset)
g_dataset_destroy_internal (d_dataset);
} }
/* we need to have unlinked before invoking the destroy function /* the GData struct *must* already be unlinked
* when invoking the destroy function
*/ */
if (list->destroy_func) if (list->destroy_func)
list->destroy_func (list->data); list->destroy_func (list->data);
g_mem_chunk_free (g_dataset_data_mem_chunk, list); if (g_data_cache_length < G_DATA_CACHE_MAX)
{
list->next = g_data_cache;
g_data_cache = list;
g_data_cache_length++;
}
else
g_mem_chunk_free (g_data_mem_chunk, list);
return; return;
} }
@ -238,19 +219,26 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
{ {
if (list->id == key_id) if (list->id == key_id)
{ {
register GDestroyNotify dfunc; if (!list->destroy_func)
register gpointer ddata; {
list->data = data;
list->destroy_func = destroy_func;
}
else
{
register GDestroyNotify dfunc;
register gpointer ddata;
dfunc = list->destroy_func; dfunc = list->destroy_func;
ddata = list->data; ddata = list->data;
list->data = data; list->data = data;
list->destroy_func = destroy_func; list->destroy_func = destroy_func;
/* we need to have updated all structures prior to /* we need to have updated all structures prior to
* invokation of the destroy function * invokation of the destroy function
*/ */
if (dfunc) dfunc (ddata);
dfunc (ddata); }
return; return;
} }
@ -258,17 +246,171 @@ g_dataset_id_set_data_full (gconstpointer dataset_location,
list = list->next; list = list->next;
} }
list = g_chunk_new (GDatasetData, g_dataset_data_mem_chunk); if (g_data_cache)
list->next = dataset->data_list; {
list = g_data_cache;
g_data_cache = list->next;
g_data_cache_length--;
}
else
list = g_chunk_new (GData, g_data_mem_chunk);
list->next = *datalist;
list->id = key_id; list->id = key_id;
list->data = data; list->data = data;
list->destroy_func = destroy_func; list->destroy_func = destroy_func;
dataset->data_list = list; *datalist = list;
} }
} }
void
g_dataset_id_set_data_full (gconstpointer dataset_location,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func)
{
register GDataset *dataset;
g_return_if_fail (dataset_location != NULL);
if (!key_id)
{
if (data)
g_return_if_fail (key_id > 0);
else
return;
}
if (!g_dataset_location_ht)
g_data_initialize ();
dataset = g_dataset_lookup (dataset_location);
if (!dataset)
{
dataset = g_chunk_new (GDataset, g_dataset_mem_chunk);
dataset->location = dataset_location;
dataset->datalist = NULL;
g_hash_table_insert (g_dataset_location_ht,
(gpointer) dataset->location,
dataset);
}
g_data_set_internal (&dataset->datalist, key_id, data, destroy_func, dataset);
}
void
g_datalist_id_set_data_full (gpointer *datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func)
{
g_return_if_fail (datalist != NULL);
if (!key_id)
{
if (data)
g_return_if_fail (key_id > 0);
else
return;
}
g_data_set_internal (datalist, key_id, data, destroy_func, NULL);
}
void
g_dataset_id_set_destroy (gconstpointer dataset_location,
GQuark key_id,
GDestroyNotify destroy_func)
{
register GDataset *dataset;
g_return_if_fail (dataset_location != NULL);
g_return_if_fail (key_id > 0);
if (g_dataset_location_ht)
{
dataset = g_dataset_lookup (dataset_location);
if (dataset)
{
register GData *list;
for (list = dataset->datalist; list; list = list->next)
if (list->id == key_id)
{
list->destroy_func = destroy_func;
break;
}
}
}
}
void
g_datalist_id_set_destroy (gpointer *datalist,
GQuark key_id,
GDestroyNotify destroy_func)
{
register GData *list;
g_return_if_fail (datalist != NULL);
g_return_if_fail (key_id > 0);
for (list = *datalist; list; list = list->next)
if (list->id == key_id)
{
list->destroy_func = destroy_func;
break;
}
}
gpointer
g_dataset_id_get_data (gconstpointer dataset_location,
GQuark key_id)
{
g_return_val_if_fail (dataset_location != NULL, NULL);
if (key_id && g_dataset_location_ht)
{
register GDataset *dataset;
dataset = g_dataset_lookup (dataset_location);
if (dataset)
{
register GData *list;
for (list = dataset->datalist; list; list = list->next)
if (list->id == key_id)
return list->data;
}
}
return NULL;
}
gpointer
g_datalist_id_get_data (gpointer *datalist,
GQuark key_id)
{
g_return_val_if_fail (datalist != NULL, NULL);
if (key_id)
{
register GData *list;
for (list = *datalist; list; list = list->next)
if (list->id == key_id)
return list->data;
}
return NULL;
}
void
g_datalist_init (gpointer *datalist)
{
g_return_if_fail (datalist != NULL);
*datalist = NULL;
}
static void static void
g_dataset_initialize (void) g_data_initialize (void)
{ {
if (!g_dataset_location_ht) if (!g_dataset_location_ht)
{ {
@ -280,10 +422,10 @@ g_dataset_initialize (void)
sizeof (GDataset), sizeof (GDataset),
sizeof (GDataset) * G_DATASET_MEM_CHUNK_PREALLOC, sizeof (GDataset) * G_DATASET_MEM_CHUNK_PREALLOC,
G_ALLOC_AND_FREE); G_ALLOC_AND_FREE);
g_dataset_data_mem_chunk = g_data_mem_chunk =
g_mem_chunk_new ("GDatasetData MemChunk", g_mem_chunk_new ("GData MemChunk",
sizeof (GDatasetData), sizeof (GData),
sizeof (GDatasetData) * G_DATASET_DATA_MEM_CHUNK_PREALLOC, sizeof (GData) * G_DATA_MEM_CHUNK_PREALLOC,
G_ALLOC_AND_FREE); G_ALLOC_AND_FREE);
} }
} }
@ -307,7 +449,7 @@ g_quark_from_string (const gchar *string)
g_return_val_if_fail (string != NULL, 0); g_return_val_if_fail (string != NULL, 0);
if (!g_quark_ht) if (!g_quark_ht)
g_dataset_initialize (); g_data_initialize ();
quark = (gulong) g_hash_table_lookup (g_quark_ht, string); quark = (gulong) g_hash_table_lookup (g_quark_ht, string);
if (!quark) if (!quark)
@ -324,7 +466,7 @@ g_quark_from_static_string (const gchar *string)
g_return_val_if_fail (string != NULL, 0); g_return_val_if_fail (string != NULL, 0);
if (!g_quark_ht) if (!g_quark_ht)
g_dataset_initialize (); g_data_initialize ();
quark = (gulong) g_hash_table_lookup (g_quark_ht, string); quark = (gulong) g_hash_table_lookup (g_quark_ht, string);
if (!quark) if (!quark)
@ -347,9 +489,9 @@ g_quark_new (const gchar *string)
{ {
GQuark quark; GQuark quark;
if (g_quark_seq_id % G_DATASET_BLOCK_SIZE == 0) if (g_quark_seq_id % G_QUARK_BLOCK_SIZE == 0)
g_quarks = g_realloc (g_quarks, g_quarks = g_realloc (g_quarks,
(g_quark_seq_id + G_DATASET_BLOCK_SIZE) * sizeof (gchar*)); (g_quark_seq_id + G_QUARK_BLOCK_SIZE) * sizeof (gchar*));
g_quarks[g_quark_seq_id] = (gchar*) string; g_quarks[g_quark_seq_id] = (gchar*) string;

41
glib/glib.h
View File

@ -1441,7 +1441,36 @@ GQuark g_quark_from_string (const gchar *string);
gchar* g_quark_to_string (GQuark quark); gchar* g_quark_to_string (GQuark quark);
/* Location Associated Data /* Keyed Data List
*/
void g_datalist_init (gpointer *datalist);
void g_datalist_clear (gpointer *datalist);
gpointer g_datalist_id_get_data (gpointer *datalist,
GQuark key_id);
void g_datalist_id_set_data_full (gpointer *datalist,
GQuark key_id,
gpointer data,
GDestroyNotify destroy_func);
void g_datalist_id_set_destroy (gpointer *datalist,
GQuark key_id,
GDestroyNotify destroy_func);
#define g_datalist_id_set_data(dl, q, d) \
g_datalist_id_set_data_full ((dl), (q), (d), NULL)
#define g_datalist_id_remove_data(dl, q) \
g_datalist_id_set_data ((dl), (q), NULL)
#define g_datalist_get_data(dl, k) \
(g_datalist_id_get_data ((dl), g_quark_try_string ((k))))
#define g_datalist_set_data_full(dl, k, d, f) \
g_datalist_id_set_data_full ((dl), g_quark_from_string ((k)), (d), (f))
#define g_datalist_set_destroy(dl, k, f) \
g_datalist_id_set_destroy ((dl), g_quark_try_string ((k)), (f))
#define g_datalist_set_data(dl, k, d) \
g_datalist_set_data_full ((dl), (k), (d), NULL)
#define g_datalist_remove_data(dl, k) \
g_datalist_id_set_data ((dl), g_quark_try_string ((k)), NULL)
/* Location Associated Keyed Data
*/ */
void g_dataset_destroy (gconstpointer dataset_location); void g_dataset_destroy (gconstpointer dataset_location);
gpointer g_dataset_id_get_data (gconstpointer dataset_location, gpointer g_dataset_id_get_data (gconstpointer dataset_location,
@ -1458,15 +1487,15 @@ void g_dataset_id_set_destroy (gconstpointer dataset_location,
#define g_dataset_id_remove_data(l, k) \ #define g_dataset_id_remove_data(l, k) \
g_dataset_id_set_data ((l), (k), NULL) g_dataset_id_set_data ((l), (k), NULL)
#define g_dataset_get_data(l, k) \ #define g_dataset_get_data(l, k) \
(g_dataset_id_get_data ((l), g_quark_try_string (k))) (g_dataset_id_get_data ((l), g_quark_try_string ((k))))
#define g_dataset_set_data_full(l, k, d, f) \ #define g_dataset_set_data_full(l, k, d, f) \
g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f)) g_dataset_id_set_data_full ((l), g_quark_from_string ((k)), (d), (f))
#define g_dataset_set_destroy(l, k, f) \ #define g_dataset_set_destroy(l, k, f) \
g_dataset_id_set_destroy ((l), g_quark_from_string (k), (f)) g_dataset_id_set_destroy ((l), g_quark_try_string ((k)), (f))
#define g_dataset_set_data(l, k, d) \ #define g_dataset_set_data(l, k, d) \
g_dataset_set_data_full ((l), (k), (d), NULL) g_dataset_set_data_full ((l), (k), (d), NULL)
#define g_dataset_remove_data(l,k) \ #define g_dataset_remove_data(l, k) \
g_dataset_set_data ((l), (k), NULL) g_dataset_id_set_data ((l), g_quark_try_string ((k)), NULL)
/* GScanner: Flexible lexical scanner for general purpose. /* GScanner: Flexible lexical scanner for general purpose.

10
gmodule/ChangeLog
View File

@ -1,3 +1,11 @@
Thu Sep 17 06:34:22 1998 Tim Janik <timj@gtk.org>
* gmodule.h:
* gmodule.c: implemented g_module_make_resident() which can be
used to make modules resident.
fixed a buglet about the optional "g_module_de_init" function in
modules, which could get invoked twice on very obscure occasions.
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com> Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am: Update to libtool-1.2b, * Makefile.am: Update to libtool-1.2b,
@ -51,7 +59,7 @@ Sun Aug 9 15:57:38 1998 Tim Janik <timj@gtk.org>
* gmodule.h: * gmodule.h:
* gmodule.c: GModule library implementation, which is basically * gmodule.c: GModule library implementation, which is basically
a wrapper about system specifc dynamic loading functions. a wrapper about system specifc dynamic loading facilities.
Sun Aug 9 10:31:05 1998 Tim Janik <timj@gtk.org> Sun Aug 9 10:31:05 1998 Tim Janik <timj@gtk.org>

29
gmodule/gmodule.c
View File

@ -36,7 +36,8 @@ struct _GModule
{ {
gchar *file_name; gchar *file_name;
gpointer handle; gpointer handle;
guint ref_count; guint ref_count : 31;
guint is_resident : 1;
GModuleDeInit de_init; GModuleDeInit de_init;
GModule *next; GModule *next;
}; };
@ -164,6 +165,7 @@ g_module_open (const gchar *file_name,
main_module->file_name = NULL; main_module->file_name = NULL;
main_module->handle = handle; main_module->handle = handle;
main_module->ref_count = 1; main_module->ref_count = 1;
main_module->is_resident = TRUE;
main_module->de_init = NULL; main_module->de_init = NULL;
main_module->next = NULL; main_module->next = NULL;
} }
@ -208,6 +210,7 @@ g_module_open (const gchar *file_name,
module->file_name = g_strdup (file_name); module->file_name = g_strdup (file_name);
module->handle = handle; module->handle = handle;
module->ref_count = 1; module->ref_count = 1;
module->is_resident = FALSE;
module->de_init = NULL; module->de_init = NULL;
module->next = modules; module->next = modules;
modules = module; modules = module;
@ -246,12 +249,18 @@ g_module_close (GModule *module)
g_return_val_if_fail (module != NULL, FALSE); g_return_val_if_fail (module != NULL, FALSE);
g_return_val_if_fail (module->ref_count > 0, FALSE); g_return_val_if_fail (module->ref_count > 0, FALSE);
if (module != main_module) module->ref_count--;
module->ref_count--;
if (!module->ref_count && module->de_init) if (!module->ref_count && !module->is_resident && module->de_init)
module->de_init (module); {
if (!module->ref_count) GModuleDeInit de_init;
de_init = module->de_init;
module->de_init = NULL;
de_init (module);
}
if (!module->ref_count && !module->is_resident)
{ {
GModule *last; GModule *last;
GModule *node; GModule *node;
@ -282,6 +291,14 @@ g_module_close (GModule *module)
return module_error == NULL; return module_error == NULL;
} }
void
g_module_make_resident (GModule *module)
{
g_return_if_fail (module != NULL);
module->is_resident = TRUE;
}
gchar* gchar*
g_module_error (void) g_module_error (void)
{ {

3
gmodule/gmodule.h
View File

@ -56,6 +56,9 @@ GModule* g_module_open (const gchar *file_name,
/* close a previously opened module, returns TRUE on success */ /* close a previously opened module, returns TRUE on success */
gboolean g_module_close (GModule *module); gboolean g_module_close (GModule *module);
/* make a module resident so g_module_close on it will be ignored */
void g_module_make_resident (GModule *module);
/* query the last module error as a string */ /* query the last module error as a string */
gchar* g_module_error (void); gchar* g_module_error (void);