DM: display current memory usage (instead of peak) when available.

Seems strictly more useful.

This implements Mac and Windows, which seemed easy.  Don't know how to do this on Linux yet.

BUG=skia:

CQ_EXTRA_TRYBOTS=client.skia:Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug-Trybot

NOTREECHECKS=true
TBR=halcanary@google.com

Review URL: https://codereview.chromium.org/990723002

2 files changed, 40 insertions, 11 deletions

diff --git a/tools/ProcStats.cpp b/tools/ProcStats.cpp
index c9f9f3f6c5..1af71917bd 100644
--- a/tools/ProcStats.cpp
+++ b/tools/ProcStats.cpp
@@ -7,10 +7,7 @@
 
 #include "ProcStats.h"
 
-#if defined(SK_BUILD_FOR_UNIX) || \
-    defined(SK_BUILD_FOR_MAC) || \
-    defined(SK_BUILD_FOR_ANDROID)
-
+#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_ANDROID)
     #include <sys/resource.h>
     int sk_tools::getMaxResidentSetSizeMB() {
         struct rusage ru;
@@ -21,7 +18,6 @@
         return static_cast<int>(ru.ru_maxrss / 1024);  // Linux reports kilobytes.
     #endif
     }
-
 #elif defined(SK_BUILD_FOR_WIN32)
     #include <windows.h>
     #include <psapi.h>
@@ -30,10 +26,27 @@
         GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
         return static_cast<int>(info.PeakWorkingSetSize / 1024 / 1024);  // Windows reports bytes.
     }
-
 #else
-    int sk_tools::getMaxResidentSetSizeMB() {
-        return -1;
-    }
+    int sk_tools::getMaxResidentSetSizeMB() { return -1; }
+#endif
 
+#if defined(SK_BUILD_FOR_MAC)
+    #include <mach/mach.h>
+    int sk_tools::getCurrResidentSetSizeMB() {
+        mach_task_basic_info info;
+        mach_msg_type_number_t count = MACH_TASK_BASIC_INFO_COUNT;
+        if (KERN_SUCCESS !=
+                task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &count)) {
+            return -1;
+        }
+        return info.resident_size / 1024 / 1024;  // Darwin reports bytes.
+    }
+#elif defined(SK_BUILD_FOR_WIN32)
+    int sk_tools::getCurrResidentSetSizeMB() {
+        PROCESS_MEMORY_COUNTERS info;
+        GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+        return static_cast<int>(info.WorkingSetSize / 1024 / 1024);  // Windows reports bytes.
+    }
+#else
+    int sk_tools::getCurrResidentSetSizeMB() { return -1; }
 #endif
diff --git a/tools/ProcStats.h b/tools/ProcStats.h
index 14b98b7a28..f085fe31a6 100644
--- a/tools/ProcStats.h
+++ b/tools/ProcStats.h
@@ -15,11 +15,27 @@
 namespace sk_tools {
 
 /**
- *  If not implemented for this OS, returns -1.  Otherwise, return
- *  the maximum resident set size, as reported by getrusage().
+ *  If implemented, returns the maximum resident set size in MB.
+ *  If not, returns -1.
  */
 int getMaxResidentSetSizeMB();
 
+/**
+ *  If implemented, returns the current resident set size in MB.
+ *  If not, returns -1.
+ */
+int getCurrResidentSetSizeMB();
+
+/**
+ *  If implemented, returns getCurrResidentSetSizeMB().
+ *  If not, if implemented, returns getMaxResidentSetSizeMB().
+ *  If not, returns -1.
+ */
+inline int getBestResidentSetSizeMB() {
+    int mb = getCurrResidentSetSizeMB();
+    return mb >= 0 ? mb : getMaxResidentSetSizeMB();
+}
+
 }  // namespace sk_tools
 
 #endif  // ProcStats_DEFINED