Skip to content

Commit 76dc338

Browse files
committed
Reduce default fiber stack size
8M to 2M on 64-bit, 2M to 1M on 32-bit.
1 parent f74968c commit 76dc338

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

Zend/zend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static ZEND_INI_MH(OnUpdateFiberStackSize) /* {{{ */
180180
if (new_value) {
181181
EG(fiber_stack_size) = zend_atol(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
182182
} else {
183-
EG(fiber_stack_size) = zend_fiber_page_size() * ZEND_FIBER_DEFAULT_PAGE_COUNT;
183+
EG(fiber_stack_size) = ZEND_FIBER_DEFAULT_C_STACK_SIZE;
184184
}
185185
return SUCCESS;
186186
}

Zend/zend_fibers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static zend_always_inline void zend_observer_fiber_switch_notify(zend_fiber *fro
106106
}
107107
/* }}} */
108108

109-
size_t zend_fiber_page_size()
109+
static size_t zend_fiber_page_size()
110110
{
111111
#if _POSIX_MAPPED_FILES
112112
static size_t page_size;

Zend/zend_fibers.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ typedef struct _zend_fiber_context {
5252
zend_fiber_stack stack;
5353
} zend_fiber_context;
5454

55-
#define ZEND_FIBER_GUARD_PAGES 1
56-
57-
#define ZEND_FIBER_DEFAULT_PAGE_COUNT (((sizeof(void *)) < 8) ? 512 : 2048)
58-
5955
typedef struct _zend_fiber {
6056
/* Fiber PHP object handle. */
6157
zend_object std;
@@ -111,7 +107,9 @@ ZEND_COLD ZEND_NORETURN void zend_error_suspend_fiber(
111107
ZEND_API void zend_fiber_switch_context(zend_fiber_context *to);
112108
ZEND_API void zend_fiber_suspend_context(zend_fiber_context *current);
113109

114-
size_t zend_fiber_page_size();
110+
#define ZEND_FIBER_GUARD_PAGES 1
111+
112+
#define ZEND_FIBER_DEFAULT_C_STACK_SIZE (4096 * (((sizeof(void *)) < 8) ? 256 : 512))
115113

116114
#define ZEND_FIBER_VM_STACK_SIZE (1024 * sizeof(zval))
117115

0 commit comments

Comments
 (0)