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

adjust default memprool alloc sizes. too big imho. 

SVN revision: 72249
This commit is contained in:
Carsten Haitzler 2012-06-17 01:32:10 +00:00
parent 5b303c8038
commit fc9218087d
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/evas/src/lib/canvas/evas_callbacks.c
View File

@ -297,13 +297,13 @@ evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type typ
if (!obj->callbacks) if (!obj->callbacks)
{ {
EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 512, ); EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 64, );
obj->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks); obj->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks);
if (!obj->callbacks) return; if (!obj->callbacks) return;
EVAS_MEMPOOL_PREP(_mp_cb, obj->callbacks, Evas_Callbacks); EVAS_MEMPOOL_PREP(_mp_cb, obj->callbacks, Evas_Callbacks);
} }
EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 2048, ); EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 128, );
fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node); fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node);
if (!fn) return; if (!fn) return;
EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node); EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node);
@ -400,13 +400,13 @@ evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback
if (!e->callbacks) if (!e->callbacks)
{ {
EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 512, ); EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 64, );
e->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks); e->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks);
if (!e->callbacks) return; if (!e->callbacks) return;
EVAS_MEMPOOL_PREP(_mp_cb, e->callbacks, Evas_Callbacks); EVAS_MEMPOOL_PREP(_mp_cb, e->callbacks, Evas_Callbacks);
} }
EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 2048, ); EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 128, );
fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node); fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node);
if (!fn) return; if (!fn) return;
EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node); EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node);

2
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -2679,7 +2679,7 @@ evas_object_image_new(void)
Evas_Object_Image *o; Evas_Object_Image *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_image", Evas_Object_Image, 256, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_image", Evas_Object_Image, 16, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Image); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Image);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Image); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Image);

2
legacy/evas/src/lib/canvas/evas_object_line.c
View File

@ -222,7 +222,7 @@ evas_object_line_new(void)
Evas_Object_Line *o; Evas_Object_Line *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_line", Evas_Object_Line, 16, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_line", Evas_Object_Line, 4, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Line); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Line);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Line); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Line);

4
legacy/evas/src/lib/canvas/evas_object_main.c
View File

@ -17,7 +17,7 @@ evas_object_new(Evas *e __UNUSED__)
{ {
Evas_Object *obj; Evas_Object *obj;
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object", Evas_Object, 512, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object", Evas_Object, 32, NULL);
obj = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object); obj = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object);
if (!obj) return NULL; if (!obj) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, obj, Evas_Object); EVAS_MEMPOOL_PREP(_mp_obj, obj, Evas_Object);
@ -765,7 +765,7 @@ _evas_object_size_hint_alloc(Evas_Object *obj)
{ {
if (obj->size_hints) return; if (obj->size_hints) return;
EVAS_MEMPOOL_INIT(_mp_sh, "evas_size_hints", Evas_Size_Hints, 512, ); EVAS_MEMPOOL_INIT(_mp_sh, "evas_size_hints", Evas_Size_Hints, 32, );
obj->size_hints = EVAS_MEMPOOL_ALLOC(_mp_sh, Evas_Size_Hints); obj->size_hints = EVAS_MEMPOOL_ALLOC(_mp_sh, Evas_Size_Hints);
if (!obj->size_hints) return; if (!obj->size_hints) return;
EVAS_MEMPOOL_PREP(_mp_sh, obj->size_hints, Evas_Size_Hints); EVAS_MEMPOOL_PREP(_mp_sh, obj->size_hints, Evas_Size_Hints);

2
legacy/evas/src/lib/canvas/evas_object_polygon.c
View File

@ -261,7 +261,7 @@ evas_object_polygon_new(void)
Evas_Object_Polygon *o; Evas_Object_Polygon *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_polygon", Evas_Object_Polygon, 32, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_polygon", Evas_Object_Polygon, 4, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Polygon); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Polygon);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Polygon); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Polygon);

2
legacy/evas/src/lib/canvas/evas_object_rectangle.c
View File

@ -114,7 +114,7 @@ evas_object_rectangle_new(void)
Evas_Object_Rectangle *o; Evas_Object_Rectangle *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_rectangle", Evas_Object_Rectangle, 256, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_rectangle", Evas_Object_Rectangle, 16, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Rectangle); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Rectangle);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Rectangle); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Rectangle);

4
legacy/evas/src/lib/canvas/evas_object_smart.c
View File

@ -371,7 +371,7 @@ evas_object_smart_callback_priority_add(Evas_Object *obj, const char *event, Eva
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (!event) return; if (!event) return;
if (!func) return; if (!func) return;
EVAS_MEMPOOL_INIT(_mp_cb, "evas_smart_callback", Evas_Smart_Callback, 512, ); EVAS_MEMPOOL_INIT(_mp_cb, "evas_smart_callback", Evas_Smart_Callback, 32, );
cb = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Smart_Callback); cb = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Smart_Callback);
if (!cb) return; if (!cb) return;
EVAS_MEMPOOL_PREP(_mp_cb, cb, Evas_Smart_Callback); EVAS_MEMPOOL_PREP(_mp_cb, cb, Evas_Smart_Callback);
@ -975,7 +975,7 @@ evas_object_smart_new(void)
Evas_Object_Smart *o; Evas_Object_Smart *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_smart", Evas_Object_Smart, 256, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_smart", Evas_Object_Smart, 32, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Smart); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Smart);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Smart); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Smart);

2
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -1387,7 +1387,7 @@ evas_object_text_new(void)
Evas_Object_Text *o; Evas_Object_Text *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_text", Evas_Object_Text, 128, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_text", Evas_Object_Text, 8, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Text); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Text);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Text); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Text);

2
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -9339,7 +9339,7 @@ evas_object_textblock_new(void)
Evas_Object_Textblock *o; Evas_Object_Textblock *o;
/* alloc obj private data */ /* alloc obj private data */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_textblock", Evas_Object_Textblock, 64, NULL); EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_textblock", Evas_Object_Textblock, 8, NULL);
o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Textblock); o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Textblock);
if (!o) return NULL; if (!o) return NULL;
EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Textblock); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Textblock);

10
legacy/evas/src/lib/canvas/evas_object_textgrid.c
View File

@ -125,6 +125,8 @@ static const Evas_Object_Func object_func =
NULL NULL
}; };
EVAS_MEMPOOL(_mp_obj);
/* all nice and private */ /* all nice and private */
static void static void
evas_object_textgrid_init(Evas_Object *obj) evas_object_textgrid_init(Evas_Object *obj)
@ -154,9 +156,9 @@ evas_object_textgrid_new(void)
Evas_Object_Textgrid *o; Evas_Object_Textgrid *o;
/* FIXME: using evas mempool like text ? */ /* FIXME: using evas mempool like text ? */
EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_textgrid", Evas_Object_Textgrid, 4, NULL);
/* alloc obj private data */ o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Textgrid);
o = calloc(1, sizeof(Evas_Object_Textgrid)); EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Textgrid);
o->magic = MAGIC_OBJ_TEXTGRID; o->magic = MAGIC_OBJ_TEXTGRID;
o->prev = o->cur; o->prev = o->cur;
o->cur.palette_standard = eina_array_new(16); o->cur.palette_standard = eina_array_new(16);
@ -238,7 +240,7 @@ evas_object_textgrid_free(Evas_Object *obj)
eina_array_free(o->cur.palette_extended); eina_array_free(o->cur.palette_extended);
o->magic = 0; o->magic = 0;
/* FIXME: using evas mempool like text ? */ /* FIXME: using evas mempool like text ? */
free(o); EVAS_MEMPOOL_FREE(_mp_obj, o);
} }