eina: win32 and linux version code are the same. Sharing code is better.

This commit is contained in:
Cedric BAIL 2014-07-14 12:54:02 +02:00
parent f15fc9b0a5
commit 72aca66f8d
3 changed files with 55 additions and 103 deletions

View File

@ -418,57 +418,6 @@ slprintf(char *str, size_t size, const char *format, ...)
* Global *
*============================================================================*/
Eina_Bool
eina_file_init(void)
{
_eina_file_log_dom = eina_log_domain_register("eina_file",
EINA_LOG_COLOR_DEFAULT);
if (_eina_file_log_dom < 0)
{
EINA_LOG_ERR("Could not register log domain: eina_file");
return EINA_FALSE;
}
_eina_file_cache = eina_hash_string_djb2_new(NULL);
if (!_eina_file_cache)
{
ERR("Could not create cache.");
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
return EINA_FALSE;
}
eina_lock_new(&_eina_file_lock_cache);
return EINA_TRUE;
}
Eina_Bool
eina_file_shutdown(void)
{
if (eina_hash_population(_eina_file_cache) > 0)
{
Eina_Iterator *it;
const char *key;
it = eina_hash_iterator_key_new(_eina_file_cache);
EINA_ITERATOR_FOREACH(it, key)
{
Eina_File *f = eina_hash_find(_eina_file_cache, key);
ERR("File [%s] still open %i times !", key, f->refcount);
}
eina_iterator_free(it);
}
eina_hash_free(_eina_file_cache);
eina_lock_free(&_eina_file_lock_cache);
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
return EINA_TRUE;
}
static Eina_Bool
_eina_file_mmap_faulty_one(void *addr, long page_size,
Eina_File_Map *m)

View File

@ -960,3 +960,58 @@ eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path)
return EINA_TRUE;
}
/*============================================================================*
* Global *
*============================================================================*/
Eina_Bool
eina_file_init(void)
{
_eina_file_log_dom = eina_log_domain_register("eina_file",
EINA_LOG_COLOR_DEFAULT);
if (_eina_file_log_dom < 0)
{
EINA_LOG_ERR("Could not register log domain: eina_file");
return EINA_FALSE;
}
_eina_file_cache = eina_hash_string_djb2_new(NULL);
if (!_eina_file_cache)
{
ERR("Could not create cache.");
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
return EINA_FALSE;
}
eina_lock_new(&_eina_file_lock_cache);
return EINA_TRUE;
}
Eina_Bool
eina_file_shutdown(void)
{
if (eina_hash_population(_eina_file_cache) > 0)
{
Eina_Iterator *it;
const char *key;
it = eina_hash_iterator_key_new(_eina_file_cache);
EINA_ITERATOR_FOREACH(it, key)
{
Eina_File *f = eina_hash_find(_eina_file_cache, key);
ERR("File [%s] still open %i times !", key, f->refcount);
}
eina_iterator_free(it);
}
eina_hash_free(_eina_file_cache);
eina_lock_free(&_eina_file_lock_cache);
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
return EINA_TRUE;
}

View File

@ -391,58 +391,6 @@ _eina_file_map_close(Eina_File_Map *map)
* @endcond
*/
/*============================================================================*
* Global *
*============================================================================*/
Eina_Bool
eina_file_init(void)
{
_eina_file_log_dom = eina_log_domain_register("eina_file",
EINA_LOG_COLOR_DEFAULT);
if (_eina_file_log_dom < 0)
{
EINA_LOG_ERR("Could not register log domain: eina_file");
return EINA_FALSE;
}
_eina_file_cache = eina_hash_string_djb2_new(NULL);
if (!_eina_file_cache)
{
ERR("Could not create cache.");
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
return EINA_FALSE;
}
eina_lock_new(&_eina_file_lock_cache);
return EINA_TRUE;
}
Eina_Bool
eina_file_shutdown(void)
{
if (eina_hash_population(_eina_file_cache) > 0)
{
Eina_Iterator *it;
const char *key;
it = eina_hash_iterator_key_new(_eina_file_cache);
EINA_ITERATOR_FOREACH(it, key)
ERR("File [%s] still open !", key);
eina_iterator_free(it);
}
eina_hash_free(_eina_file_cache);
eina_lock_free(&_eina_file_lock_cache);
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
return EINA_TRUE;
}
/* ================================================================ *
* Simplified logic for portability layer with eina_file_common *