Commit 31bdf4d2 authored by Cedric BAIL's avatar Cedric BAIL

eet: make eet_dictionary thread safe.


SVN revision: 71094
parent 11c2dc74
...@@ -586,3 +586,7 @@ ...@@ -586,3 +586,7 @@
2012-05-11 Cedric Bail 2012-05-11 Cedric Bail
* Force destruction of all pending file when shuting down eet. * Force destruction of all pending file when shuting down eet.
2012-05-15 Cedric Bail
* Make eet_dictionary thread safe.
...@@ -5,6 +5,7 @@ Changes since Eet 1.6.0: ...@@ -5,6 +5,7 @@ Changes since Eet 1.6.0:
Fixes: Fixes:
* Force destruction of all pending file when shuting down eet. * Force destruction of all pending file when shuting down eet.
* Make eet_dictionary thread safe.
Eet 1.6.0 Eet 1.6.0
......
...@@ -41,6 +41,7 @@ struct _Eet_Dictionary ...@@ -41,6 +41,7 @@ struct _Eet_Dictionary
{ {
Eet_String *all; Eet_String *all;
Eina_Hash *converts; Eina_Hash *converts;
Eina_Lock mutex;
int size; int size;
int offset; int offset;
......
...@@ -21,6 +21,7 @@ eet_dictionary_add(void) ...@@ -21,6 +21,7 @@ eet_dictionary_add(void)
return NULL; return NULL;
memset(new->hash, -1, sizeof (int) * 256); memset(new->hash, -1, sizeof (int) * 256);
eina_lock_new(&new->mutex);
return new; return new;
} }
...@@ -32,6 +33,8 @@ eet_dictionary_free(Eet_Dictionary *ed) ...@@ -32,6 +33,8 @@ eet_dictionary_free(Eet_Dictionary *ed)
if (!ed) return; if (!ed) return;
eina_lock_free(&ed->mutex);
for (i = 0; i < ed->count; ++i) for (i = 0; i < ed->count; ++i)
if (ed->all[i].allocated) if (ed->all[i].allocated)
eina_stringshare_del(ed->all[i].str); eina_stringshare_del(ed->all[i].str);
...@@ -94,13 +97,18 @@ eet_dictionary_string_add(Eet_Dictionary *ed, ...@@ -94,13 +97,18 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
hash = _eet_hash_gen(string, 8); hash = _eet_hash_gen(string, 8);
len = strlen(string) + 1; len = strlen(string) + 1;
eina_lock_take(&ed->mutex);
idx = _eet_dictionary_lookup(ed, string, len, hash); idx = _eet_dictionary_lookup(ed, string, len, hash);
if (idx != -1) if (idx != -1)
{ {
if (ed->all[idx].str && (ed->all[idx].str == string || strcmp(ed->all[idx].str, string) == 0)) if (ed->all[idx].str && (ed->all[idx].str == string || strcmp(ed->all[idx].str, string) == 0))
{
eina_lock_release(&ed->mutex);
return idx; return idx;
} }
}
if (ed->total == ed->count) if (ed->total == ed->count)
{ {
...@@ -110,16 +118,14 @@ eet_dictionary_string_add(Eet_Dictionary *ed, ...@@ -110,16 +118,14 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
total = ed->total + 8; total = ed->total + 8;
new = realloc(ed->all, total * sizeof(Eet_String)); new = realloc(ed->all, total * sizeof(Eet_String));
if (!new) if (!new) goto on_error;
return -1;
ed->all = new; ed->all = new;
ed->total = total; ed->total = total;
} }
str = eina_stringshare_add(string); str = eina_stringshare_add(string);
if (!str) if (!str) goto on_error;
return -1;
current = ed->all + ed->count; current = ed->all + ed->count;
...@@ -150,23 +156,33 @@ eet_dictionary_string_add(Eet_Dictionary *ed, ...@@ -150,23 +156,33 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
ed->hash[hash] = ed->count; ed->hash[hash] = ed->count;
} }
eina_lock_release(&ed->mutex);
return ed->count++; return ed->count++;
on_error:
eina_lock_release(&ed->mutex);
return -1;
} }
int int
eet_dictionary_string_get_size(const Eet_Dictionary *ed, eet_dictionary_string_get_size(const Eet_Dictionary *ed,
int idx) int idx)
{ {
if (!ed) int length = 0;
return 0;
if (idx < 0) if (!ed) goto done;
return 0;
if (idx < 0) goto done;
eina_lock_take((Eina_Lock*) &ed->mutex);
if (idx < ed->count) if (idx < ed->count)
return ed->all[idx].len; length = ed->all[idx].len;
return 0; eina_lock_release((Eina_Lock*) &ed->mutex);
done:
return length;
} }
EAPI int EAPI int
...@@ -179,27 +195,34 @@ int ...@@ -179,27 +195,34 @@ int
eet_dictionary_string_get_hash(const Eet_Dictionary *ed, eet_dictionary_string_get_hash(const Eet_Dictionary *ed,
int idx) int idx)
{ {
if (!ed) int hash = -1;
return -1;
if (idx < 0) if (!ed) goto done;
return -1;
if (idx < 0) goto done;
eina_lock_take((Eina_Lock*) &ed->mutex);
if (idx < ed->count) if (idx < ed->count)
return ed->all[idx].hash; hash = ed->all[idx].hash;
return -1; eina_lock_release((Eina_Lock*) &ed->mutex);
done:
return hash;
} }
const char * const char *
eet_dictionary_string_get_char(const Eet_Dictionary *ed, eet_dictionary_string_get_char(const Eet_Dictionary *ed,
int idx) int idx)
{ {
if (!ed) const char *s = NULL;
return NULL;
if (idx < 0) if (!ed) goto done;
return NULL;
if (idx < 0) goto done;
eina_lock_take((Eina_Lock*) &ed->mutex);
if (idx < ed->count) if (idx < ed->count)
{ {
...@@ -211,10 +234,13 @@ eet_dictionary_string_get_char(const Eet_Dictionary *ed, ...@@ -211,10 +234,13 @@ eet_dictionary_string_get_char(const Eet_Dictionary *ed,
ed->all[idx].allocated = EINA_TRUE; ed->all[idx].allocated = EINA_TRUE;
} }
#endif /* ifdef _WIN32 */ #endif /* ifdef _WIN32 */
return ed->all[idx].str; s = ed->all[idx].str;
} }
return NULL; eina_lock_release((Eina_Lock*) &ed->mutex);
done:
return s;
} }
static inline Eina_Bool static inline Eina_Bool
...@@ -281,19 +307,25 @@ _eet_dictionary_test(const Eet_Dictionary *ed, ...@@ -281,19 +307,25 @@ _eet_dictionary_test(const Eet_Dictionary *ed,
int idx, int idx,
void *result) void *result)
{ {
if (!result) Eina_Bool limit = EINA_FALSE;
return EINA_FALSE;
if (!ed) if (!result) goto done;
return EINA_FALSE;
if (idx < 0) if (!ed) goto done;
return EINA_FALSE;
if (!(idx < ed->count)) if (idx < 0) goto done;
return EINA_FALSE;
return EINA_TRUE; eina_lock_take((Eina_Lock*) &ed->mutex);
if (!(idx < ed->count)) goto unlock_done;
limit = EINA_TRUE;
unlock_done:
eina_lock_release((Eina_Lock*) &ed->mutex);
done:
return limit;
} }
static Eet_Convert * static Eet_Convert *
...@@ -303,6 +335,8 @@ eet_dictionary_convert_get(const Eet_Dictionary *ed, ...@@ -303,6 +335,8 @@ eet_dictionary_convert_get(const Eet_Dictionary *ed,
{ {
Eet_Convert *result; Eet_Convert *result;
eina_lock_take((Eina_Lock*) &ed->mutex);
*str = ed->all[idx].str; *str = ed->all[idx].str;
if (!ed->converts) if (!ed->converts)
...@@ -313,12 +347,16 @@ eet_dictionary_convert_get(const Eet_Dictionary *ed, ...@@ -313,12 +347,16 @@ eet_dictionary_convert_get(const Eet_Dictionary *ed,
} }
result = eina_hash_find(ed->converts, &idx); result = eina_hash_find(ed->converts, &idx);
if (result) return result; if (result) goto done;
add_convert: add_convert:
result = calloc(1, sizeof (Eet_Convert)); result = calloc(1, sizeof (Eet_Convert));
eina_hash_add(ed->converts, &idx, result); eina_hash_add(ed->converts, &idx, result);
done:
eina_lock_release((Eina_Lock*) &ed->mutex);
return result; return result;
} }
...@@ -338,6 +376,7 @@ eet_dictionary_string_get_float(const Eet_Dictionary *ed, ...@@ -338,6 +376,7 @@ eet_dictionary_string_get_float(const Eet_Dictionary *ed,
if (!(convert->type & EET_D_FLOAT)) if (!(convert->type & EET_D_FLOAT))
{ {
eina_lock_take((Eina_Lock*) &ed->mutex);
if (!_eet_dictionary_string_get_float_cache(str, ed->all[idx].len, if (!_eet_dictionary_string_get_float_cache(str, ed->all[idx].len,
&convert->f)) &convert->f))
{ {
...@@ -346,10 +385,14 @@ eet_dictionary_string_get_float(const Eet_Dictionary *ed, ...@@ -346,10 +385,14 @@ eet_dictionary_string_get_float(const Eet_Dictionary *ed,
if (eina_convert_atod(str, ed->all[idx].len, &mantisse, if (eina_convert_atod(str, ed->all[idx].len, &mantisse,
&exponent) == EINA_FALSE) &exponent) == EINA_FALSE)
{
eina_lock_release((Eina_Lock*) &ed->mutex);
return EINA_FALSE; return EINA_FALSE;
}
convert->f = ldexpf((float)mantisse, exponent); convert->f = ldexpf((float)mantisse, exponent);
} }
eina_lock_release((Eina_Lock*) &ed->mutex);
convert->type |= EET_D_FLOAT; convert->type |= EET_D_FLOAT;
} }
...@@ -374,6 +417,8 @@ eet_dictionary_string_get_double(const Eet_Dictionary *ed, ...@@ -374,6 +417,8 @@ eet_dictionary_string_get_double(const Eet_Dictionary *ed,
if (!(convert->type & EET_D_DOUBLE)) if (!(convert->type & EET_D_DOUBLE))
{ {
eina_lock_take((Eina_Lock*) &ed->mutex);
if (!_eet_dictionary_string_get_double_cache(str, ed->all[idx].len, if (!_eet_dictionary_string_get_double_cache(str, ed->all[idx].len,
&convert->d)) &convert->d))
{ {
...@@ -382,10 +427,14 @@ eet_dictionary_string_get_double(const Eet_Dictionary *ed, ...@@ -382,10 +427,14 @@ eet_dictionary_string_get_double(const Eet_Dictionary *ed,
if (eina_convert_atod(str, ed->all[idx].len, &mantisse, if (eina_convert_atod(str, ed->all[idx].len, &mantisse,
&exponent) == EINA_FALSE) &exponent) == EINA_FALSE)
{
eina_lock_release((Eina_Lock*) &ed->mutex);
return EINA_FALSE; return EINA_FALSE;
}
convert->d = ldexp((double)mantisse, exponent); convert->d = ldexp((double)mantisse, exponent);
} }
eina_lock_release((Eina_Lock*) &ed->mutex);
convert->type |= EET_D_DOUBLE; convert->type |= EET_D_DOUBLE;
} }
...@@ -412,8 +461,13 @@ eet_dictionary_string_get_fp(const Eet_Dictionary *ed, ...@@ -412,8 +461,13 @@ eet_dictionary_string_get_fp(const Eet_Dictionary *ed,
{ {
Eina_F32p32 fp; Eina_F32p32 fp;
eina_lock_take((Eina_Lock*) &ed->mutex);
if (!eina_convert_atofp(str, ed->all[idx].len, &fp)) if (!eina_convert_atofp(str, ed->all[idx].len, &fp))
{
eina_lock_release((Eina_Lock*) &ed->mutex);
return EINA_FALSE; return EINA_FALSE;
}
eina_lock_release((Eina_Lock*) &ed->mutex);
convert->fp = fp; convert->fp = fp;
convert->type |= EET_D_FIXED_POINT; convert->type |= EET_D_FIXED_POINT;
...@@ -427,18 +481,29 @@ EAPI int ...@@ -427,18 +481,29 @@ EAPI int
eet_dictionary_string_check(Eet_Dictionary *ed, eet_dictionary_string_check(Eet_Dictionary *ed,
const char *string) const char *string)
{ {
int res = 0;
int i; int i;
if ((!ed) || (!string)) if ((!ed) || (!string))
return 0; return 0;
eina_lock_take(&ed->mutex);
if ((ed->start <= string) && (string < ed->end)) if ((ed->start <= string) && (string < ed->end))
return 1; res = 1;
if (!res)
{
for (i = 0; i < ed->count; ++i) for (i = 0; i < ed->count; ++i)
if ((ed->all[i].allocated) && ed->all[i].str == string) if ((ed->all[i].allocated) && ed->all[i].str == string)
return 1; {
res = 1;
break;
}
}
return 0; eina_lock_release(&ed->mutex);
return res;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment