diff options
| -rw-r--r-- | dm/DMReporter.cpp | 21 | ||||
| -rw-r--r-- | gyp/dm.gypi | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 12 | ||||
| -rw-r--r-- | tools/ProcStats.cpp | 31 | ||||
| -rw-r--r-- | tools/ProcStats.h | 25 | ||||
| -rw-r--r-- | tools/render_pdfs_main.cpp | 10 |
6 files changed, 18 insertions, 82 deletions
diff --git a/dm/DMReporter.cpp b/dm/DMReporter.cpp index 12bcfac0f3..14f5087102 100644 --- a/dm/DMReporter.cpp +++ b/dm/DMReporter.cpp @@ -3,7 +3,21 @@ #include "SkDynamicAnnotations.h" #include "SkCommonFlags.h" #include "OverwriteLine.h" -#include "ProcStats.h" + +#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_ANDROID) + #include <sys/resource.h> + static long get_max_rss_kb() { + struct rusage ru; + getrusage(RUSAGE_SELF, &ru); + #if defined(SK_BUILD_FOR_MAC) + return ru.ru_maxrss / 1024; // Darwin reports bytes. + #else + return ru.ru_maxrss; // Linux reports kilobytes. + #endif + } +#else + static long get_max_rss_kb() { return 0; } +#endif namespace DM { @@ -22,9 +36,8 @@ void Reporter::printStatus(SkString name, SkMSec timeMs) const { status.appendf(", %d failed", failed); } if (FLAGS_verbose) { - int max_rss_kb = sk_tools::getMaxResidentSetSizeKB(); - if (max_rss_kb >= 0) { - status.appendf("\t%4dM peak", max_rss_kb / 1024); + if (long max_rss_kb = get_max_rss_kb()) { + status.appendf("\t%4ldM peak", max_rss_kb / 1024); } status.appendf("\t%5dms\t%s", timeMs, name.c_str()); } diff --git a/gyp/dm.gypi b/gyp/dm.gypi index 2a13c80e66..1f11e17872 100644 --- a/gyp/dm.gypi +++ b/gyp/dm.gypi @@ -19,7 +19,6 @@ 'jsoncpp.gyp:jsoncpp', 'skia_lib.gyp:skia_lib', 'tools.gyp:crash_handler', - 'tools.gyp:sk_tool_proc_stats', 'tools.gyp:sk_tool_utils', ], 'includes': [ diff --git a/gyp/tools.gyp b/gyp/tools.gyp index f4d927cd89..f36c523435 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -530,7 +530,6 @@ 'pdf.gyp:pdf', 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_utils', - 'tools.gyp:sk_tool_proc_stats', ], 'conditions': [ ['skia_win_debuggers_path and skia_os == "win"', @@ -647,17 +646,6 @@ 'skia_lib.gyp:skia_lib', ], }, - { - 'target_name': 'sk_tool_proc_stats', - 'type': 'static_library', - 'sources': [ - '../tools/ProcStats.h', - '../tools/ProcStats.cpp', - ], - 'direct_dependent_settings': { - 'include_dirs': [ '../tools', ], - }, - }, ], 'conditions': [ ['skia_shared_lib', diff --git a/tools/ProcStats.cpp b/tools/ProcStats.cpp deleted file mode 100644 index 94660394f8..0000000000 --- a/tools/ProcStats.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2014 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "ProcStats.h" - -#if defined(SK_BUILD_FOR_UNIX) || \ - defined(SK_BUILD_FOR_MAC) || \ - defined(SK_BUILD_FOR_ANDROID) - - #include <sys/resource.h> - int sk_tools::getMaxResidentSetSizeKB() { - struct rusage ru; - getrusage(RUSAGE_SELF, &ru); - #if defined(SK_BUILD_FOR_MAC) - return static_cast<int>(ru.ru_maxrss / 1024); // Darwin reports bytes. - #else - return static_cast<int>(ru.ru_maxrss); // Linux reports kilobytes. - #endif - } - -#else - - int sk_tools::getMaxResidentSetSizeKB() { - return -1; - } - -#endif diff --git a/tools/ProcStats.h b/tools/ProcStats.h deleted file mode 100644 index 42849f1401..0000000000 --- a/tools/ProcStats.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2014 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef ProcStats_DEFINED -#define ProcStats_DEFINED - -/** - * ProcStats - Process Statistics Functions - */ - -namespace sk_tools { - -/** - * If not implemented for this OS, returns -1. Otherwise, return - * the maximum resident set size, as reported by getrusage(). - */ -int getMaxResidentSetSizeKB(); - -} // namespace sk_tools - -#endif // ProcStats_DEFINED diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp index 34e5e58f53..be294399ec 100644 --- a/tools/render_pdfs_main.cpp +++ b/tools/render_pdfs_main.cpp @@ -18,7 +18,6 @@ #include "SkTArray.h" #include "SkTSort.h" #include "PdfRenderer.h" -#include "ProcStats.h" #include "picture_utils.h" __SK_FORCE_IMAGE_DECODER_LINKING; @@ -220,9 +219,7 @@ static int process_input( } } } - if (files.count() > 0) { - SkTQSort<SkString>(files.begin(), files.end() - 1); - } + SkTQSort<SkString>(files.begin(), files.end() - 1); int failures = 0; for (int i = 0; i < files.count(); i ++) { if (!render_pdf(files[i], outputDir, renderer)) { @@ -249,11 +246,6 @@ int tool_main_core(int argc, char** argv) { int failures = process_input(FLAGS_inputPaths, outputDir, *renderer); - int max_rss_kb = sk_tools::getMaxResidentSetSizeKB(); - if (max_rss_kb >= 0) { - SkDebugf("%4dM peak ResidentSetSize\n", max_rss_kb / 1024); - } - if (failures != 0) { SkDebugf("Failed to render %i PDFs.\n", failures); return 1; |