diff --git a/src/benchmarks/eina/eina_bench_mempool.c b/src/benchmarks/eina/eina_bench_mempool.c index d7e2c62ade..783677484c 100644 --- a/src/benchmarks/eina/eina_bench_mempool.c +++ b/src/benchmarks/eina/eina_bench_mempool.c @@ -78,50 +78,6 @@ eina_mempool_pass_through(int request) } #endif -#ifdef EINA_BUILD_FIXED_BITMAP -static void -eina_mempool_fixed_bitmap(int request) -{ - Eina_Mempool *mp; - - mp = eina_mempool_add("fixed_bitmap", "test", NULL, sizeof (int)); - _eina_mempool_bench(mp, request); - eina_mempool_del(mp); -} -#endif - -#ifdef EINA_BUILD_EMEMOA_FIXED -static void -eina_mempool_ememoa_fixed(int request) -{ - Eina_Mempool *mp; - - mp = eina_mempool_add("ememoa_fixed", "test", NULL, sizeof (int), 8, 0); - _eina_mempool_bench(mp, request); - eina_mempool_del(mp); -} -#endif - -#ifdef EINA_BUILD_EMEMOA_UNKNOWN -static void -eina_mempool_ememoa_unknown(int request) -{ - Eina_Mempool *mp; - - mp = eina_mempool_add("ememoa_unknown", - "test", - NULL, - 0, - 2, - sizeof (int), - 8, - sizeof (int) * 2, - 8); - _eina_mempool_bench(mp, request); - eina_mempool_del(mp); -} -#endif - #ifdef EINA_BENCH_HAVE_GLIB static void eina_mempool_glib(int request) @@ -165,21 +121,6 @@ eina_bench_mempool(Eina_Benchmark *bench) EINA_BENCHMARK( eina_mempool_pass_through), 10, 10000, 10); #endif -#ifdef EINA_BUILD_FIXED_BITMAP - eina_benchmark_register(bench, "fixed bitmap", - EINA_BENCHMARK( - eina_mempool_fixed_bitmap), 10, 10000, 10); -#endif -#ifdef EINA_BUILD_EMEMOA_FIXED - eina_benchmark_register(bench, "ememoa fixed", - EINA_BENCHMARK( - eina_mempool_ememoa_fixed), 10, 10000, 10); -#endif -#ifdef EINA_BUILD_EMEMOA_UNKNOWN - eina_benchmark_register(bench, "ememoa unknown", - EINA_BENCHMARK( - eina_mempool_ememoa_unknown), 10, 10000, 10); -#endif #ifdef EINA_BENCH_HAVE_GLIB eina_benchmark_register(bench, "gslice", EINA_BENCHMARK( diff --git a/src/tests/eina/eina_test_mempool.c b/src/tests/eina/eina_test_mempool.c index 4a265b6f8a..4b1d936a4f 100644 --- a/src/tests/eina/eina_test_mempool.c +++ b/src/tests/eina/eina_test_mempool.c @@ -127,59 +127,6 @@ START_TEST(eina_mempool_pass_through) END_TEST #endif -#ifdef EINA_BUILD_FIXED_BITMAP -START_TEST(eina_mempool_fixed_bitmap) -{ - Eina_Mempool *mp; - - _mempool_init(); - - mp = eina_mempool_add("fixed_bitmap", "test", NULL, sizeof (int)); - _eina_mempool_test(mp, EINA_FALSE, EINA_FALSE); - - _mempool_shutdown(); -} -END_TEST -#endif - -#ifdef EINA_BUILD_EMEMOA_FIXED -START_TEST(eina_mempool_ememoa_fixed) -{ - Eina_Mempool *mp; - - _mempool_init(); - - mp = eina_mempool_add("ememoa_fixed", "test", NULL, sizeof (int), 8, 0); - _eina_mempool_test(mp, EINA_FALSE, EINA_TRUE); - - _mempool_shutdown(); -} -END_TEST -#endif - -#ifdef EINA_BUILD_EMEMOA_UNKNOWN -START_TEST(eina_mempool_ememoa_unknown) -{ - Eina_Mempool *mp; - - _mempool_init(); - - mp = eina_mempool_add("ememoa_unknown", - "test", - NULL, - 0, - 2, - sizeof (int), - 8, - sizeof (int) * 2, - 8); - _eina_mempool_test(mp, EINA_TRUE, EINA_TRUE); - - _mempool_shutdown(); -} -END_TEST -#endif - void eina_test_mempool(TCase *tc) { @@ -189,13 +136,4 @@ eina_test_mempool(TCase *tc) #ifdef EINA_BUILD_PASS_THROUGH tcase_add_test(tc, eina_mempool_pass_through); #endif -#ifdef EINA_BUILD_FIXED_BITMAP - tcase_add_test(tc, eina_mempool_fixed_bitmap); -#endif -#ifdef EINA_BUILD_EMEMOA_FIXED - tcase_add_test(tc, eina_mempool_ememoa_fixed); -#endif -#ifdef EINA_BUILD_EMEMOA_UNKNOWN - tcase_add_test(tc, eina_mempool_ememoa_unknown); -#endif }