Check if restart is pending before trying to lock SHM

This reduces lock contention when Opcache restart is scheduled but not yet started. Closes GH-11805
php · Jul 31, 2023 · 3e9792f · 3e9792f
1 parent b5f8a72
commit 3e9792f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -21,6 +21,8 @@ PHP                                                                        NEWS
 - Opcache:
   . Fixed bug GH-11715 (opcache.interned_strings_buffer either has no effect or
     opcache_get_status() / phpinfo() is wrong). (nielsdos)
+  . Avoid adding an unnecessary read-lock when loading script from shm if
+    restart is in progress. (mikhainin)
 
 - Standard:
   . Prevent int overflow on $decimals in number_format. (Marc Bennewitz)

diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
@@ -1786,6 +1786,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
 
 	if (!file_cache_only &&
 	    !ZCSG(restart_in_progress) &&
+	    !ZCSG(restart_pending) &&
 		!ZSMMG(memory_exhausted) &&
 	    accelerator_shm_read_lock() == SUCCESS) {
 		/* exclusive lock */