Skip to content

added memory usage to console progress helper #9573

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

Closed
wants to merge 2 commits into from
Closed

added memory usage to console progress helper #9573

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b44603
added memory usage to console progress helper
lsv Nov 22, 2013
8a18b7d
added spaces around operators, removed elseif's
lsv Nov 22, 2013
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
33 changes: 32 additions & 1 deletion src/Symfony/Component/Console/Helper/ProgressHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ProgressHelper extends Helper
{
const FORMAT_QUIET = ' %percent%%';
const FORMAT_NORMAL = ' %current%/%max% [%bar%] %percent%%';
const FORMAT_VERBOSE = ' %current%/%max% [%bar%] %percent%% Elapsed: %elapsed%';
const FORMAT_VERBOSE = ' %current%/%max% [%bar%] %percent%% Elapsed: %elapsed% (%memory%)';
const FORMAT_QUIET_NOMAX = ' %current%';
const FORMAT_NORMAL_NOMAX = ' %current% [%bar%]';
const FORMAT_VERBOSE_NOMAX = ' %current% [%bar%] Elapsed: %elapsed%';
Expand Down Expand Up @@ -76,6 +76,7 @@ class ProgressHelper extends Helper
'bar',
'percent',
'elapsed',
'memory'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Miss trailing comma.

);

/**
Expand All @@ -95,6 +96,7 @@ class ProgressHelper extends Helper
'max' => 4,
'percent' => 3,
'elapsed' => 6,
'memory' => 6
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Miss trailing comma.

);

/**
Expand Down Expand Up @@ -392,9 +394,38 @@ private function generate($finish = false)
$vars['percent'] = str_pad(floor($percent * 100), $this->widths['percent'], ' ', STR_PAD_LEFT);
}

if (isset($this->formatVars['memory'])) {
$vars['memory'] = str_pad($this->humaneMemory(), $this->widths['memory'], ' ', STR_PAD_LEFT);
}

return $vars;
}

/**
* Converts memory usage to human-readable format.
*
* @return string
*/
private function humaneMemory()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: humanMemory

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about humanReadableMemory?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or readableMemory ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just took the "name" from the method just below called "humaneTime"

{
$memory = memory_get_usage(true);

if ($memory > 1024*1024*1024*10) {
return sprintf('%.2fGB', $memory/1024/1024/1024);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more correct would be GiB, MiB, KiB etc.

}

if ($memory > 1024*1024*10) {
return sprintf('%.2fMB', $memory/1024/1024);
}

if ($memory > 1024*10) {
return sprintf('%.2fkB', $memory/1024);
}

return sprintf('%.2fB', $memory);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this line break

}

/**
* Converts seconds into human-readable format.
*
Expand Down