Skip to content

[stable31] feat(profiler): Use gzdecode/gzencode to parse profiles #56507

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
wants to merge 1 commit into
base: stable31
Choose a base branch
from
Open

[stable31] feat(profiler): Use gzdecode/gzencode to parse profiles #56507

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
52 changes: 41 additions & 11 deletions lib/private/Profiler/FileProfilerStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ class FileProfilerStorage {
// Folder where profiler data are stored.
private string $folder;

/** @psalm-suppress UndefinedClass */
public const allowedClasses = [
\OCA\Profiler\DataCollector\EventLoggerDataProvider::class,
\OCA\Profiler\DataCollector\HttpDataCollector::class,
\OCA\Profiler\DataCollector\MemoryDataCollector::class,
\OCA\User_LDAP\DataCollector\LdapDataCollector::class,
\OC\Memcache\ProfilerWrapperCache::class,
\OC\Profiler\RoutingDataCollector::class,
\OC\DB\DbDataCollector::class,
];

/**
* Constructs the file storage using a "dsn-like" path.
*
Expand Down Expand Up @@ -97,11 +108,21 @@ public function read(string $token): ?IProfile {
return null;
}

if (\function_exists('gzcompress')) {
$file = 'compress.zlib://' . $file;
$h = fopen($file, 'r');
flock($h, \LOCK_SH);
$data = stream_get_contents($h);
flock($h, \LOCK_UN);
fclose($h);

if (\function_exists('gzdecode')) {
$data = @gzdecode($data) ?: $data;
}

if (!$data = unserialize($data, ['allowed_classes' => self::allowedClasses])) {
return null;
}

return $this->createProfileFromData($token, unserialize(file_get_contents($file)));
return $this->createProfileFromData($token, $data);
}

/**
Expand Down Expand Up @@ -139,14 +160,13 @@ public function write(IProfile $profile): bool {
'status_code' => $profile->getStatusCode(),
];

$context = stream_context_create();
$data = serialize($data);

if (\function_exists('gzcompress')) {
$file = 'compress.zlib://' . $file;
stream_context_set_option($context, 'zlib', 'level', 3);
if (\function_exists('gzencode')) {
$data = gzencode($data, 3);
}

if (file_put_contents($file, serialize($data), 0, $context) === false) {
if (file_put_contents($file, $data, \LOCK_EX) === false) {
return false;
}

Expand Down Expand Up @@ -266,11 +286,21 @@ protected function createProfileFromData(string $token, array $data, ?IProfile $
continue;
}

if (\function_exists('gzcompress')) {
$file = 'compress.zlib://' . $file;
$h = fopen($file, 'r');
flock($h, \LOCK_SH);
$data = stream_get_contents($h);
flock($h, \LOCK_UN);
fclose($h);

if (\function_exists('gzdecode')) {
$data = @gzdecode($data) ?: $data;
}

if (!$data = unserialize($data, ['allowed_classes' => self::allowedClasses])) {
continue;
}

$profile->addChild($this->createProfileFromData($token, unserialize(file_get_contents($file)), $profile));
$profile->addChild($this->createProfileFromData($token, $data, $profile));
}

return $profile;
Expand Down
Loading