openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

metrics_daemon: fix parsing of zram sysfs 

The only real change is in ReadFileToUint64.  The other changes
appease the updated pre-commit checks.

BUG=chromium:390334
TEST=ran manually, checked syslog, checked chrome://histograms

Change-Id: I5ca10aab03697aa8fd64c5dd51ca64911e8d2a76
Reviewed-on: https://chromium-review.googlesource.com/206285
Tested-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Queue: Luigi Semenzato <semenzato@chromium.org>
This commit is contained in:
Luigi Semenzato 2014-06-30 18:12:28 -07:00 committed by chrome-internal-fetch
parent 6a26a0d4c6
commit 4a6c942d1d
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
metrics/metrics_daemon.cc
View File

@ -2,9 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "metrics_daemon.h"
// For PRIu64 in inttypes.h, used by scanf. TODO(semenzato): replace
// with libchromeos methods.
#define __STDC_FORMAT_MACROS
#include "metrics/metrics_daemon.h"
#include <fcntl.h>
#include <inttypes.h>
#include <math.h>
#include <string.h>
#include <time.h>
@ -153,7 +158,7 @@ double MetricsDaemon::GetActiveTime() {
PLOG(WARNING) << "clock_gettime(CLOCK_MONOTONIC) failed";
return 0;
} else {
return ts.tv_sec + ((double) ts.tv_nsec) / (1000 * 1000 * 1000);
return ts.tv_sec + static_cast<double>(ts.tv_nsec) / (1000 * 1000 * 1000);
}
}
@ -456,8 +461,8 @@ void MetricsDaemon::ScheduleStatsCallback(int wait) {
g_timeout_add_seconds(wait, StatsCallbackStatic, this);
}
bool MetricsDaemon::DiskStatsReadStats(long int* read_sectors,
long int* write_sectors) {
bool MetricsDaemon::DiskStatsReadStats(uint64* read_sectors,
uint64* write_sectors) {
int nchars;
int nitems;
bool success = false;
@ -478,7 +483,7 @@ bool MetricsDaemon::DiskStatsReadStats(long int* read_sectors,
LOG_IF(WARNING, nchars == sizeof(line))
<< "line too long in " << diskstats_path_;
line[nchars] = '\0';
nitems = sscanf(line, "%*d %*d %ld %*d %*d %*d %ld",
nitems = sscanf(line, "%*d %*d %" PRIu64 "d %*d %*d %*d %" PRIu64 "d",
read_sectors, write_sectors);
if (nitems == 2) {
success = true;
@ -618,7 +623,7 @@ gboolean MetricsDaemon::StatsCallbackStatic(void* handle) {
// Collects disk and vm stats alternating over a short and a long interval.
void MetricsDaemon::StatsCallback() {
long int read_sectors_now, write_sectors_now;
uint64 read_sectors_now, write_sectors_now;
struct VmstatRecord vmstats_now;
double time_now = GetActiveTime();
double delta_time = time_now - stats_initial_time_;
@ -757,6 +762,8 @@ bool MetricsDaemon::ReadFileToUint64(const base::FilePath& path,
PLOG(WARNING) << "cannot read " << path.MaybeAsASCII();
return false;
}
// Remove final newline.
base::TrimWhitespaceASCII(content, base::TRIM_TRAILING, &content);
if (!base::StringToUint64(content, value)) {
LOG(WARNING) << "invalid integer: " << content;
return false;

19
metrics/metrics_daemon.h
View File

@ -2,25 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef METRICS_DAEMON_H_
#define METRICS_DAEMON_H_
#ifndef METRICS_METRICS_DAEMON_H_
#define METRICS_METRICS_DAEMON_H_
#include <dbus/dbus.h>
#include <glib.h>
#include <map>
#include <string>
#include <vector>
#include <base/files/file_path.h>
#include <base/memory/scoped_ptr.h>
#include <base/time/time.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "metrics_library.h"
#include "persistent_integer.h"
#include "metrics/metrics_library.h"
#include "metrics/persistent_integer.h"
using chromeos_metrics::PersistentInteger;
class MetricsDaemon {
public:
MetricsDaemon();
~MetricsDaemon();
@ -206,7 +207,7 @@ class MetricsDaemon {
void ScheduleStatsCallback(int wait);
// Reads cumulative disk statistics from sysfs. Returns true for success.
bool DiskStatsReadStats(long int* read_sectors, long int* write_sectors);
bool DiskStatsReadStats(uint64* read_sectors, uint64* write_sectors);
// Reads cumulative vm statistics from procfs. Returns true for success.
bool VmStatsReadStats(struct VmstatRecord* stats);
@ -316,8 +317,8 @@ class MetricsDaemon {
unsigned int memuse_interval_index_;
// Contain the most recent disk and vm cumulative stats.
long int read_sectors_;
long int write_sectors_;
uint64 read_sectors_;
uint64 write_sectors_;
struct VmstatRecord vmstats_;
StatsState stats_state_;
@ -364,4 +365,4 @@ class MetricsDaemon {
std::string cpuinfo_max_freq_path_;
};
#endif // METRICS_DAEMON_H_
#endif // METRICS_METRICS_DAEMON_H_