NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "efreetd - reduce memory usage by using stringshare much more" 

partially reverts e4d815dc48

this caused efreetd to crash almost immediately due to non-stringshared
strings being used in a stringshare-only hash data descriptor
This commit is contained in:
Mike Blumenkrantz 2016-05-02 21:00:39 -04:00
parent ba20e94201
commit 50ab1a0e55
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/efreet/efreetd_cache.c
View File

@ -89,7 +89,7 @@ subdir_cache_dir_free(Subdir_Cache_Dir *cd)
static void *
subdir_cache_hash_add(void *hash, const char *key, void *data)
{
if (!hash) hash = eina_hash_stringshared_new(EINA_FREE_CB(subdir_cache_dir_free));
if (!hash) hash = eina_hash_string_superfast_new(EINA_FREE_CB(subdir_cache_dir_free));
if (!hash) return NULL;
eina_hash_add(hash, key, data);
return hash;
@ -140,7 +140,7 @@ subdir_cache_init(void)
// if we don't have a hash in the subdir cache - allocate it
if (!subdir_cache->dirs)
subdir_cache->dirs = eina_hash_stringshared_new(EINA_FREE_CB(subdir_cache_dir_free));
subdir_cache->dirs = eina_hash_string_superfast_new(EINA_FREE_CB(subdir_cache_dir_free));
}
static void
@ -303,7 +303,7 @@ icon_cache_update_cache_cb(void *data EINA_UNUSED)
if ((!icon_flush) && (!icon_exts)) return ECORE_CALLBACK_CANCEL;
if (icon_change_monitors) eina_hash_free(icon_change_monitors);
icon_change_monitors = eina_hash_stringshared_new
icon_change_monitors = eina_hash_string_superfast_new
(EINA_FREE_CB(ecore_file_monitor_del));
icon_changes_listen();
subdir_cache_save();
@ -360,7 +360,7 @@ desktop_cache_update_cache_cb(void *data EINA_UNUSED)
desktop_queue = EINA_FALSE;
if (desktop_change_monitors) eina_hash_free(desktop_change_monitors);
desktop_change_monitors = eina_hash_stringshared_new
desktop_change_monitors = eina_hash_string_superfast_new
(EINA_FREE_CB(ecore_file_monitor_del));
desktop_changes_listen();
subdir_cache_save();
@ -867,9 +867,9 @@ cache_init(void)
goto error;
}
icon_change_monitors = eina_hash_stringshared_new
icon_change_monitors = eina_hash_string_superfast_new
(EINA_FREE_CB(ecore_file_monitor_del));
desktop_change_monitors = eina_hash_stringshared_new
desktop_change_monitors = eina_hash_string_superfast_new
(EINA_FREE_CB(ecore_file_monitor_del));
efreet_cache_update = 0;