diff options
| author |  mtklein <mtklein@chromium.org> | 2014-08-19 15:55:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-19 15:55:55 -0700 |
| commit | afb4379dbca4d4d3824ace183a7348d24bc1589f (patch) | |
| tree | 8eb8aeb9bd612669796e5c51afc35cdb46308f36 /tools | |
| parent | d2a3522503ca0c39829f1bb41f01201d1affdaf6 (diff) | |
Print max RSS in GM and nanobench too.
Everyone used MB, so update the API to just return that.
BUG=skia:
R=halcanary@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/483323002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ProcStats.cpp | 8 | ||||
| -rw-r--r-- | tools/ProcStats.h | 2 | ||||
| -rw-r--r-- | tools/render_pdfs_main.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/ProcStats.cpp b/tools/ProcStats.cpp index 94660394f8..eaa1379301 100644 --- a/tools/ProcStats.cpp +++ b/tools/ProcStats.cpp @@ -12,19 +12,19 @@ defined(SK_BUILD_FOR_ANDROID) #include <sys/resource.h> - int sk_tools::getMaxResidentSetSizeKB() { + int sk_tools::getMaxResidentSetSizeMB() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); #if defined(SK_BUILD_FOR_MAC) - return static_cast<int>(ru.ru_maxrss / 1024); // Darwin reports bytes. + return static_cast<int>(ru.ru_maxrss / 1024 / 1024); // Darwin reports bytes. #else - return static_cast<int>(ru.ru_maxrss); // Linux reports kilobytes. + return static_cast<int>(ru.ru_maxrss / 1024); // Linux reports kilobytes. #endif } #else - int sk_tools::getMaxResidentSetSizeKB() { + int sk_tools::getMaxResidentSetSizeMB() { return -1; } diff --git a/tools/ProcStats.h b/tools/ProcStats.h index 42849f1401..14b98b7a28 100644 --- a/tools/ProcStats.h +++ b/tools/ProcStats.h @@ -18,7 +18,7 @@ namespace sk_tools { * If not implemented for this OS, returns -1. Otherwise, return * the maximum resident set size, as reported by getrusage(). */ -int getMaxResidentSetSizeKB(); +int getMaxResidentSetSizeMB(); } // namespace sk_tools diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp index a1bd62d4f4..8e791d9608 100644 --- a/tools/render_pdfs_main.cpp +++ b/tools/render_pdfs_main.cpp @@ -268,9 +268,9 @@ int tool_main_core(int argc, char** argv) { ++failures; } - int max_rss_kb = sk_tools::getMaxResidentSetSizeKB(); - if (max_rss_kb >= 0) { - SkDebugf(" %4dM peak rss", max_rss_kb / 1024); + int max_rss_mb = sk_tools::getMaxResidentSetSizeMB(); + if (max_rss_mb >= 0) { + SkDebugf(" %4dM peak rss", max_rss_mb); } SkDebugf("\n"); |