diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-10-10 19:57:53 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-10-10 19:57:53 +0000 |
commit | 4d35e4ca03005d2f7fcf75caa877deb804d2f48a (patch) | |
tree | 111aebc08432286f540329e39aa84fd379e23b33 /configure.ac | |
parent | 59ed22a467fb4918064e5fa9dc6c75bee37faeaf (diff) |
efl: simplify mempools, nuke some and make remaining statically built.
Now we always build the following memory pools statically:
- pass_through: calls malloc/free directly, useful to debug.
- chained_pool: default for ages.
- one_big: used by some embedded systems (should we remove?)
Removed:
- ememoa_fixed and ememoa_unknown: depends on a separate lib, not supported?
- buddy: nobody uses it?
NOTE: we do not need the src/modules/eina/mp/*/Makefile.am anymore
since they are statically built. But I'll keep these and the
references in src/modules/eina/mp/Makefile.am
SVN revision: 77792
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 77 |
1 files changed, 4 insertions, 73 deletions
diff --git a/configure.ac b/configure.ac index 145c066b31..738a08cea9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -343,23 +343,7 @@ if test "x${have_stringshare_usage}" = "xyes"; then | |||
343 | fi | 343 | fi |
344 | 344 | ||
345 | # Choose best memory pool | 345 | # Choose best memory pool |
346 | AC_ARG_ENABLE([default-mempool], | 346 | EINA_CONFIGURE_DEFAULT_MEMPOOL="#define EINA_DEFAULT_MEMPOOL" |
347 | [AC_HELP_STRING([--enable-default-mempool], [Default memory allocator could be faster for some computer. @<:@default=disabled@:>@])], | ||
348 | [ | ||
349 | if test "x${enableval}" = "xyes"; then | ||
350 | have_default_mempool="yes" | ||
351 | else | ||
352 | have_default_mempool="no" | ||
353 | fi | ||
354 | ], | ||
355 | [have_default_mempool="no"]) | ||
356 | |||
357 | AC_MSG_CHECKING([whether to use default mempool allocator]) | ||
358 | AC_MSG_RESULT([${have_default_mempool}]) | ||
359 | |||
360 | if test "x${have_default_mempool}" = "xyes" ; then | ||
361 | EINA_CONFIGURE_DEFAULT_MEMPOOL="#define EINA_DEFAULT_MEMPOOL" | ||
362 | fi | ||
363 | AC_SUBST([EINA_CONFIGURE_DEFAULT_MEMPOOL]) | 347 | AC_SUBST([EINA_CONFIGURE_DEFAULT_MEMPOOL]) |
364 | 348 | ||
365 | ### Checks for programs | 349 | ### Checks for programs |
@@ -431,36 +415,11 @@ if test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_mall | |||
431 | fi | 415 | fi |
432 | 416 | ||
433 | ## Modules | 417 | ## Modules |
434 | |||
435 | # Check ememoa memory pool library | ||
436 | |||
437 | AC_ARG_ENABLE([ememoa], | ||
438 | [AC_HELP_STRING([--enable-ememoa], [build ememoa memory pool module @<:@default=yes@:>@])], | ||
439 | [ | ||
440 | if test "x${enableval}" = "xyes" ; then | ||
441 | enable_ememoa="yes" | ||
442 | else | ||
443 | enable_ememoa="no" | ||
444 | fi | ||
445 | ], | ||
446 | [enable_ememoa="yes"]) | ||
447 | |||
448 | AC_MSG_CHECKING([whether to use ememoa for memory pool]) | ||
449 | AC_MSG_RESULT([${enable_ememoa}]) | ||
450 | |||
451 | if test "x${enable_ememoa}" = "xyes" ; then | ||
452 | PKG_CHECK_MODULES([EMEMOA], | ||
453 | [ememoa >= 0.0.26 ], | ||
454 | [enable_ememoa="yes"], | ||
455 | [enable_ememoa="no"]) | ||
456 | fi | ||
457 | |||
458 | if ! test "x${requirements_pc_deps_eina}" = "x" ; then | 418 | if ! test "x${requirements_pc_deps_eina}" = "x" ; then |
459 | PKG_CHECK_MODULES([EINA], [${requirements_pc_deps_eina}]) | 419 | PKG_CHECK_MODULES([EINA], [${requirements_pc_deps_eina}]) |
460 | fi | 420 | fi |
461 | 421 | ||
462 | 422 | ||
463 | |||
464 | ## Examples | 423 | ## Examples |
465 | 424 | ||
466 | # TODO: add once ecore-evas is merged: | 425 | # TODO: add once ecore-evas is merged: |
@@ -596,24 +555,9 @@ AC_SUBST(EINA_CONFIGURE_HAVE_ON_OFF_THREADS) | |||
596 | AM_CONDITIONAL([EINA_ON_OFF_THREADS], [! test "x${efl_have_on_off_threads}" = "xno"]) | 555 | AM_CONDITIONAL([EINA_ON_OFF_THREADS], [! test "x${efl_have_on_off_threads}" = "xno"]) |
597 | 556 | ||
598 | ### Modules | 557 | ### Modules |
599 | 558 | EINA_CHECK_MODULE([chained-pool], [static], [chained pool]) | |
600 | if test "x${have_default_mempool}" = "xyes" ; then | 559 | EINA_CHECK_MODULE([pass-through], [static], [pass through]) |
601 | enable_chained_pool="no" | 560 | EINA_CHECK_MODULE([one-big], [static], [one big]) |
602 | enable_pass_through="static" | ||
603 | else | ||
604 | enable_chained_pool="static" | ||
605 | enable_pass_through="no" | ||
606 | fi | ||
607 | |||
608 | enable_one_big="static" | ||
609 | |||
610 | EINA_CHECK_MODULE([chained-pool], [${enable_chained_pool}], [chained pool]) | ||
611 | EINA_CHECK_MODULE([ememoa-fixed], [${enable_ememoa}], [ememoa fixed]) | ||
612 | EINA_CHECK_MODULE([ememoa-unknown], [${enable_ememoa}], [ememoa unknown]) | ||
613 | EINA_CHECK_MODULE([fixed-bitmap], [no], [fixed bitmap]) | ||
614 | EINA_CHECK_MODULE([pass-through], [${enable_pass_through}], [pass through]) | ||
615 | EINA_CHECK_MODULE([buddy], [no], [buddy]) | ||
616 | EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big]) | ||
617 | 561 | ||
618 | 562 | ||
619 | #### End of Eina | 563 | #### End of Eina |
@@ -912,11 +856,7 @@ src/modules/Makefile | |||
912 | src/modules/eina/Makefile | 856 | src/modules/eina/Makefile |
913 | src/modules/eina/mp/Makefile | 857 | src/modules/eina/mp/Makefile |
914 | src/modules/eina/mp/chained_pool/Makefile | 858 | src/modules/eina/mp/chained_pool/Makefile |
915 | src/modules/eina/mp/ememoa_fixed/Makefile | ||
916 | src/modules/eina/mp/ememoa_unknown/Makefile | ||
917 | src/modules/eina/mp/pass_through/Makefile | 859 | src/modules/eina/mp/pass_through/Makefile |
918 | src/modules/eina/mp/fixed_bitmap/Makefile | ||
919 | src/modules/eina/mp/buddy/Makefile | ||
920 | src/modules/eina/mp/one_big/Makefile | 860 | src/modules/eina/mp/one_big/Makefile |
921 | src/scripts/Makefile | 861 | src/scripts/Makefile |
922 | src/scripts/eina/Makefile | 862 | src/scripts/eina/Makefile |
@@ -966,15 +906,6 @@ echo " File dirfd...........: ${efl_func_dirfd}" | |||
966 | echo " File xattr...........: ${efl_func_setxattr}" | 906 | echo " File xattr...........: ${efl_func_setxattr}" |
967 | echo " shm_open.............: ${efl_func_shm_open}" | 907 | echo " shm_open.............: ${efl_func_shm_open}" |
968 | echo | 908 | echo |
969 | echo " Memory pools:" | ||
970 | echo " Buddy..............: ${enable_buddy}" | ||
971 | echo " Chained pool.......: ${enable_chained_pool}" | ||
972 | echo " Ememoa fixed.......: ${enable_ememoa_fixed}" | ||
973 | echo " Ememoa unknown.....: ${enable_ememoa_unknown}" | ||
974 | echo " Fixed bitmap.......: ${enable_fixed_bitmap}" | ||
975 | echo " One big............: ${enable_one_big}" | ||
976 | echo " Pass through.......: ${enable_pass_through}" | ||
977 | echo | ||
978 | echo "Compilation............: make (or gmake)" | 909 | echo "Compilation............: make (or gmake)" |
979 | echo " CPPFLAGS.............: $CPPFLAGS" | 910 | echo " CPPFLAGS.............: $CPPFLAGS" |
980 | echo " CFLAGS...............: $CFLAGS" | 911 | echo " CFLAGS...............: $CFLAGS" |