null+****@clear*****
null+****@clear*****
2012年 7月 13日 (金) 13:14:04 JST
Kouhei Sutou 2012-07-13 13:14:04 +0900 (Fri, 13 Jul 2012) New Revision: 116262374751a91318c4815e9a293aeeaf98cfbb https://github.com/groonga/groonga/commit/116262374751a91318c4815e9a293aeeaf98cfbb Log: Make GRN_STACK_SIZE customizable on build This is DANGER parameter!!! Normally, you should not use it!!! For configure: ./configure --with-stack-size=4096 For CMake: cmake -DGRN_STACK_SIZE=4096 Modified files: CMakeLists.txt config.h.cmake configure.ac lib/ctx_impl.h Modified: CMakeLists.txt (+4 -0) =================================================================== --- CMakeLists.txt 2012-07-11 14:38:25 +0900 (9bbe64c) +++ CMakeLists.txt 2012-07-13 13:14:04 +0900 (41437a2) @@ -57,6 +57,10 @@ set(GRN_DEFAULT_RELATIVE_DOCUMENT_ROOT set(GRN_DEFAULT_DOCUMENT_ROOT "${GRN_DATA_DIR}/${GRN_DEFAULT_DOCUMENT_ROOT_BASE}" CACHE PATH "groonga default document root") +set(GRN_STACK_SIZE + 1024 + CACHE STRING + "DANGER!!! groonga stack size. Normarlly, you should not change this variable.") set(GRN_RELATIVE_PLUGINS_DIR "${CMAKE_PROJECT_NAME}/plugins" CACHE PATH "groonga plugins' relative directory") Modified: config.h.cmake (+2 -0) =================================================================== --- config.h.cmake 2012-07-11 14:38:25 +0900 (729cc9e) +++ config.h.cmake 2012-07-13 13:14:04 +0900 (05549bc) @@ -28,6 +28,8 @@ #define GRN_DEFAULT_DOCUMENT_ROOT \ "${GRN_DEFAULT_DOCUMENT_ROOT}" +#define GRN_STACK_SIZE ${GRN_STACK_SIZE} + #define GRN_RELATIVE_PLUGINS_DIR \ "${GRN_RELATIVE_PLUGINS_DIR}" #define GRN_PLUGINS_DIR "${GRN_PLUGINS_DIR}" Modified: configure.ac (+12 -1) =================================================================== --- configure.ac 2012-07-11 14:38:25 +0900 (ec24b35) +++ configure.ac 2012-07-13 13:14:04 +0900 (8fed021) @@ -400,12 +400,22 @@ AC_DEFINE_UNQUOTED(GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD, $GRN_DEFAULT_MATCH_ES # default DB key management algorithm AC_ARG_WITH(default_db_key, [AS_HELP_STRING([--with-default-db-key=ALGORITHM], - [specify groonga default DB key(pat/dat/auto)])], + [specify groonga default DB key (pat/dat/auto)])], GRN_DEFAULT_DB_KEY="$withval", GRN_DEFAULT_DB_KEY="auto") AC_DEFINE_UNQUOTED(GRN_DEFAULT_DB_KEY, "$GRN_DEFAULT_DB_KEY", "specified default DB key management algorithm") +# DANGER!!!: stack size +GRN_STACK_SIZE=1024 +AC_ARG_WITH(stack_size, + [AS_HELP_STRING([--with-stack-size=SIZE], + [DANGER!!! + This option specifies stack size. (default=$GRN_STACK_SIZE) + Normally, you should not use this option.])], + GRN_STACK_SIZE="$withval") +AC_DEFINE_UNQUOTED(GRN_STACK_SIZE, [$GRN_STACK_SIZE], [stack size]) + if test "$os_win32" != "yes"; then AC_CHECK_HEADERS(pthread.h) AC_SEARCH_LIBS(pthread_create, pthread, @@ -1209,6 +1219,7 @@ echo " Compiler: ${CC}" echo " CFLAGS: ${CFLAGS}" echo " CXXFLAGS: ${CXXFLAGS}" echo " Libraries: ${LIBS}" +echo " Stack size: ${GRN_STACK_SIZE}" echo " Document: ${document_available}" echo " buildable: ${document_buildable}" echo " built: ${have_built_document}" Modified: lib/ctx_impl.h (+0 -1) =================================================================== --- lib/ctx_impl.h 2012-07-11 14:38:25 +0900 (64c15cd) +++ lib/ctx_impl.h 2012-07-13 13:14:04 +0900 (791fd75) @@ -74,7 +74,6 @@ typedef struct { grn_content_type input_type; } grn_loader; -#define GRN_STACK_SIZE 1024 #define GRN_CTX_N_SEGMENTS 512 #ifdef USE_MEMORY_DEBUG -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download