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

* eet: Improve speed of eet_data_read decoding. Mostly for array. 

NOTE: with a major rewrite of the way array does the structure
	allocation/destruction it could be made much faster. That would
	improve speed for both edje file loading and efreet cache loading.
	But I will postpone that for after the release.


SVN revision: 55069
This commit is contained in:
Cedric BAIL 2010-11-29 18:38:24 +00:00
parent aaae4e223a
commit 46fd048e2c
2 changed files with 165 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/eet/ChangeLog
View File

@ -467,3 +467,4 @@
* Improve speed of Eet_String users. It does impact all string * Improve speed of Eet_String users. It does impact all string
encoding/decoding, but even faster for stringshare encoding. encoding/decoding, but even faster for stringshare encoding.
* Improve speed when decoding mostly array with eet_data_read.

277
legacy/eet/src/lib/eet_data.c
View File

@ -177,12 +177,11 @@ struct _Eet_Data_Encode_Hash_Info
Eet_Dictionary *ed; Eet_Dictionary *ed;
}; };
#define EET_FREE_COUNT 256
struct _Eet_Free struct _Eet_Free
{ {
int ref; int ref;
int len[256]; Eina_Array list[EET_FREE_COUNT];
int num[256];
void **list[256];
}; };
struct _Eet_Free_Context struct _Eet_Free_Context
@ -197,7 +196,7 @@ struct _Eet_Free_Context
struct _Eet_Variant_Unknow struct _Eet_Variant_Unknow
{ {
EINA_MAGIC; EINA_MAGIC;
int size; int size;
char data[1]; char data[1];
@ -205,6 +204,9 @@ struct _Eet_Variant_Unknow
/*---*/ /*---*/
static void eet_free_context_init(Eet_Free_Context *context);
static void eet_free_context_shutdown(Eet_Free_Context *context);
static int eet_data_get_char(const Eet_Dictionary *ed, static int eet_data_get_char(const Eet_Dictionary *ed,
const void *src, const void *src,
const void *src_end, const void *src_end,
@ -1977,8 +1979,10 @@ eet_data_read_cipher(Eet_File *ef,
return NULL; return NULL;
} }
memset(&context, 0, sizeof (context)); eet_free_context_init(&context);
data_dec = _eet_data_descriptor_decode(&context, ed, edd, data, size); data_dec = _eet_data_descriptor_decode(&context, ed, edd, data, size);
eet_free_context_shutdown(&context);
if (required_free) if (required_free)
free((void *)data); free((void *)data);
@ -2010,8 +2014,10 @@ eet_data_node_read_cipher(Eet_File *ef,
return NULL; return NULL;
} }
memset(&context, 0, sizeof (context)); eet_free_context_init(&context);
result = _eet_data_descriptor_decode(&context, ed, NULL, data, size); result = _eet_data_descriptor_decode(&context, ed, NULL, data, size);
eet_free_context_shutdown(&context);
if (required_free) if (required_free)
free((void *)data); free((void *)data);
@ -2060,6 +2066,51 @@ eet_data_write(Eet_File *ef,
return eet_data_write_cipher(ef, edd, name, NULL, data, compress); return eet_data_write_cipher(ef, edd, name, NULL, data, compress);
} /* eet_data_write */ } /* eet_data_write */
static void
eet_free_context_init(Eet_Free_Context *context)
{
unsigned int i = 0;
memset(context, 0, sizeof (Eet_Free_Context));
for (i = 0; i < EET_FREE_COUNT; ++i)
{
eina_array_step_set(&context->freelist.list[i],
sizeof (context->freelist.list[i]),
32);
eina_array_step_set(&context->freelist_array.list[i],
sizeof (context->freelist.list[i]),
32);
eina_array_step_set(&context->freelist_list.list[i],
sizeof (context->freelist.list[i]),
32);
eina_array_step_set(&context->freelist_hash.list[i],
sizeof (context->freelist.list[i]),
32);
eina_array_step_set(&context->freelist_str.list[i],
sizeof (context->freelist.list[i]),
32);
eina_array_step_set(&context->freelist_direct_str.list[i],
sizeof (context->freelist.list[i]),
32);
}
}
static void
eet_free_context_shutdown(Eet_Free_Context *context)
{
unsigned int i = 0;
for (i = 0; i < EET_FREE_COUNT; ++i)
{
eina_array_flush(&context->freelist.list[i]);
eina_array_flush(&context->freelist_array.list[i]);
eina_array_flush(&context->freelist_list.list[i]);
eina_array_flush(&context->freelist_hash.list[i]);
eina_array_flush(&context->freelist_str.list[i]);
eina_array_flush(&context->freelist_direct_str.list[i]);
}
}
static int static int
_eet_free_hash(void *data) _eet_free_hash(void *data)
{ {
@ -2089,65 +2140,49 @@ static void
_eet_free_add(Eet_Free *ef, _eet_free_add(Eet_Free *ef,
void *data) void *data)
{ {
void *track;
Eina_Array_Iterator it;
unsigned int i;
int hash; int hash;
int i;
hash = _eet_free_hash(data); hash = _eet_free_hash(data);
for (i = 0; i < ef->num[hash]; ++i) EINA_ARRAY_ITER_NEXT(&ef->list[hash], i, track, it)
if (ef->list[hash][i] == data) if (track == data)
return; return;
ef->num[hash]++; eina_array_push(&ef->list[hash], data);
if (ef->num[hash] > ef->len[hash])
{
void **tmp;
tmp = realloc(ef->list[hash], (ef->len[hash] + 16) * sizeof(void *));
if (!tmp)
return;
ef->len[hash] += 16;
ef->list[hash] = tmp;
}
ef->list[hash][ef->num[hash] - 1] = data;
} /* _eet_free_add */ } /* _eet_free_add */
static void static void
_eet_free_del(Eet_Free *ef, _eet_free_del(Eet_Free *ef,
void *data) void *data)
{ {
void *track;
Eina_Array_Iterator it;
unsigned int i;
int hash; int hash;
int i;
hash = _eet_free_hash(data); hash = _eet_free_hash(data);
for (i = 0; i < ef->num[hash]; ++i) EINA_ARRAY_ITER_NEXT(&ef->list[hash], i, track, it)
if (ef->list[hash][i] == data) if (track == data)
{ {
ef->list[hash][i] = NULL; eina_array_data_set(&ef->list[hash], i, NULL);
return; return;
} }
} }
static void static void
_eet_free_reset(Eet_Free *ef) _eet_free_reset(Eet_Free *ef)
{ {
int i; unsigned int i;
if (ef->ref > 0) if (ef->ref > 0)
return; return;
for (i = 0; i < 256; ++i) for (i = 0; i < EET_FREE_COUNT; ++i)
{ eina_array_clean(&ef->list[i]);
ef->len[i] = 0;
ef->num[i] = 0;
if (ef->list[i])
free(ef->list[i]);
ef->list[i] = NULL;
}
} /* _eet_free_reset */ } /* _eet_free_reset */
static void static void
@ -2172,21 +2207,23 @@ static void
_eet_freelist_free(Eet_Free_Context *context, _eet_freelist_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd) Eet_Data_Descriptor *edd)
{ {
int j; void *track;
int i; Eina_Array_Iterator it;
unsigned int j;
unsigned int i;
if (context->freelist.ref > 0) if (context->freelist.ref > 0)
return; return;
for (j = 0; j < 256; ++j) for (j = 0; j < EET_FREE_COUNT; ++j)
for (i = 0; i < context->freelist.num[j]; ++i) EINA_ARRAY_ITER_NEXT(&context->freelist.list[j], i, track, it)
if (context->freelist.list[j][i]) if (track)
{ {
if (edd) if (edd)
edd->func.mem_free(context->freelist.list[j][i]); edd->func.mem_free(track);
else else
free(context->freelist.list[j][i]); free(track);
} }
_eet_free_reset(&context->freelist); _eet_free_reset(&context->freelist);
} /* _eet_freelist_free */ } /* _eet_freelist_free */
@ -2200,26 +2237,28 @@ static void
_eet_freelist_array_free(Eet_Free_Context *context, _eet_freelist_array_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd) Eet_Data_Descriptor *edd)
{ {
int j; void *track;
int i; Eina_Array_Iterator it;
unsigned int j;
unsigned int i;
if (context->freelist_array.ref > 0) if (context->freelist_array.ref > 0)
return; return;
for (j = 0; j < 256; ++j) for (j = 0; j < EET_FREE_COUNT; ++j)
for (i = 0; i < context->freelist_array.num[j]; ++i) EINA_ARRAY_ITER_NEXT(&context->freelist_array.list[j], i, track, it)
if (context->freelist_array.list[j][i]) if (track)
{ {
if (edd) if (edd)
{ {
if (edd->func.array_free) if (edd->func.array_free)
edd->func.array_free(context->freelist_array.list[j][i]); edd->func.array_free(track);
else else
edd->func.mem_free(context->freelist_array.list[j][i]); edd->func.mem_free(track);
} }
else else
free(context->freelist_array.list[j][i]); free(track);
} }
_eet_free_reset(&context->freelist_array); _eet_free_reset(&context->freelist_array);
} /* _eet_freelist_array_free */ } /* _eet_freelist_array_free */
@ -2233,19 +2272,21 @@ static void
_eet_freelist_list_free(Eet_Free_Context *context, _eet_freelist_list_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd) Eet_Data_Descriptor *edd)
{ {
int j; void *track;
int i; Eina_Array_Iterator it;
unsigned int j;
unsigned int i;
if (context->freelist_list.ref > 0) if (context->freelist_list.ref > 0)
return; return;
for (j = 0; j < 256; ++j) for (j = 0; j < EET_FREE_COUNT; ++j)
for (i = 0; i < context->freelist_list.num[j]; ++i) EINA_ARRAY_ITER_NEXT(&context->freelist_list.list[j], i, track, it)
if (context->freelist_list.list[j][i]) if (track)
{ {
if (edd) if (edd)
edd->func.list_free(*((void **)(context->freelist_list.list[j][i]))); edd->func.list_free(*((void **)(track)));
} }
_eet_free_reset(&context->freelist_list); _eet_free_reset(&context->freelist_list);
} /* _eet_freelist_list_free */ } /* _eet_freelist_list_free */
@ -2258,21 +2299,23 @@ _eet_freelist_list_free(Eet_Free_Context *context,
static void static void
_eet_freelist_str_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd) _eet_freelist_str_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd)
{ {
int j; void *track;
int i; Eina_Array_Iterator it;
unsigned int j;
unsigned int i;
if (context->freelist_str.ref > 0) if (context->freelist_str.ref > 0)
return; return;
for (j = 0; j < 256; ++j) for (j = 0; j < EET_FREE_COUNT; ++j)
for (i = 0; i < context->freelist_str.num[j]; ++i) EINA_ARRAY_ITER_NEXT(&context->freelist_str.list[j], i, track, it)
if (context->freelist_str.list[j][i]) if (track)
{ {
if (edd) if (edd)
edd->func.str_free(context->freelist_str.list[j][i]); edd->func.str_free(track);
else else
free(context->freelist_str.list[j][i]); free(track);
} }
_eet_free_reset(&context->freelist_str); _eet_free_reset(&context->freelist_str);
} /* _eet_freelist_str_free */ } /* _eet_freelist_str_free */
@ -2286,20 +2329,22 @@ static void
_eet_freelist_direct_str_free(Eet_Free_Context *context, _eet_freelist_direct_str_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd) Eet_Data_Descriptor *edd)
{ {
int j; void *track;
int i; Eina_Array_Iterator it;
unsigned int j;
unsigned int i;
if (context->freelist_direct_str.ref > 0) if (context->freelist_direct_str.ref > 0)
return; return;
for (j = 0; j < 256; ++j) for (j = 0; j < EET_FREE_COUNT; ++j)
for (i = 0; i < context->freelist_direct_str.num[j]; ++i) EINA_ARRAY_ITER_NEXT(&context->freelist_str.list[j], i, track, it)
if (context->freelist_direct_str.list[j][i]) if (track)
{ {
if (edd) if (edd)
edd->func.str_direct_free(context->freelist_direct_str.list[j][i]); edd->func.str_direct_free(track);
else else
free(context->freelist_direct_str.list[j][i]); free(track);
} }
_eet_free_reset(&context->freelist_direct_str); _eet_free_reset(&context->freelist_direct_str);
} /* _eet_freelist_direct_str_free */ } /* _eet_freelist_direct_str_free */
@ -2314,21 +2359,23 @@ static void
_eet_freelist_hash_free(Eet_Free_Context *context, _eet_freelist_hash_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd) Eet_Data_Descriptor *edd)
{ {
int j; void *track;
int i; Eina_Array_Iterator it;
unsigned int j;
unsigned int i;
if (context->freelist_hash.ref > 0) if (context->freelist_hash.ref > 0)
return; return;
for (j = 0; j < 256; ++j) for (j = 0; j < EET_FREE_COUNT; ++j)
for (i = 0; i < context->freelist_hash.num[j]; ++i) EINA_ARRAY_ITER_NEXT(&context->freelist_hash.list[j], i, track, it)
if (context->freelist_hash.list[j][i]) if (track)
{ {
if (edd) if (edd)
edd->func.hash_free(context->freelist_hash.list[j][i]); edd->func.hash_free(track);
else else
free(context->freelist_hash.list[j][i]); free(track);
} }
_eet_free_reset(&context->freelist_hash); _eet_free_reset(&context->freelist_hash);
} /* _eet_freelist_hash_free */ } /* _eet_freelist_hash_free */
@ -4416,8 +4463,9 @@ eet_data_dump_cipher(Eet_File *ef,
return 0; return 0;
} }
memset(&context, 0, sizeof (context)); eet_free_context_init(&context);
result = _eet_data_descriptor_decode(&context, ed, NULL, data, size); result = _eet_data_descriptor_decode(&context, ed, NULL, data, size);
eet_free_context_shutdown(&context);
eet_node_dump(result, 0, dumpfunc, dumpdata); eet_node_dump(result, 0, dumpfunc, dumpdata);
@ -4470,8 +4518,9 @@ eet_data_text_dump_cipher(const void *data_in,
ret_len = size_in; ret_len = size_in;
} }
memset(&context, 0, sizeof (context)); eet_free_context_init(&context);
result = _eet_data_descriptor_decode(&context, NULL, NULL, ret, ret_len); result = _eet_data_descriptor_decode(&context, NULL, NULL, ret, ret_len);
eet_free_context_shutdown(&context);
eet_node_dump(result, 0, dumpfunc, dumpdata); eet_node_dump(result, 0, dumpfunc, dumpdata);
@ -4587,12 +4636,13 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
return NULL; return NULL;
} }
memset(&context, 0, sizeof (context)); eet_free_context_init(&context);
ret = _eet_data_descriptor_decode(&context, ret = _eet_data_descriptor_decode(&context,
NULL, NULL,
edd, edd,
deciphered, deciphered,
deciphered_len); deciphered_len);
eet_free_context_shutdown(&context);
if (data_in != deciphered) if (data_in != deciphered)
free(deciphered); free(deciphered);
@ -4628,12 +4678,13 @@ eet_data_node_decode_cipher(const void *data_in,
return NULL; return NULL;
} }
memset(&context, 0, sizeof (context)); eet_free_context_init(&context);
ret = _eet_data_descriptor_decode(&context, ret = _eet_data_descriptor_decode(&context,
NULL, NULL,
NULL, NULL,
deciphered, deciphered,
deciphered_len); deciphered_len);
eet_free_context_shutdown(&context);
if (data_in != deciphered) if (data_in != deciphered)
free(deciphered); free(deciphered);