enlightenment
/
efl
8
7
Fork 11
Code Issues 14 Pull Requests 6 Projects Releases Wiki Activity

efret: Save whether cache changed in update file.

Browse Source 
SVN revision: 62506
devs/devilhorns/wayland_egl
Sebastian Dransfeld 12 years ago
parent fa2a688b02
commit f696cd74bd
5 changed files with 128 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      legacy/efreet/ChangeLog
  2. 5
      legacy/efreet/src/bin/efreet_desktop_cache_create.c
  3. 5
      legacy/efreet/src/bin/efreet_icon_cache_create.c
  4. 2
      legacy/efreet/src/lib/efreet_base.h
  5. 200
      legacy/efreet/src/lib/efreet_cache.c

6
legacy/efreet/ChangeLog
Unescape View File

@ -86,7 +86,7 @@
* Fixed uri encoding when opening files.
2011-08-16 sebastian Dransfeld
2011-08-16 Sebastian Dransfeld
* Always rebuild cache from scratch when needed, but rely on correct
spec behaviour to check for theme changes. This will considerably
@ -94,3 +94,7 @@
correctness of the cache when changes occur. For example didn't the
previous behaviour handle file removal gracefully.
2011-08-16 Sebastian Dransfeld
* Save whether cache changed in update file, and propagate to update
event.

5
legacy/efreet/src/bin/efreet_desktop_cache_create.c
Unescape View File

@ -487,8 +487,11 @@ main(int argc, char **argv)
tmpfd = open(file, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
if (tmpfd >= 0)
{
char c = 'n';
efreet_fsetowner(tmpfd);
if (write(tmpfd, "a", 1) != 1) perror("write");
if (changed) c = 'c';
if (write(tmpfd, &c, 1) != 1) perror("write");
close(tmpfd);
}

5
legacy/efreet/src/bin/efreet_icon_cache_create.c
Unescape View File

@ -1102,8 +1102,11 @@ main(int argc, char **argv)
tmpfd = open(file, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
if (tmpfd >= 0)
{
char c = 'n';
efreet_fsetowner(tmpfd);
if (write(tmpfd, "a", 1) != 1) perror("write");
if (changed) c = 'c';
if (write(tmpfd, &c, 1) != 1) perror("write");
close(tmpfd);
}

2
legacy/efreet/src/lib/efreet_base.h
Unescape View File

@ -70,7 +70,7 @@ typedef struct _Efreet_Event_Cache_Update Efreet_Event_Cache_Update;
*/
struct _Efreet_Event_Cache_Update
{
int dummy;
int changed;
};
/**

200
legacy/efreet/src/lib/efreet_cache.c
Unescape View File

@ -99,6 +99,7 @@ static Eina_Bool efreet_cache_check(Eet_File **ef, const char *path, int major);
static void *efreet_cache_close(Eet_File *ef);
static Eina_Bool cache_exe_cb(void *data, int type, void *event);
static Eina_Bool cache_check_change(const char *path);
static void cache_update_cb(void *data, Ecore_File_Monitor *em,
Ecore_File_Event event, const char *path);
@ -1043,6 +1044,22 @@ cache_exe_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
cache_check_change(const char *path)
{
const char *data;
Eina_Bool changed = EINA_TRUE;
Eina_File *f;
f = eina_file_open(path, EINA_FALSE);
if (!f) return EINA_TRUE;
if (eina_file_size_get(f) < 1) return EINA_TRUE;
data = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
if (*data == 'n') changed = EINA_FALSE;
eina_file_close(f);
return changed;
}
static void
cache_update_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__,
Ecore_File_Event event, const char *path)
@ -1061,33 +1078,37 @@ cache_update_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__,
{
ev = NEW(Efreet_Event_Cache_Update, 1);
if (!ev) goto error;
ev->changed = 0;
if (cache_check_change(path))
{
IF_RELEASE(util_cache_names_key);
IF_RELEASE(util_cache_hash_key);
IF_RELEASE(util_cache_names_key);
IF_RELEASE(util_cache_hash_key);
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = desktops;
d->ef = desktop_cache;
old_desktop_caches = eina_list_append(old_desktop_caches, d);
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = desktops;
d->ef = desktop_cache;
old_desktop_caches = eina_list_append(old_desktop_caches, d);
efreet_cache_array_string_free(desktop_dirs);
desktop_dirs = NULL;
desktops = eina_hash_string_superfast_new(NULL);
desktop_cache = NULL;
efreet_cache_array_string_free(desktop_dirs);
desktop_dirs = NULL;
desktops = eina_hash_string_superfast_new(NULL);
desktop_cache = NULL;
efreet_cache_array_string_free(util_cache_names);
util_cache_names = NULL;
efreet_cache_array_string_free(util_cache_names);
util_cache_names = NULL;
if (util_cache_hash)
{
eina_hash_free(util_cache_hash->hash);
free(util_cache_hash);
util_cache_hash = NULL;
}
if (util_cache_hash)
{
eina_hash_free(util_cache_hash->hash);
free(util_cache_hash);
util_cache_hash = NULL;
util_cache = efreet_cache_close(util_cache);
ev->changed = 1;
}
util_cache = efreet_cache_close(util_cache);
ecore_event_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE, ev, desktop_cache_update_free, d);
/* TODO: Check if desktop_dirs_add exists, and rebuild cache if */
}
@ -1095,36 +1116,40 @@ cache_update_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__,
{
ev = NEW(Efreet_Event_Cache_Update, 1);
if (!ev) goto error;
IF_RELEASE(theme_name);
/* Save all old caches */
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = themes;
d->ef = icon_theme_cache;
l = eina_list_append(l, d);
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = icons;
d->ef = icon_cache;
l = eina_list_append(l, d);
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = fallbacks;
d->ef = fallback_cache;
l = eina_list_append(l, d);
/* Create new empty caches */
themes = eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_theme_free));
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));
icon_theme_cache = NULL;
icon_cache = NULL;
fallback_cache = NULL;
ev->changed = 0;
if (cache_check_change(path))
{
IF_RELEASE(theme_name);
/* Save all old caches */
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = themes;
d->ef = icon_theme_cache;
l = eina_list_append(l, d);
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = icons;
d->ef = icon_cache;
l = eina_list_append(l, d);
d = NEW(Efreet_Old_Cache, 1);
if (!d) goto error;
d->hash = fallbacks;
d->ef = fallback_cache;
l = eina_list_append(l, d);
/* Create new empty caches */
themes = eina_hash_string_superfast_new(EINA_FREE_CB(efreet_cache_icon_theme_free));
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));
icon_theme_cache = NULL;
icon_cache = NULL;
fallback_cache = NULL;
ev->changed = 1;
}
/* Send event */
ecore_event_add(EFREET_EVENT_ICON_CACHE_UPDATE, ev, icon_cache_update_free, l);
@ -1261,47 +1286,50 @@ desktop_cache_update_free(void *data, void *ev)
int dangling = 0;
d = data;
/*
* All users should now had the chance to update their pointers, so we can now
* free the old cache
*/
if (d->hash)
if (d)
{
Eina_Iterator *it;
Eina_Hash_Tuple *tuple;
/*
* All users should now had the chance to update their pointers, so we can now
* free the old cache
*/
if (d->hash)
{
Eina_Iterator *it;
Eina_Hash_Tuple *tuple;
it = eina_hash_iterator_tuple_new(d->hash);
EINA_ITERATOR_FOREACH(it, tuple)
{
if (tuple->data == NON_EXISTING) continue;
ERR("%d:%s still in cache on cache close!",
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
dangling++;
}
eina_iterator_free(it);
it = eina_hash_iterator_tuple_new(d->hash);
EINA_ITERATOR_FOREACH(it, tuple)
eina_hash_free(d->hash);
}
/*
* If there are dangling references the eet file won't be closed - to
* avoid crashes, but this will leak instead.
*/
if (dangling == 0)
{
if (tuple->data == NON_EXISTING) continue;
ERR("%d:%s still in cache on cache close!",
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
dangling++;
efreet_cache_close(d->ef);
}
eina_iterator_free(it);
eina_hash_free(d->hash);
}
/*
* If there are dangling references the eet file won't be closed - to
* avoid crashes, but this will leak instead.
*/
if (dangling == 0)
{
efreet_cache_close(d->ef);
}
else
{
/* TODO: Keep in old_desktop_caches, as we might close ref later */
ERR("There are still %i desktop files with old\n"
"dangling references to desktop files. This application\n"
"has not handled the EFREET_EVENT_DESKTOP_CACHE_UPDATE\n"
"fully and released its references. Please fix the application\n"
"so it does this.",
dangling);
else
{
/* TODO: Keep in old_desktop_caches, as we might close ref later */
ERR("There are still %i desktop files with old\n"
"dangling references to desktop files. This application\n"
"has not handled the EFREET_EVENT_DESKTOP_CACHE_UPDATE\n"
"fully and released its references. Please fix the application\n"
"so it does this.",
dangling);
}
old_desktop_caches = eina_list_remove(old_desktop_caches, d);
free(d);
}
old_desktop_caches = eina_list_remove(old_desktop_caches, d);
free(d);
free(ev);
}

Write Preview
Loading…
Cancel
Save