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

eina: fix dead lock issue. This is hidding a bug with eina_hash_pointer_new. 

SVN revision: 69338
This commit is contained in:
Cedric BAIL 2012-03-14 15:35:12 +00:00
parent c001712874
commit 4a5fab140b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/eina/src/lib/eina_file.c
View File

@ -1058,7 +1058,7 @@ eina_file_close(Eina_File *file)
eina_hash_del(_eina_file_cache, file->filename, file);
_eina_file_real_close(file);
eina_lock_release(&_eina_file_lock_cache);
}
@ -1225,7 +1225,7 @@ eina_file_map_free(Eina_File *file, void *map)
unsigned long int key[2];
em = eina_hash_find(file->rmap, &map);
if (!em) return ;
if (!em) goto on_exit;
em->refcount--;
@ -1246,17 +1246,25 @@ EAPI Eina_Bool
eina_file_map_faulted(Eina_File *file, void *map)
{
Eina_File_Map *em;
Eina_Bool r = EINA_FALSE;
EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
eina_lock_take(&file->lock);
if (file->global_map == map) return file->global_faulty;
if (file->global_map == map)
{
r = file->global_faulty;
}
else
{
em = eina_hash_find(file->rmap, &map);
if (em) r = em->faulty;
}
em = eina_hash_find(file->rmap, &map);
if (!em) return EINA_FALSE;
eina_lock_release(&file->lock);
return em->faulty;
return r;
}
EAPI Eina_Iterator *