Skip to content

Reset peak memory usage for controllers executing multiple unrelated tasks #6257

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

Merged
dtdesign merged 2 commits into from
Mar 28, 2025
Merged

Reset peak memory usage for controllers executing multiple unrelated tasks #6257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d4e748
Reset the peak memory usage for each job in BackgroundQueuePerformAction
TimWolla Mar 21, 2025
62265ec
Reset the peak memory usage for each cronjob in CronjobScheduler::exe…
TimWolla Mar 21, 2025
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
7 changes: 7 additions & 0 deletions wcfsetup/install/files/lib/action/BackgroundQueuePerformAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ public function execute()
parent::execute();

for ($i = 0; $i < self::$jobsPerRun; $i++) {
// Reset the memory usage for each background job, allowing to measure each individual
// background job's memory usage without a memory-heavy job skewing the numbers for
// the following jobs.
if (\PHP_VERSION_ID >= 80200) {
\memory_reset_peak_usage();
}

if (BackgroundQueueHandler::getInstance()->performNextJob() === false) {
// there were no more jobs
break;
Expand Down
7 changes: 7 additions & 0 deletions wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ public function executeCronjobs()
SessionHandler::getInstance()->changeUser(new User(null), true);

foreach ($cronjobEditors as $cronjobEditor) {
// Reset the memory usage for each cronjob, allowing to measure each individual
// cronjob's memory usage without a memory-heavy cronjob skewing the numbers for
// the following cronjobs.
if (\PHP_VERSION_ID >= 80200) {
\memory_reset_peak_usage();
}

// mark cronjob as being executed
$cronjobEditor->update([
'state' => Cronjob::EXECUTING,
Expand Down
Loading