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

Edje needs to detect files changed on disk before considering cache. 

If file changed on disc (mtime), then make the reference dangling so
it is not reused anymore on subsequent open. If it is in cache, just
free it as it is not useful anymore.

This solves the following problem:


     edje_object_file_set(ed, path, group);
     ecore_file_cp(new_gen_file, path);
     edje_object_file_set(ed, path, group); /* still uses the old one! */


By: Bruno Dilly <bdilly@profusion.mobi>




SVN revision: 46548
This commit is contained in:
Gustavo Sverzut Barbieri 2010-02-27 03:47:04 +00:00
parent 08127ecc3e
commit 19a99eecab
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
legacy/edje/src/lib/edje_cache.c
View File

@ -189,6 +189,7 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co
edf->free_strings = eet_dictionary_get(ef) ? 0 : 1;
edf->ef = ef;
edf->mtime = st.st_mtime;
if (edf->version != EDJE_FILE_VERSION)
{
@ -231,6 +232,20 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co
return edf;
}
static void
_edje_file_dangling(Edje_File *edf)
{
if (edf->dangling) return;
edf->dangling = EINA_TRUE;
eina_hash_del(_edje_file_hash, edf->path, edf);
if (!eina_hash_population(_edje_file_hash))
{
eina_hash_free(_edje_file_hash);
_edje_file_hash = NULL;
}
}
Edje_File *
_edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret)
{
@ -238,6 +253,12 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
Eina_List *l, *hist;
Edje_Part_Collection *edc;
Edje_Part *ep;
struct stat st;
if (stat(file, &st) != 0)
{
return NULL;
}
if (!_edje_file_hash)
_edje_file_hash = eina_hash_string_small_new(NULL);
@ -245,6 +266,13 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
if (edf)
{
if (edf->mtime != st.st_mtime)
{
_edje_file_dangling(edf);
edf = NULL;
goto open_new;
}
edf->references++;
}
else
@ -253,6 +281,14 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
{
if (!strcmp(edf->path, file))
{
if (edf->mtime != st.st_mtime)
{
_edje_file_cache = eina_list_remove_list(_edje_file_cache, l);
_edje_file_free(edf);
edf = NULL;
goto open_new;
}
edf->references = 1;
_edje_file_cache = eina_list_remove_list(_edje_file_cache, l);
eina_hash_add(_edje_file_hash, file, edf);
@ -261,6 +297,8 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
edf = NULL;
}
}
open_new:
if (!edf)
{
edf = _edje_file_open(file, coll, error_ret, edc_ret);
@ -444,6 +482,12 @@ _edje_cache_file_unref(Edje_File *edf)
edf->references--;
if (edf->references != 0) return;
if (edf->dangling)
{
_edje_file_free(edf);
return;
}
eina_hash_del(_edje_file_hash, edf->path, edf);
if (!eina_hash_population(_edje_file_hash))
{

3
legacy/edje/src/lib/edje_private.h
View File

@ -17,6 +17,7 @@
#endif
#include <Eet.h>
#include <Embryo.h>
#include <time.h>
#include "Edje.h"
#include "Edje_Edit.h"
@ -288,6 +289,7 @@ typedef struct _Edje_Patterns Edje_Patterns;
struct _Edje_File
{
const char *path;
time_t mtime;
Edje_External_Directory *external_dir;
Edje_Font_Directory *font_dir;
@ -311,6 +313,7 @@ struct _Edje_File
Eet_File *ef;
unsigned int free_strings : 1;
unsigned int dangling : 1;
};
struct _Edje_Style