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

Fix a bug when a file change when it's still in use. Thanks to Adriano Rezende for helping tracking the bug. 

SVN revision: 34513
This commit is contained in:
Cedric BAIL 2008-05-09 16:18:18 +00:00
parent cecac6f9d6
commit d31b0db3ca
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
legacy/evas/src/lib/cache/evas_cache_image.c vendored
View File

@ -53,13 +53,20 @@ _evas_cache_image_make_inactiv(Evas_Cache_Image *cache,
Image_Entry *im,
const char *key)
{
im->flags.activ = 0;
im->flags.dirty = 0;
im->flags.cached = 1;
cache->inactiv = evas_hash_direct_add(cache->inactiv, key, im);
cache->lru = evas_object_list_prepend(cache->lru, im);
cache->usage += cache->func.mem_size_get(im);
}
if (im->cache_key)
{
im->flags.activ = 0;
im->flags.dirty = 0;
im->flags.cached = 1;
cache->inactiv = evas_hash_direct_add(cache->inactiv, key, im);
cache->lru = evas_object_list_prepend(cache->lru, im);
cache->usage += cache->func.mem_size_get(im);
}
else
{
_evas_cache_image_entry_delete(cache, im);
}
}
static void
_evas_cache_image_remove_lru_nodata(Evas_Cache_Image *cache,
@ -381,6 +388,9 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
if (st.st_mtime != im->timestamp) ok = 0;
}
if (ok) goto on_ok;
_evas_cache_image_remove_activ(cache, im);
_evas_cache_image_make_dirty(cache, im);
}
im = evas_hash_find(cache->inactiv, hkey);
@ -452,16 +462,16 @@ evas_cache_image_drop(Image_Entry *im)
im->references--;
cache = im->cache;
if (im->flags.dirty)
{
_evas_cache_image_entry_delete(cache, im);
return ;
}
if (im->references == 0)
{
if (im->flags.dirty)
{
_evas_cache_image_entry_delete(cache, im);
return ;
}
_evas_cache_image_remove_activ(cache, im);
_evas_cache_image_make_inactiv(cache, im, im->cache_key);
_evas_cache_image_make_inactiv(cache, im, im->cache_key);
evas_cache_image_flush(cache);
}
}