Skip to content

Update memory calculations related to PHP opcache bug #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MisterDuval wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update memory calculations related to PHP opcache bug #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 42 additions & 12 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* A simple but effective single-file GUI for the OPcache PHP extension.
*
* @author Andrew Collington, andy@amnuts.com
* @version 3.6.1
* @version 3.6.2
* @link https://github.com/amnuts/opcache-gui
* @license MIT, https://acollington.mit-license.org/
*/
Expand Down Expand Up @@ -59,7 +59,7 @@

class Service
{
public const VERSION = '3.6.1';
public const VERSION = '3.6.2';

protected $tz;
protected $data;
Expand Down Expand Up @@ -308,6 +308,7 @@ protected function size($size): string
{
$i = 0;
$val = ['b', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
$size = abs((float) $size);
while (($size / 1024) > 1) {
$size /= 1024;
++$i;
Expand Down Expand Up @@ -339,6 +340,28 @@ protected function compileState(): array
$config['directives'] = array_merge($config['directives'], $missingConfig);
}

// FrankenPHP / PHP 8.5+ ZTS: opcache_get_configuration() can report
// memory_consumption=0 while ini_get() is correct (MB). Also used_memory
// may overflow to a negative int. See php/frankenphp#2231 / #2354.
$memoryConsumption = (int) ($config['directives']['opcache.memory_consumption'] ?? 0);
if ($memoryConsumption <= 0) {
$memoryConsumption = max(0, (int) ini_get('opcache.memory_consumption') * 1024 * 1024);
$config['directives']['opcache.memory_consumption'] = $memoryConsumption;
}
if (isset($status['memory_usage'])) {
if (($status['memory_usage']['used_memory'] ?? 0) < 0 && $memoryConsumption > 0) {
$status['memory_usage']['used_memory'] = max(
0,
$memoryConsumption
- (int) ($status['memory_usage']['free_memory'] ?? 0)
- (int) ($status['memory_usage']['wasted_memory'] ?? 0)
);
}
if (!is_finite($status['memory_usage']['current_wasted_percentage'] ?? 0)) {
$status['memory_usage']['current_wasted_percentage'] = 0.0;
}
}

$files = [];
if (!empty($status['scripts']) && $this->getOption('allow_filelist')) {
uasort($status['scripts'], static function ($a, $b) {
Expand Down Expand Up @@ -366,20 +389,27 @@ protected function compileState(): array
if ($config['directives']['opcache.file_cache_only'] || !empty($status['file_cache_only'])) {
$overview = false;
} else {
$maxCachedKeys = (int) ($status['opcache_statistics']['max_cached_keys'] ?? 0);
$overview = array_merge(
$status['memory_usage'], $status['opcache_statistics'], [
'used_memory_percentage' => round(100 * (
($status['memory_usage']['used_memory'] + $status['memory_usage']['wasted_memory'])
/ $config['directives']['opcache.memory_consumption']
)),
'used_memory_percentage' => ($memoryConsumption > 0
? round(100 * (
($status['memory_usage']['used_memory'] + $status['memory_usage']['wasted_memory'])
/ $memoryConsumption
))
: 0
),
'hit_rate_percentage' => round($status['opcache_statistics']['opcache_hit_rate']),
'used_key_percentage' => round(100 * (
$status['opcache_statistics']['num_cached_keys']
/ $status['opcache_statistics']['max_cached_keys']
)),
'used_key_percentage' => ($maxCachedKeys > 0
? round(100 * (
$status['opcache_statistics']['num_cached_keys']
/ $maxCachedKeys
))
: 0
),
'wasted_percentage' => round($status['memory_usage']['current_wasted_percentage'], 2),
'readable' => [
'total_memory' => $this->size($config['directives']['opcache.memory_consumption']),
'total_memory' => $this->size($memoryConsumption),
'used_memory' => $this->size($status['memory_usage']['used_memory']),
'free_memory' => $this->size($status['memory_usage']['free_memory']),
'wasted_memory' => $this->size($status['memory_usage']['wasted_memory']),
Expand Down Expand Up @@ -1699,4 +1729,4 @@ function debounce(func, wait, immediate) {
</script>

</body>
</html>
</html>