Release the ZTS reader reference in accel_deactivate_sub()

- As on Windows, accel_deactivate_sub() releases the thread's reference
  (ZCG(counted)) and accel_unlock_all() calls it instead of unlocking
  the whole file.
- gh8739.phpt: use two CLI server workers only on Linux and FreeBSD.
  Elsewhere the workers have no PDEATHSIG, outlive the server and keep
  the test's output open, so run-tests waits forever (macOS CI).

Author: pavimus

ext/opcache/ZendAccelerator.c

@@ -427,7 +427,11 @@ static inline void accel_deactivate_sub(void)
 		SHM_PROTECT();
 	}
 #elif defined(ZTS)
-	/* nothing to release: accel_activate_add() never succeeds under ZTS */
+	/* releases the reference taken in RINIT (accel_activate_add() never succeeds under ZTS) */
+	if (ZCG(counted)) {
+		accel_zts_readers_add(-1);
+		ZCG(counted) = false;
+	}
 #else
 	struct flock mem_usage_unlock;
 
@@ -444,15 +448,10 @@ static inline void accel_deactivate_sub(void)
 
 static inline void accel_unlock_all(void)
 {
-#ifdef ZEND_WIN32
+#if defined(ZEND_WIN32) || defined(ZTS)
+	/* Under ZTS never unlock the whole file: fcntl() locks belong to the process, and the
+	 * SHM write lock (byte 0) and the restart lock (byte 2) may be held by other threads. */
 	accel_deactivate_sub();
-#elif defined(ZTS)
-	/* Release this thread's reference only. Never unlock the whole file: fcntl() locks
-	 * belong to the process, and the SHM write lock (byte 0) and the restart lock
-	 * (byte 2) may be held by other threads. */
-	if (ZCG(counted)) {
-		accel_zts_readers_add(-1);
-	}
 #else
 	if (lock_file == -1) {
 		return;

ext/opcache/tests/gh8739.phpt

@@ -26,7 +26,8 @@ file_put_contents("$dir/reset.php", "<?php\nvar_dump(opcache_reset());\n");
 
 include __DIR__ . '/php_cli_server.inc';
 
-if (PHP_OS_FAMILY !== 'Windows') {
+/* elsewhere the workers outlive the server without PDEATHSIG, see php_cli_server_pdeathsig.phpt */
+if (PHP_OS === 'Linux' || PHP_OS === 'FreeBSD') {
     putenv('PHP_CLI_SERVER_WORKERS=2');
 }
 $ini = '-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.file_update_protection=0';