luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-07 00:03:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't use alloca and avoid allocating memory for small keys that are

Browse Source 
2006-12-14  Matthias Clasen  <mclasen@redhat.com>

	* glib/gconvert.c (open_converter): Don't use alloca
	and avoid allocating memory for small keys that are
	already cached.  (#172406, Morten Welinder)
This commit is contained in:
Matthias Clasen 2006-12-15 04:35:13 +00:00 committed by Matthias Clasen
parent 0c10536d2e
commit 0fffe4abc4
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2006-12-14 Matthias Clasen <mclasen@redhat.com> 2006-12-14 Matthias Clasen <mclasen@redhat.com>
* glib/gconvert.c (open_converter): Don't use alloca
and avoid allocating memory for small keys that are
already cached. (#172406, Morten Welinder)
* glib/gmain.c (g_child_watch_add_full): Improve the docs. * glib/gmain.c (g_child_watch_add_full): Improve the docs.
(#345569, Tim-Philipp Müller) (#345569, Tim-Philipp Müller)

34
glib/gconvert.c
View File

@ -2,7 +2,7 @@
* *
* gconvert.c: Convert between character sets using iconv * gconvert.c: Convert between character sets using iconv
* Copyright Red Hat Inc., 2000 * Copyright Red Hat Inc., 2000
* Authors: Havoc Pennington <hp@redhat.com>, Owen Taylor <otaylor@redhat.com * Authors: Havoc Pennington <hp@redhat.com>, Owen Taylor <otaylor@redhat.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -235,15 +235,17 @@ iconv_cache_init (void)
* Creates a new cache bucket, inserts it into the cache and * Creates a new cache bucket, inserts it into the cache and
* increments the cache size. * increments the cache size.
* *
* This assumes ownership of @key.
*
* Returns a pointer to the newly allocated cache bucket. * Returns a pointer to the newly allocated cache bucket.
**/ **/
static struct _iconv_cache_bucket * static struct _iconv_cache_bucket *
iconv_cache_bucket_new (const gchar *key, GIConv cd) iconv_cache_bucket_new (gchar *key, GIConv cd)
{ {
struct _iconv_cache_bucket *bucket; struct _iconv_cache_bucket *bucket;
bucket = g_new (struct _iconv_cache_bucket, 1); bucket = g_new (struct _iconv_cache_bucket, 1);
bucket->key = g_strdup (key); bucket->key = key;
bucket->refcount = 1; bucket->refcount = 1;
bucket->used = TRUE; bucket->used = TRUE;
bucket->cd = cd; bucket->cd = cd;
@ -336,12 +338,23 @@ open_converter (const gchar *to_codeset,
GError **error) GError **error)
{ {
struct _iconv_cache_bucket *bucket; struct _iconv_cache_bucket *bucket;
gchar *key; gchar *key, *dyn_key, auto_key[80];
GIConv cd; GIConv cd;
gsize len_from_codeset, len_to_codeset;
/* create our key */ /* create our key */
key = g_alloca (strlen (from_codeset) + strlen (to_codeset) + 2); len_from_codeset = strlen (from_codeset);
_g_sprintf (key, "%s:%s", from_codeset, to_codeset); len_to_codeset = strlen (to_codeset);
if (len_from_codeset + len_to_codeset + 2 < sizeof (auto_key))
{
key = auto_key;
dyn_key = NULL;
}
else
key = dyn_key = g_malloc (len_from_codeset + len_to_codeset + 2);
memcpy (key, from_codeset, len_from_codeset);
key[len_from_codeset] = ':';
strcpy (key + len_from_codeset + 1, to_codeset);
G_LOCK (iconv_cache_lock); G_LOCK (iconv_cache_lock);
@ -351,6 +364,8 @@ open_converter (const gchar *to_codeset,
bucket = g_hash_table_lookup (iconv_cache, key); bucket = g_hash_table_lookup (iconv_cache, key);
if (bucket) if (bucket)
{ {
g_free (dyn_key);
if (bucket->used) if (bucket->used)
{ {
cd = g_iconv_open (to_codeset, from_codeset); cd = g_iconv_open (to_codeset, from_codeset);
@ -380,11 +395,14 @@ open_converter (const gchar *to_codeset,
{ {
cd = g_iconv_open (to_codeset, from_codeset); cd = g_iconv_open (to_codeset, from_codeset);
if (cd == (GIConv) -1) if (cd == (GIConv) -1)
goto error; {
g_free (dyn_key);
goto error;
}
iconv_cache_expire_unused (); iconv_cache_expire_unused ();
bucket = iconv_cache_bucket_new (key, cd); bucket = iconv_cache_bucket_new (dyn_key ? dyn_key : g_strdup (key), cd);
} }
g_hash_table_insert (iconv_open_hash, cd, bucket->key); g_hash_table_insert (iconv_open_hash, cd, bucket->key);