Commit 3293faf

authored

Add OPcache restart hook (#15590)

This hook will allow observing extensions to observe the actual OPcache restart.

1 parent c5b258f commit 3293fafCopy full SHA for 3293faf

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ ZEND_API char (zend_getenv)(const char *name, size_t name_len);`
`94`	`94`	`ZEND_API zend_string (zend_resolve_path)(zend_string *filename);`
`95`	`95`	`ZEND_API zend_result (*zend_post_startup_cb)(void) = NULL;`
`96`	`96`	`ZEND_API void (*zend_post_shutdown_cb)(void) = NULL;`
	`97`	`+ZEND_API void (*zend_accel_schedule_restart_hook)(int reason) = NULL;`
`97`	`98`	`ZEND_ATTRIBUTE_NONNULL ZEND_API zend_result (zend_random_bytes)(void bytes, size_t size, char *errstr, size_t errstr_size) = NULL;`
`98`	`99`	`ZEND_ATTRIBUTE_NONNULL ZEND_API void (zend_random_bytes_insecure)(zend_random_bytes_insecure_state state, void *bytes, size_t size) = NULL;`
`99`	`100`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,8 @@ extern ZEND_ATTRIBUTE_NONNULL ZEND_API void (*zend_random_bytes_insecure)(`
`377`	`377`	`extern ZEND_API zend_result (*zend_post_startup_cb)(void);`
`378`	`378`	`extern ZEND_API void (*zend_post_shutdown_cb)(void);`
`379`	`379`
	`380`	`+extern ZEND_API void (*zend_accel_schedule_restart_hook)(int reason);`
	`381`	`+`
`380`	`382`	`ZEND_API ZEND_COLD void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);`
`381`	`383`	`ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);`
`382`	`384`	`ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn_unchecked(int type, const char *format, ...);`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3431,6 +3431,11 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason)`
`3431`	`3431`	`/* don't schedule twice */`
`3432`	`3432`	`return;`
`3433`	`3433`	`}`
	`3434`	`+`
	`3435`	`+ if (UNEXPECTED(zend_accel_schedule_restart_hook)) {`
	`3436`	`+ zend_accel_schedule_restart_hook(reason);`
	`3437`	`+ }`
	`3438`	`+`
`3434`	`3439`	`zend_accel_error(ACCEL_LOG_DEBUG, "Restart Scheduled! Reason: %s",`
`3435`	`3440`	`zend_accel_restart_reason_text[reason]);`
`3436`	`3441`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ extern const char *zps_api_failure_reason;`
`311`	`311`	`BEGIN_EXTERN_C()`
`312`	`312`
`313`	`313`	`void accel_shutdown(void);`
`314`		`-zend_result accel_activate(INIT_FUNC_ARGS);`
	`314`	`+zend_result accel_activate(INIT_FUNC_ARGS);`
`315`	`315`	`zend_result accel_post_deactivate(void);`
`316`	`316`	`void zend_accel_schedule_restart(zend_accel_restart_reason reason);`
`317`	`317`	`void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason);`

Comments

(0)