Menu
▾
▴
E SVN: cedric IN trunk/eet: . src/lib
|
From: Enlightenment S. <no-...@en...> - 2010-11-29 18:38:31
|
Log:
* 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.
Author: cedric
Date: 2010-11-29 10:38:24 -0800 (Mon, 29 Nov 2010)
New Revision: 55069
Modified:
trunk/eet/ChangeLog trunk/eet/src/lib/eet_data.c
Modified: trunk/eet/ChangeLog
===================================================================
--- trunk/eet/ChangeLog 2010-11-29 18:32:30 UTC (rev 55068)
+++ trunk/eet/ChangeLog 2010-11-29 18:38:24 UTC (rev 55069)
@@ -467,3 +467,4 @@
* Improve speed of Eet_String users. It does impact all string
encoding/decoding, but even faster for stringshare encoding.
+ * Improve speed when decoding mostly array with eet_data_read.
Modified: trunk/eet/src/lib/eet_data.c
===================================================================
--- trunk/eet/src/lib/eet_data.c 2010-11-29 18:32:30 UTC (rev 55068)
+++ trunk/eet/src/lib/eet_data.c 2010-11-29 18:38:24 UTC (rev 55069)
@@ -177,12 +177,11 @@
Eet_Dictionary *ed;
};
+#define EET_FREE_COUNT 256
struct _Eet_Free
{
int ref;
- int len[256];
- int num[256];
- void **list[256];
+ Eina_Array list[EET_FREE_COUNT];
};
struct _Eet_Free_Context
@@ -197,7 +196,7 @@
struct _Eet_Variant_Unknow
{
- EINA_MAGIC;
+ EINA_MAGIC;
int size;
char data[1];
@@ -205,6 +204,9 @@
/*---*/
+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,
const void *src,
const void *src_end,
@@ -1977,8 +1979,10 @@
return NULL;
}
- memset(&context, 0, sizeof (context));
+ eet_free_context_init(&context);
data_dec = _eet_data_descriptor_decode(&context, ed, edd, data, size);
+ eet_free_context_shutdown(&context);
+
if (required_free)
free((void *)data);
@@ -2010,8 +2014,10 @@
return NULL;
}
- memset(&context, 0, sizeof (context));
+ eet_free_context_init(&context);
result = _eet_data_descriptor_decode(&context, ed, NULL, data, size);
+ eet_free_context_shutdown(&context);
+
if (required_free)
free((void *)data);
@@ -2060,6 +2066,51 @@
return eet_data_write_cipher(ef, edd, name, NULL, data, compress);
} /* 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
_eet_free_hash(void *data)
{
@@ -2089,65 +2140,49 @@
_eet_free_add(Eet_Free *ef,
void *data)
{
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int i;
int hash;
- int i;
hash = _eet_free_hash(data);
- for (i = 0; i < ef->num[hash]; ++i)
- if (ef->list[hash][i] == data)
- return;
+ EINA_ARRAY_ITER_NEXT(&ef->list[hash], i, track, it)
+ if (track == data)
+ return;
- ef->num[hash]++;
- 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;
+ eina_array_push(&ef->list[hash], data);
} /* _eet_free_add */
static void
_eet_free_del(Eet_Free *ef,
void *data)
{
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int i;
int hash;
- int i;
hash = _eet_free_hash(data);
- for (i = 0; i < ef->num[hash]; ++i)
- if (ef->list[hash][i] == data)
- {
- ef->list[hash][i] = NULL;
- return;
- }
+ EINA_ARRAY_ITER_NEXT(&ef->list[hash], i, track, it)
+ if (track == data)
+ {
+ eina_array_data_set(&ef->list[hash], i, NULL);
+ return;
+ }
}
static void
_eet_free_reset(Eet_Free *ef)
{
- int i;
+ unsigned int i;
if (ef->ref > 0)
return;
- for (i = 0; i < 256; ++i)
- {
- ef->len[i] = 0;
- ef->num[i] = 0;
- if (ef->list[i])
- free(ef->list[i]);
-
- ef->list[i] = NULL;
- }
+ for (i = 0; i < EET_FREE_COUNT; ++i)
+ eina_array_clean(&ef->list[i]);
} /* _eet_free_reset */
static void
@@ -2172,21 +2207,23 @@
_eet_freelist_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd)
{
- int j;
- int i;
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int j;
+ unsigned int i;
if (context->freelist.ref > 0)
return;
- for (j = 0; j < 256; ++j)
- for (i = 0; i < context->freelist.num[j]; ++i)
- if (context->freelist.list[j][i])
- {
- if (edd)
- edd->func.mem_free(context->freelist.list[j][i]);
- else
- free(context->freelist.list[j][i]);
- }
+ for (j = 0; j < EET_FREE_COUNT; ++j)
+ EINA_ARRAY_ITER_NEXT(&context->freelist.list[j], i, track, it)
+ if (track)
+ {
+ if (edd)
+ edd->func.mem_free(track);
+ else
+ free(track);
+ }
_eet_free_reset(&context->freelist);
} /* _eet_freelist_free */
@@ -2200,26 +2237,28 @@
_eet_freelist_array_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd)
{
- int j;
- int i;
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int j;
+ unsigned int i;
if (context->freelist_array.ref > 0)
return;
- for (j = 0; j < 256; ++j)
- for (i = 0; i < context->freelist_array.num[j]; ++i)
- if (context->freelist_array.list[j][i])
- {
- if (edd)
- {
- if (edd->func.array_free)
- edd->func.array_free(context->freelist_array.list[j][i]);
- else
- edd->func.mem_free(context->freelist_array.list[j][i]);
- }
- else
- free(context->freelist_array.list[j][i]);
- }
+ for (j = 0; j < EET_FREE_COUNT; ++j)
+ EINA_ARRAY_ITER_NEXT(&context->freelist_array.list[j], i, track, it)
+ if (track)
+ {
+ if (edd)
+ {
+ if (edd->func.array_free)
+ edd->func.array_free(track);
+ else
+ edd->func.mem_free(track);
+ }
+ else
+ free(track);
+ }
_eet_free_reset(&context->freelist_array);
} /* _eet_freelist_array_free */
@@ -2233,19 +2272,21 @@
_eet_freelist_list_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd)
{
- int j;
- int i;
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int j;
+ unsigned int i;
if (context->freelist_list.ref > 0)
return;
- for (j = 0; j < 256; ++j)
- for (i = 0; i < context->freelist_list.num[j]; ++i)
- if (context->freelist_list.list[j][i])
- {
- if (edd)
- edd->func.list_free(*((void **)(context->freelist_list.list[j][i])));
- }
+ for (j = 0; j < EET_FREE_COUNT; ++j)
+ EINA_ARRAY_ITER_NEXT(&context->freelist_list.list[j], i, track, it)
+ if (track)
+ {
+ if (edd)
+ edd->func.list_free(*((void **)(track)));
+ }
_eet_free_reset(&context->freelist_list);
} /* _eet_freelist_list_free */
@@ -2258,21 +2299,23 @@
static void
_eet_freelist_str_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd)
{
- int j;
- int i;
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int j;
+ unsigned int i;
if (context->freelist_str.ref > 0)
return;
- for (j = 0; j < 256; ++j)
- for (i = 0; i < context->freelist_str.num[j]; ++i)
- if (context->freelist_str.list[j][i])
- {
- if (edd)
- edd->func.str_free(context->freelist_str.list[j][i]);
- else
- free(context->freelist_str.list[j][i]);
- }
+ for (j = 0; j < EET_FREE_COUNT; ++j)
+ EINA_ARRAY_ITER_NEXT(&context->freelist_str.list[j], i, track, it)
+ if (track)
+ {
+ if (edd)
+ edd->func.str_free(track);
+ else
+ free(track);
+ }
_eet_free_reset(&context->freelist_str);
} /* _eet_freelist_str_free */
@@ -2286,20 +2329,22 @@
_eet_freelist_direct_str_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd)
{
- int j;
- int i;
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int j;
+ unsigned int i;
if (context->freelist_direct_str.ref > 0)
return;
- for (j = 0; j < 256; ++j)
- for (i = 0; i < context->freelist_direct_str.num[j]; ++i)
- if (context->freelist_direct_str.list[j][i])
- {
- if (edd)
- edd->func.str_direct_free(context->freelist_direct_str.list[j][i]);
- else
- free(context->freelist_direct_str.list[j][i]);
+ for (j = 0; j < EET_FREE_COUNT; ++j)
+ EINA_ARRAY_ITER_NEXT(&context->freelist_str.list[j], i, track, it)
+ if (track)
+ {
+ if (edd)
+ edd->func.str_direct_free(track);
+ else
+ free(track);
}
_eet_free_reset(&context->freelist_direct_str);
} /* _eet_freelist_direct_str_free */
@@ -2314,21 +2359,23 @@
_eet_freelist_hash_free(Eet_Free_Context *context,
Eet_Data_Descriptor *edd)
{
- int j;
- int i;
+ void *track;
+ Eina_Array_Iterator it;
+ unsigned int j;
+ unsigned int i;
if (context->freelist_hash.ref > 0)
return;
- for (j = 0; j < 256; ++j)
- for (i = 0; i < context->freelist_hash.num[j]; ++i)
- if (context->freelist_hash.list[j][i])
- {
- if (edd)
- edd->func.hash_free(context->freelist_hash.list[j][i]);
- else
- free(context->freelist_hash.list[j][i]);
- }
+ for (j = 0; j < EET_FREE_COUNT; ++j)
+ EINA_ARRAY_ITER_NEXT(&context->freelist_hash.list[j], i, track, it)
+ if (track)
+ {
+ if (edd)
+ edd->func.hash_free(track);
+ else
+ free(track);
+ }
_eet_free_reset(&context->freelist_hash);
} /* _eet_freelist_hash_free */
@@ -4416,8 +4463,9 @@
return 0;
}
- memset(&context, 0, sizeof (context));
+ eet_free_context_init(&context);
result = _eet_data_descriptor_decode(&context, ed, NULL, data, size);
+ eet_free_context_shutdown(&context);
eet_node_dump(result, 0, dumpfunc, dumpdata);
@@ -4470,8 +4518,9 @@
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);
+ eet_free_context_shutdown(&context);
eet_node_dump(result, 0, dumpfunc, dumpdata);
@@ -4587,12 +4636,13 @@
return NULL;
}
- memset(&context, 0, sizeof (context));
+ eet_free_context_init(&context);
ret = _eet_data_descriptor_decode(&context,
NULL,
edd,
deciphered,
deciphered_len);
+ eet_free_context_shutdown(&context);
if (data_in != deciphered)
free(deciphered);
@@ -4628,12 +4678,13 @@
return NULL;
}
- memset(&context, 0, sizeof (context));
+ eet_free_context_init(&context);
ret = _eet_data_descriptor_decode(&context,
NULL,
NULL,
deciphered,
deciphered_len);
+ eet_free_context_shutdown(&context);
if (data_in != deciphered)
free(deciphered);
|