php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 00:53:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

ext/opcache/ZendAccelerator: accel_is_inactive() returns bool

Browse Source 
It was declared to be `int`, but actually returned `zend_result` enum
values.  However the name of the function suggests it should be
`bool`, so returning something else is error prone.  The function
definition is difficult enough already because the name is negated...
This commit is contained in:
Max Kellermann
2023-02-14 20:28:39 +01:00
committed by George Peter Banyard
parent 3dcd47243c
commit a50de37013
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ext/opcache/ZendAccelerator.c
View File

@@ -893,7 +893,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check)
}
#endif
static inline int accel_is_inactive(void)
static inline bool accel_is_inactive(void)
{
#ifdef ZEND_WIN32
/* on Windows, we don't need kill_all_lockers() because SAPIs
@@ -904,7 +904,7 @@ static inline int accel_is_inactive(void)
provide us with the PID of locker processes) */
if (LOCKVAL(mem_usage) == 0) {
return SUCCESS;
return true;
}
#else
struct flock mem_usage_check;
@@ -916,10 +916,10 @@ static inline int accel_is_inactive(void)
mem_usage_check.l_pid = -1;
if (fcntl(lock_file, F_GETLK, &mem_usage_check) == -1) {
zend_accel_error(ACCEL_LOG_DEBUG, "UpdateC: %s (%d)", strerror(errno), errno);
return FAILURE;
return false;
}
if (mem_usage_check.l_type == F_UNLCK) {
return SUCCESS;
return true;
}
if (ZCG(accel_directives).force_restart_timeout
@@ -928,11 +928,11 @@ static inline int accel_is_inactive(void)
zend_accel_error(ACCEL_LOG_WARNING, "Forced restart at %ld (after " ZEND_LONG_FMT " seconds), locked by %d", (long)time(NULL), ZCG(accel_directives).force_restart_timeout, mem_usage_check.l_pid);
kill_all_lockers(&mem_usage_check);
return FAILURE; /* next request should be able to restart it */
return false; /* next request should be able to restart it */
}
#endif
return FAILURE;
return false;
}
static int zend_get_stream_timestamp(const char *filename, zend_stat_t *statbuf)
@@ -2687,7 +2687,7 @@ zend_result accel_activate(INIT_FUNC_ARGS)
if (ZCSG(restart_pending)) {
zend_shared_alloc_lock();
if (ZCSG(restart_pending)) { /* check again, to ensure that the cache wasn't already cleaned by another process */
if (accel_is_inactive() == SUCCESS) {
if (accel_is_inactive()) {
zend_accel_error(ACCEL_LOG_DEBUG, "Restarting!");
ZCSG(restart_pending) = false;
switch ZCSG(restart_reason) {