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

eina_value: simpler and faster code using newer eina_inarray_alloc_at() 

SVN revision: 67153
This commit is contained in:
Gustavo Sverzut Barbieri 2012-01-12 19:16:46 +00:00
parent 72d4da0022
commit c486211f59
2 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/eina/src/include/eina_inline_value.x
View File

@ -644,18 +644,13 @@ static inline Eina_Bool
eina_value_array_vinsert(Eina_Value *value, unsigned int position, va_list args)
{
Eina_Value_Array desc;
void *mem, *placeholder;
void *mem;
EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0);
if (!eina_value_pget(value, &desc))
return EINA_FALSE;
placeholder = alloca(desc.subtype->value_size);
memset(placeholder, 0, desc.subtype->value_size);
if (!eina_inarray_insert_at(desc.array, position, placeholder))
return EINA_FALSE;
mem = eina_inarray_nth(desc.array, position);
mem = eina_inarray_alloc_at(desc.array, position, 1);
if (!mem)
return EINA_FALSE;
@ -674,20 +669,15 @@ static inline Eina_Bool
eina_value_array_vappend(Eina_Value *value, va_list args)
{
Eina_Value_Array desc;
void *mem, *placeholder;
void *mem;
int position;
EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0);
if (!eina_value_pget(value, &desc))
return EINA_FALSE;
placeholder = alloca(desc.subtype->value_size);
memset(placeholder, 0, desc.subtype->value_size);
position = eina_inarray_append(desc.array, placeholder);
if (position < 0)
return EINA_FALSE;
mem = eina_inarray_nth(desc.array, position);
position = eina_inarray_count(desc.array);
mem = eina_inarray_alloc_at(desc.array, position, 1);
if (!mem)
return EINA_FALSE;
@ -794,18 +784,13 @@ static inline Eina_Bool
eina_value_array_pinsert(Eina_Value *value, unsigned int position, const void *ptr)
{
Eina_Value_Array desc;
void *mem, *placeholder;
void *mem;
EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0);
if (!eina_value_pget(value, &desc))
return EINA_FALSE;
placeholder = alloca(desc.subtype->value_size);
memset(placeholder, 0, desc.subtype->value_size);
if (!eina_inarray_insert_at(desc.array, position, placeholder))
return EINA_FALSE;
mem = eina_inarray_nth(desc.array, position);
mem = eina_inarray_alloc_at(desc.array, position, 1);
if (!mem)
return EINA_FALSE;
@ -824,20 +809,15 @@ static inline Eina_Bool
eina_value_array_pappend(Eina_Value *value, const void *ptr)
{
Eina_Value_Array desc;
void *mem, *placeholder;
void *mem;
int position;
EINA_VALUE_TYPE_ARRAY_CHECK_RETURN_VAL(value, 0);
if (!eina_value_pget(value, &desc))
return EINA_FALSE;
placeholder = alloca(desc.subtype->value_size);
memset(placeholder, 0, desc.subtype->value_size);
position = eina_inarray_append(desc.array, placeholder);
if (position < 0)
return EINA_FALSE;
mem = eina_inarray_nth(desc.array, position);
position = eina_inarray_count(desc.array);
mem = eina_inarray_alloc_at(desc.array, position, 1);
if (!mem)
return EINA_FALSE;

22
legacy/eina/src/lib/eina_value.c
View File

@ -2391,8 +2391,8 @@ _eina_value_type_array_copy(const Eina_Value_Type *type __UNUSED__, const void *
const Eina_Value_Type *subtype;
const Eina_Value_Array *s = src;
Eina_Value_Array *d = dst;
unsigned int count, sz;
char *placeholder, *ptr, *ptr_end;
unsigned int i, count, sz;
char *ptr, *ptr_end;
d->subtype = subtype = s->subtype;
d->step = s->step;
@ -2414,18 +2414,15 @@ _eina_value_type_array_copy(const Eina_Value_Type *type __UNUSED__, const void *
return EINA_FALSE;
sz = s->array->member_size;
placeholder = alloca(sz);
memset(placeholder, 0, sz);
count = eina_inarray_count(s->array);
ptr = s->array->members;
ptr_end = ptr + (count * sz);
for (; ptr < ptr_end; ptr += sz)
for (i = 0; ptr < ptr_end; ptr += sz, i++)
{
int i = eina_inarray_append(d->array, placeholder);
void *imem = eina_inarray_nth(d->array, i);
if ((i < 0) || (!imem)) goto error;
void *imem = eina_inarray_alloc_at(d->array, i, 1);
if (!imem) goto error;
if (!subtype->copy(subtype, ptr, imem))
{
eina_inarray_pop(d->array);
@ -2583,7 +2580,7 @@ _eina_value_type_array_convert_from(const Eina_Value_Type *type, const Eina_Valu
{
Eina_Value_Array *tmem = type_mem;
Eina_Value_Array desc = {convert, tmem->step, NULL};
char *buf, *placeholder;
char *buf;
void *imem;
if (!eina_value_type_pset(type, tmem, &desc))
@ -2593,12 +2590,7 @@ _eina_value_type_array_convert_from(const Eina_Value_Type *type, const Eina_Valu
if (!eina_value_type_pget(convert, convert_mem, &buf))
return EINA_FALSE;
placeholder = alloca(convert->value_size);
memset(placeholder, 0, convert->value_size);
if (eina_inarray_append(tmem->array, placeholder) != 0)
return EINA_FALSE;
imem = eina_inarray_nth(tmem->array, 0);
imem = eina_inarray_alloc_at(tmem->array, 0, 1);
if (!imem)
return EINA_FALSE;