Menu
▾
▴
E SVN: tasn IN trunk/eina: . src/include src/modules/mp/chained_pool src/tests
|
From: Enlightenment S. <no-...@en...> - 2011-02-03 20:04:09
|
Log: Eina: reverted commit 56637 (scalability and whatever improvements) it had HUGE leaks. Author: tasn Date: 2011-02-03 12:04:03 -0800 (Thu, 03 Feb 2011) New Revision: 56695 Trac: http://trac.enlightenment.org/e/changeset/56695 Modified: trunk/eina/ChangeLog trunk/eina/src/include/eina_rbtree.h trunk/eina/src/modules/mp/chained_pool/eina_chained_mempool.c trunk/eina/src/tests/eina_bench_array.c Modified: trunk/eina/ChangeLog =================================================================== --- trunk/eina/ChangeLog 2011-02-03 20:00:00 UTC (rev 56694) +++ trunk/eina/ChangeLog 2011-02-03 20:04:03 UTC (rev 56695) @@ -1,8 +1,4 @@ 2011-01-29 Carsten Haitzler (The Rasterman) 1.0.0 release - -2011-02-01 Cedric Bail - - * Improve scalability and raw speed of Chained Mempool. - + Modified: trunk/eina/src/include/eina_rbtree.h =================================================================== --- trunk/eina/src/include/eina_rbtree.h 2011-02-03 20:00:00 UTC (rev 56694) +++ trunk/eina/src/include/eina_rbtree.h 2011-02-03 20:04:03 UTC (rev 56695) @@ -96,12 +96,6 @@ #define EINA_RBTREE_GET(Rbtree) & ((Rbtree)->__rbtree) /** - * @def EINA_RBTREE_CONTAINER_GET - * find back the container of an red black tree. - */ -#define EINA_RBTREE_CONTAINER_GET(Ptr, Type) ((Type *)((char *)Ptr - offsetof(Type, __rbtree))) - -/** * @typedef Eina_Rbtree_Cmp_Node_Cb * Function used compare two nodes and see which direction to navigate. */ Modified: trunk/eina/src/modules/mp/chained_pool/eina_chained_mempool.c =================================================================== --- trunk/eina/src/modules/mp/chained_pool/eina_chained_mempool.c 2011-02-03 20:00:00 UTC (rev 56694) +++ trunk/eina/src/modules/mp/chained_pool/eina_chained_mempool.c 2011-02-03 20:04:03 UTC (rev 56695) @@ -42,7 +42,6 @@ #include "eina_module.h" #include "eina_mempool.h" #include "eina_trash.h" -#include "eina_rbtree.h" #include "eina_private.h" @@ -65,7 +64,6 @@ struct _Chained_Mempool { Eina_Inlist *first; - Eina_Rbtree *root; const char *name; int item_alloc; int pool_size; @@ -88,7 +86,6 @@ struct _Chained_Pool { EINA_INLIST; - EINA_RBTREE; Eina_Trash *base; int usage; @@ -96,24 +93,6 @@ unsigned char *limit; }; -static inline Eina_Rbtree_Direction -_eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, __UNUSED__ void *data) -{ - if (left < right) return EINA_RBTREE_LEFT; - return EINA_RBTREE_RIGHT; -} - -static inline int -_eina_chained_mp_pool_key_cmp(const Eina_Rbtree *node, const void *key, - __UNUSED__ int length, __UNUSED__ void *data) -{ - const Chained_Pool *r = EINA_RBTREE_CONTAINER_GET(node, const Chained_Pool); - - if (key > (void *) r->limit) return 1; - if (key < (void *) r) return -1; - return 0; -} - static inline Chained_Pool * _eina_chained_mp_pool_new(Chained_Mempool *pool) { @@ -172,13 +151,17 @@ #endif #endif - // Either we have some free space in the first one, or there is no free space. - p = EINA_INLIST_CONTAINER_GET(pool->first, Chained_Pool); + // look 4 pool from 2nd bucket on + EINA_INLIST_FOREACH(pool->first, p) + { + // base is not NULL - has a free slot + if (p->base || p->last) + { + pool->first = eina_inlist_demote(pool->first, EINA_INLIST_GET(p)); + break; + } + } - // base is not NULL - has a free slot - if (p && !p->base && !p->last) - p = NULL; - // we have reached the end of the list - no free pools if (!p) { @@ -199,8 +182,6 @@ } pool->first = eina_inlist_prepend(pool->first, EINA_INLIST_GET(p)); - pool->root = eina_rbtree_inline_insert(pool->root, EINA_RBTREE_GET(p), - _eina_chained_mp_pool_cmp, NULL); } if (p->last) @@ -248,7 +229,6 @@ eina_chained_mempool_free(void *data, void *ptr) { Chained_Mempool *pool = data; - Eina_Rbtree *r; Chained_Pool *p; void *pmem; @@ -269,52 +249,36 @@ #endif #endif - // searching for the right mempool - r = eina_rbtree_inline_lookup(pool->root, ptr, 0, _eina_chained_mp_pool_key_cmp, NULL); + EINA_INLIST_FOREACH(pool->first, p) + { + // Could the pointer be inside that pool + if ((unsigned char*) ptr < p->limit) + { + // pool mem base + pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool)); + // is it in pool mem? + if (ptr >= pmem) + { + // freed node points to prev free node + eina_trash_push(&p->base, ptr); + // next free node is now the one we freed + p->usage--; + pool->usage--; + if (p->usage == 0) + { + // free bucket + pool->first = eina_inlist_remove(pool->first, EINA_INLIST_GET(p)); + _eina_chained_mp_pool_free(p); + } + else + // move to front + pool->first = eina_inlist_promote(pool->first, EINA_INLIST_GET(p)); - // related mempool not found - if (!r) - { -#ifdef DEBUG - INF("%p is not the property of %p Chained_Mempool", ptr, pool); -#endif - goto on_error; - } + break; + } + } + } - p = EINA_RBTREE_CONTAINER_GET(r, Chained_Pool); - - // pool mem base - pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool)); - - // is it in pool mem? - if (ptr < pmem) - { -#ifdef DEBUG - INF("%p is inside the private part of %p pool from %p Chained_Mempool (could be the sign of a buffer underrun).", ptr, p, pool); -#endif - goto on_error; - } - - // freed node points to prev free node - eina_trash_push(&p->base, ptr); - // next free node is now the one we freed - p->usage--; - pool->usage--; - if (p->usage == 0) - { - // free bucket - pool->first = eina_inlist_remove(pool->first, EINA_INLIST_GET(p)); - pool->root = eina_rbtree_inline_remove(pool->root, EINA_RBTREE_GET(p), - _eina_chained_mp_pool_cmp, NULL); - _eina_chained_mp_pool_free(p); - } - else - { - // move to front - pool->first = eina_inlist_promote(pool->first, EINA_INLIST_GET(p)); - } - - on_error: #ifndef NVALGRIND if (ptr) { @@ -407,16 +371,9 @@ #endif mp->first = eina_inlist_remove(mp->first, mp->first); - mp->root = eina_rbtree_inline_remove(mp->root, EINA_RBTREE_GET(p), - _eina_chained_mp_pool_cmp, NULL); _eina_chained_mp_pool_free(p); } -#ifdef DEBUG - if (mp->root) - INF("Bad news, list of pool and rbtree are out of sync for %p !", mp); -#endif - #ifndef NVALGRIND VALGRIND_DESTROY_MEMPOOL(mp); #endif Modified: trunk/eina/src/tests/eina_bench_array.c =================================================================== --- trunk/eina/src/tests/eina_bench_array.c 2011-02-03 20:00:00 UTC (rev 56694) +++ trunk/eina/src/tests/eina_bench_array.c 2011-02-03 20:04:03 UTC (rev 56695) @@ -691,9 +691,9 @@ EINA_BENCHMARK( eina_bench_evas_list_4evas_render), 200, 4000, 100); - eina_benchmark_register(bench, "ecore", - EINA_BENCHMARK( - eina_bench_ecore_list_4evas_render), 200, - 500, 100); + /* eina_benchmark_register(bench, "ecore", */ + /* EINA_BENCHMARK( */ + /* eina_bench_ecore_list_4evas_render), 200, */ + /* 1000, 100); */ } |