Move ini setting to zend.c

Changed setting to use values similar to memory_limit, e.g., fiber.stack_size = 8M

Author: trowski

Zend/zend.c

@@ -175,6 +175,17 @@ static ZEND_INI_MH(OnSetExceptionStringParamMaxLen) /* {{{ */
 }
 /* }}} */
 
+static ZEND_INI_MH(OnUpdateFiberStackSize) /* {{{ */
+{
+	if (new_value) {
+		EG(fiber_stack_size) = zend_atol(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
+	} else {
+		EG(fiber_stack_size) = zend_fiber_page_size() * ZEND_FIBER_DEFAULT_PAGE_COUNT;
+	}
+	return SUCCESS;
+}
+/* }}} */
+
 #if ZEND_DEBUG
 # define SIGNAL_CHECK_DEFAULT "1"
 #else
@@ -193,6 +204,8 @@ ZEND_INI_BEGIN()
 #endif
 	STD_ZEND_INI_BOOLEAN("zend.exception_ignore_args",	"0",	ZEND_INI_ALL,		OnUpdateBool, exception_ignore_args, zend_executor_globals, executor_globals)
 	STD_ZEND_INI_ENTRY("zend.exception_string_param_max_len",	"15",	ZEND_INI_ALL,	OnSetExceptionStringParamMaxLen,	exception_string_param_max_len,		zend_executor_globals,	executor_globals)
+	STD_ZEND_INI_ENTRY("fiber.stack_size",		NULL,			ZEND_INI_ALL,		OnUpdateFiberStackSize,		fiber_stack_size,	zend_executor_globals, 		executor_globals)
+
 ZEND_INI_END()
 
 ZEND_API size_t zend_vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap) /* {{{ */

main/main.c

@@ -73,7 +73,6 @@
 #include "zend_dtrace.h"
 #include "zend_observer.h"
 #include "zend_system_id.h"
-#include "zend_fibers.h"
 
 #include "php_content_types.h"
 #include "php_ticks.h"
@@ -303,36 +302,6 @@ static PHP_INI_MH(OnSetLogFilter)
 }
 /* }}} */
 
-/* {{{ PHP_INI_MH */
-static PHP_INI_MH(OnUpdateFiberStackSize)
-{
-	zend_long tmp;
-	const size_t page_size = zend_fiber_page_size();
-
-	if (OnUpdateLongGEZero(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {
-		return FAILURE;
-	}
-
-	if (EG(fiber_stack_size) == 0) {
-		EG(fiber_stack_size) = page_size * ZEND_FIBER_DEFAULT_PAGE_COUNT;
-		return SUCCESS;
-	}
-
-	EG(fiber_stack_size) += ZEND_FIBER_GUARD_PAGES;
-
-	tmp = page_size * EG(fiber_stack_size);
-
-	if (tmp / page_size != EG(fiber_stack_size)) {
-		EG(fiber_stack_size) = page_size * ZEND_FIBER_DEFAULT_PAGE_COUNT;
-		return FAILURE;
-	}
-
-	EG(fiber_stack_size) = tmp;
-
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ php_disable_classes */
 static void php_disable_classes(void)
 {
@@ -768,8 +737,6 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("syslog.facility",		"LOG_USER",		PHP_INI_SYSTEM,		OnSetFacility,		syslog_facility,	php_core_globals,		core_globals)
 	STD_PHP_INI_ENTRY("syslog.ident",		"php",			PHP_INI_SYSTEM,		OnUpdateString,		syslog_ident,		php_core_globals,		core_globals)
 	STD_PHP_INI_ENTRY("syslog.filter",		"no-ctrl",		PHP_INI_ALL,		OnSetLogFilter,		syslog_filter,		php_core_globals, 		core_globals)
-
-	STD_PHP_INI_ENTRY("fiber.stack_size",		"0",			PHP_INI_ALL,		OnUpdateFiberStackSize,		fiber_stack_size,	zend_executor_globals, 		executor_globals)
 PHP_INI_END()
 /* }}} */