diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 22:55:29 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 22:55:29 +0000 |
commit | 66d0a94a6f19afa8d3229672e694a881aca6e41a (patch) | |
tree | 0eaaef20503a9c0ab19bbf2eec4ac2f95f3f0a3a /base | |
parent | 1872da023bf348e3c89bb675573d7fac7faffa97 (diff) | |
download | chromium_src-66d0a94a6f19afa8d3229672e694a881aca6e41a.zip chromium_src-66d0a94a6f19afa8d3229672e694a881aca6e41a.tar.gz chromium_src-66d0a94a6f19afa8d3229672e694a881aca6e41a.tar.bz2 |
Log warnings, not errors, if we can't fetch memory status for
commit charge reporting. Fix if-blocks around returning 0.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/386031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/process_util_linux.cc | 7 | ||||
-rw-r--r-- | base/process_util_mac.mm | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index f45a8b8..10ae0b1 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -470,14 +470,15 @@ size_t GetSystemCommitCharge() { // Used memory is: total - free - buffers - caches FilePath meminfo_file("/proc/meminfo"); std::string meminfo_data; - if (!file_util::ReadFileToString(meminfo_file, &meminfo_data)) - LOG(ERROR) << "Failed to open /proc/meminfo."; + if (!file_util::ReadFileToString(meminfo_file, &meminfo_data)) { + LOG(WARNING) << "Failed to open /proc/meminfo."; return 0; + } std::vector<std::string> meminfo_fields; SplitStringAlongWhitespace(meminfo_data, &meminfo_fields); if (meminfo_fields.size() < kMemCacheIndex) { - LOG(ERROR) << "Failed to parse /proc/meminfo. Only found " << + LOG(WARNING) << "Failed to parse /proc/meminfo. Only found " << meminfo_fields.size() << " fields."; return 0; } diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index ff6393e..073e705 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -223,15 +223,17 @@ size_t GetSystemCommitCharge() { kern_return_t kr = host_statistics(host, HOST_VM_INFO, reinterpret_cast<host_info_t>(&data), &count); - if (kr) - LOG(ERROR) << "Failed to fetch host statistics."; + if (kr) { + LOG(WARNING) << "Failed to fetch host statistics."; return 0; + } vm_size_t page_size; kr = host_page_size(host, &page_size); - if (kr) + if (kr) { LOG(ERROR) << "Failed to fetch host page size."; return 0; + } return (data.active_count * page_size) / 1024; } |