This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
70 lines
1.9 KiB
C++
70 lines
1.9 KiB
C++
/*
|
|
* 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 <unistd.h>
|
|
#include <cstdlib>
|
|
#include <cstdio>
|
|
#include <cstring>
|
|
#elif defined(WEBRTC_MAC)
|
|
#include <mach/mach.h>
|
|
#elif defined(WEBRTC_WIN)
|
|
#include <windows.h>
|
|
#include <psapi.h>
|
|
#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<int64_t>(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<task_info_t>(&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
|