enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Revert local hash cache 

SVN revision: 56623
This commit is contained in:
Sebastian Dransfeld 2011-02-01 09:23:05 +00:00
parent e13a158ef4
commit 3bf3e34ff4
6 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/efreet/ChangeLog
View File

@ -25,3 +25,7 @@
because of mmap and stringshare.
* Add local icon cache, so we wont hit the cache file for each icon
to be retrieved
2011-02-01 Sebastian Dransfeld
* Revert hash cache, it causes corruption

4
legacy/efreet/src/bin/efreet_icon_cache_create.c
View File

@ -840,7 +840,7 @@ main(int argc, char **argv)
}
eina_hash_free(themes);
eina_hash_free(icons);
efreet_hash_free(icons, EINA_FREE_CB(efreet_cache_icon_free));
if (theme->changed || changed)
{
@ -914,7 +914,7 @@ main(int argc, char **argv)
}
}
eina_hash_free(icons);
efreet_hash_free(icons, EINA_FREE_CB(efreet_cache_icon_fallback_free));
eet_data_write(theme_ef, theme_edd, EFREET_CACHE_ICON_FALLBACK, theme, 1);
icon_theme_free(theme);

53
legacy/efreet/src/lib/efreet_cache.c
View File

@ -2,10 +2,7 @@
# include <config.h>
#endif
/* TODO: Consider flushing local icons cache after idling.
* Icon requests will probably come in batches, f.ex. during menu
* browsing.
*/
/* TODO: Add local hash cache for icons */
/* TODO: Pass extra icon dirs to cache process */
/* TODO: Pass icon extensions to cache process */
@ -52,9 +49,6 @@ static Eet_File *icon_cache = NULL;
static Eet_File *fallback_cache = NULL;
static Eet_File *icon_theme_cache = NULL;
static Eina_Hash *icons = NULL;
static Eina_Hash *fallbacks = NULL;
static const char *icon_theme_cache_file = NULL;
static const char *theme_name = NULL;
@ -82,8 +76,6 @@ static int desktop_cache_exe_lock = -1;
static Eina_List *old_desktop_caches = NULL;
static void efreet_cache_edd_shutdown(void);
static void efreet_cache_icon_free(Efreet_Cache_Icon *icon);
static void efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon);
static Eina_Bool cache_exe_cb(void *data, int type, void *event);
static void cache_update_cb(void *data, Ecore_File_Monitor *em,
@ -109,9 +101,6 @@ efreet_cache_init(void)
EFREET_EVENT_ICON_CACHE_UPDATE = ecore_event_type_new();
EFREET_EVENT_DESKTOP_CACHE_UPDATE = ecore_event_type_new();
icons = eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_free));
fallbacks = eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_fallback_free));
snprintf(buf, sizeof(buf), "%s/efreet", efreet_cache_home_get());
if (!ecore_file_mkpath(buf)) goto error;
@ -150,9 +139,6 @@ efreet_cache_shutdown(void)
icon_cache = efreet_cache_close(icon_cache);
icon_theme_cache = efreet_cache_close(icon_theme_cache);
IF_FREE_HASH(icons);
IF_FREE_HASH(fallbacks);
desktop_cache = efreet_cache_close(desktop_cache);
IF_RELEASE(desktop_cache_file);
IF_RELEASE(desktop_cache_dirs);
@ -568,13 +554,15 @@ efreet_desktop_edd(void)
return desktop_edd;
}
static void
/*
* Needs EAPI because of helper binaries
*/
EAPI void
efreet_cache_icon_free(Efreet_Cache_Icon *icon)
{
unsigned int i;
if (!icon) return;
if (icon == NON_EXISTING) return;
for (i = 0; i < icon->icons_count; ++i)
{
@ -586,11 +574,10 @@ efreet_cache_icon_free(Efreet_Cache_Icon *icon)
free(icon);
}
static void
EAPI void
efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon)
{
if (!icon) return;
if (icon == NON_EXISTING) return;
free(icon->icons);
free(icon);
@ -599,51 +586,27 @@ efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon)
Efreet_Cache_Icon *
efreet_cache_icon_find(Efreet_Icon_Theme *theme, const char *icon)
{
Efreet_Cache_Icon *cache = NULL;
if (theme_name && strcmp(theme_name, theme->name.internal))
{
/* FIXME: this is bad if people have pointer to this cache, things will go wrong */
INFO("theme_name change from `%s` to `%s`", theme_name, theme->name.internal);
IF_RELEASE(theme_name);
icon_cache = efreet_cache_close(icon_cache);
eina_hash_free(icons);
icons = eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_free));
}
if (!efreet_cache_check(&icon_cache, efreet_icon_cache_file(theme->name.internal), EFREET_ICON_CACHE_MAJOR)) return NULL;
if (!theme_name)
theme_name = eina_stringshare_add(theme->name.internal);
cache = eina_hash_find(icons, icon);
if (cache == NON_EXISTING) return NULL;
if (cache) return cache;
cache = eet_data_read(icon_cache, efreet_icon_edd(), icon);
if (cache)
eina_hash_add(icons, icon, cache);
else
eina_hash_add(icons, icon, NON_EXISTING);
return cache;
return eet_data_read(icon_cache, efreet_icon_edd(), icon);
}
Efreet_Cache_Fallback_Icon *
efreet_cache_icon_fallback_find(const char *icon)
{
Efreet_Cache_Fallback_Icon *cache;
if (!efreet_cache_check(&fallback_cache, efreet_icon_cache_file(EFREET_CACHE_ICON_FALLBACK), EFREET_ICON_CACHE_MAJOR)) return NULL;
cache = eina_hash_find(fallbacks, icon);
if (cache == NON_EXISTING) return NULL;
if (cache) return cache;
cache = eet_data_read(fallback_cache, efreet_icon_fallback_edd(), icon);
if (cache)
eina_hash_add(fallbacks, icon, cache);
else
eina_hash_add(fallbacks, icon, NON_EXISTING);
return cache;
return eet_data_read(fallback_cache, efreet_icon_fallback_edd(), icon);
}
Efreet_Icon_Theme *

6
legacy/efreet/src/lib/efreet_icon.c
View File

@ -342,6 +342,7 @@ efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int siz
cache = efreet_cache_icon_fallback_find(icon);
value = efreet_cache_icon_fallback_lookup_path(cache);
if (!value) INFO("lookup for `%s` failed in fallback too with %p.", icon, cache);
efreet_cache_icon_fallback_free(cache);
}
if (value == NON_EXISTING) value = NULL;
@ -397,6 +398,7 @@ efreet_icon_list_find(const char *theme_name, Eina_List *icons,
if (!strcmp(cache->theme, theme->name.internal))
{
value = efreet_cache_icon_lookup_icon(cache, size);
efreet_cache_icon_free(cache);
break;
}
else
@ -407,7 +409,8 @@ efreet_icon_list_find(const char *theme_name, Eina_List *icons,
{
if (!value)
value = efreet_cache_icon_list_lookup_icon(theme, tmps2, size);
eina_list_free(tmps2);
EINA_LIST_FREE(tmps2, cache)
efreet_cache_icon_free(cache);
}
#ifdef SLOPPY_SPEC
@ -426,6 +429,7 @@ efreet_icon_list_find(const char *theme_name, Eina_List *icons,
{
cache = efreet_cache_icon_fallback_find(icon);
value = efreet_cache_icon_fallback_lookup_path(cache);
efreet_cache_icon_fallback_free(cache);
if (value && (value != NON_EXISTING))
break;
}

2
legacy/efreet/src/lib/efreet_private.h
View File

@ -236,6 +236,8 @@ Efreet_Desktop *efreet_cache_desktop_find(const char *file);
EAPI const char *efreet_icon_cache_file(const char *theme);
EAPI const char *efreet_icon_theme_cache_file(void);
EAPI void efreet_cache_icon_free(Efreet_Cache_Icon *icon);
EAPI void efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon);
Efreet_Cache_Icon *efreet_cache_icon_find(Efreet_Icon_Theme *theme, const char *icon);
Efreet_Cache_Fallback_Icon *efreet_cache_icon_fallback_find(const char *icon);
Efreet_Icon_Theme *efreet_cache_icon_theme_find(const char *theme);

1
legacy/efreet/src/tests/efreet_icon_cache_dump.c
View File

@ -51,6 +51,7 @@ dump(Efreet_Icon_Theme *theme)
for (j = 0; j < icon->icons_count; ++j)
count += icon->icons[j]->paths_count;
efreet_cache_icon_free(icon);
}
free(keys);