From ab210c8ad96764ede65d6760a14189f3ac6f7f9d Mon Sep 17 00:00:00 2001 From: ilnik Date: Tue, 28 Feb 2017 02:18:27 -0800 Subject: [PATCH] Added memory usage function to webrtc/base/. BUG=webrtc:7095 Review-Url: https://codereview.webrtc.org/2706403010 Cr-Commit-Position: refs/heads/master@{#16895} --- webrtc/base/BUILD.gn | 3 ++ webrtc/base/memory_usage.cc | 69 ++++++++++++++++++++++++++++ webrtc/base/memory_usage.h | 24 ++++++++++ webrtc/base/memory_usage_unittest.cc | 23 ++++++++++ 4 files changed, 119 insertions(+) create mode 100644 webrtc/base/memory_usage.cc create mode 100644 webrtc/base/memory_usage.h create mode 100644 webrtc/base/memory_usage_unittest.cc diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index d8f5e2b096..eb9361bc42 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -698,6 +698,8 @@ if (rtc_include_tests) { "gunit.h", "httpserver.cc", "httpserver.h", + "memory_usage.cc", + "memory_usage.h", "natserver.cc", "natserver.h", "natsocketfactory.cc", @@ -853,6 +855,7 @@ if (rtc_include_tests) { "httpcommon_unittest.cc", "httpserver_unittest.cc", "ipaddress_unittest.cc", + "memory_usage_unittest.cc", "messagedigest_unittest.cc", "messagequeue_unittest.cc", "nat_unittest.cc", diff --git a/webrtc/base/memory_usage.cc b/webrtc/base/memory_usage.cc new file mode 100644 index 0000000000..d37a702332 --- /dev/null +++ b/webrtc/base/memory_usage.cc @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/base/memory_usage.h" + +#if defined(WEBRTC_LINUX) +#include +#include +#include +#include +#elif defined(WEBRTC_MAC) +#include +#elif defined(WEBRTC_WIN) +#include +#include +#endif + +#include "webrtc/base/logging.h" + +namespace rtc { + +int64_t GetProcessResidentSizeBytes() { +#if defined(WEBRTC_LINUX) + FILE* file = fopen("/proc/self/statm", "r"); + if (file == nullptr) { + LOG(LS_ERROR) << "Failed to open /proc/self/statm"; + return -1; + } + int result = -1; + if (fscanf(file, "%*s%d", &result) != 1) { + fclose(file); + LOG(LS_ERROR) << "Failed to parse /proc/self/statm"; + return -1; + } + fclose(file); + return static_cast(result) * sysconf(_SC_PAGESIZE); +#elif defined(WEBRTC_MAC) + task_basic_info_64 info; + mach_msg_type_number_t info_count = TASK_BASIC_INFO_64_COUNT; + if (task_info(mach_task_self(), TASK_BASIC_INFO_64, + reinterpret_cast(&info), + &info_count) != KERN_SUCCESS) { + LOG_ERR(LS_ERROR) << "task_info() failed"; + return -1; + } + return info.resident_size; +#elif defined(WEBRTC_WIN) + PROCESS_MEMORY_COUNTERS pmc; + if (GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)) == 0) { + LOG_ERR(LS_ERROR) << "GetProcessMemoryInfo() failed"; + return -1; + } + return pmc.WorkingSetSize; +#else + // Not implemented yet. + static_assert(false, + "GetProcessVirtualMemoryUsageBytes() platform support not yet " + "implemented."); +#endif +} + +} // namespace rtc diff --git a/webrtc/base/memory_usage.h b/webrtc/base/memory_usage.h new file mode 100644 index 0000000000..2699082c38 --- /dev/null +++ b/webrtc/base/memory_usage.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +#ifndef WEBRTC_BASE_MEMORY_USAGE_H_ +#define WEBRTC_BASE_MEMORY_USAGE_H_ + +#include + +namespace rtc { + +// Returns current memory used by the process in bytes (working set size on +// Windows and resident set size on other platforms). +// Returns -1 on failure. +int64_t GetProcessResidentSizeBytes(); + +} // namespace rtc + +#endif // WEBRTC_BASE_MEMORY_USAGE_H_ diff --git a/webrtc/base/memory_usage_unittest.cc b/webrtc/base/memory_usage_unittest.cc new file mode 100644 index 0000000000..99857ec5e6 --- /dev/null +++ b/webrtc/base/memory_usage_unittest.cc @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/base/memory_usage.h" +#include +#include "webrtc/test/gtest.h" + +namespace rtc { + +TEST(GetMemoryUsage, SimpleTest) { + int64_t used_bytes = GetProcessResidentSizeBytes(); + EXPECT_GE(used_bytes, 0); +} + +} // namespace rtc +