diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:03:17 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:03:17 +0000 |
commit | 5a3b9149085f033097663a63c90e152051fd6c56 (patch) | |
tree | 4e0ed4ceabd2ce7b7fd7ed2c9168f7641c5ad8f3 /base/process_util_linux.cc | |
parent | c5874079454b61b597de2258c4256d5008183b1a (diff) | |
download | chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.zip chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.tar.gz chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.tar.bz2 |
Revert "Fix a ton of compiler warnings."
This reverts commit r24792.
TBR=estade
Review URL: http://codereview.chromium.org/179028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_linux.cc')
-rw-r--r-- | base/process_util_linux.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index f93b359..a05e9bb 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -259,6 +259,7 @@ bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const { int private_kb = 0; int pss_kb = 0; bool have_pss = false; + const int kPssAdjust = 0.5; if (!file_util::ReadFileToString(stat_file, &smaps)) return false; @@ -277,12 +278,12 @@ bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const { return false; } if (StartsWithASCII(last_key_name, "Shared_", 1)) { - shared_kb += StringToInt(tokenizer.token()); + shared_kb += StringToInt(tokenizer.token()); } else if (StartsWithASCII(last_key_name, "Private_", 1)) { - private_kb += StringToInt(tokenizer.token()); + private_kb += StringToInt(tokenizer.token()); } else if (StartsWithASCII(last_key_name, "Pss", 1)) { - have_pss = true; - pss_kb += StringToInt(tokenizer.token()); + have_pss = true; + pss_kb += StringToInt(tokenizer.token()) + kPssAdjust; } state = KEY_NAME; break; |