commit 4b8aebb0f452e5d2fc28cfa90a14ab14dc0db5f0
author Sonny Rao <sonnyrao@chromium.org> Wed Jul 31 23:18:31 2013 -0700
committer ChromeBot <chrome-bot@google.com> Thu Aug 01 18:15:49 2013 -0700
tree 979a8c2d42541895e2b700bf5d9415aee65f8144
parent 6e55c11537d0625e6d6a024db4b80ab942081022

Add additional stats for swapping from /proc/vmstat

This adds swap-in and swap-out rate calculation on the same intervals
as major page fault collection.

BUG=chromium:261965
TEST=observe Platform.SwapIn{Long,Short} and
Platform.SwapOut{Long,Short} appear in histograms

Change-Id: Ifcdba1088cdff355b8e132145ac79635b185663b
Reviewed-on: https://gerrit.chromium.org/gerrit/64162
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>

metrics/metrics_daemon.h

diff --git a/metrics/metrics_daemon.h b/metrics/metrics_daemon.h
index 03c5f3c..d3a4f72 100644
--- a/metrics/metrics_daemon.h
+++ b/metrics/metrics_daemon.h
@@ -120,6 +120,13 @@
     int value;               // value from /proc/meminfo
   };
 
+  // Record for retrieving and reporting values from /proc/vmstat
+  struct VmstatRecord {
+    uint64_t page_faults_;    // major faults
+    uint64_t swap_in_;        // pages swapped in
+    uint64_t swap_out_;       // pages swapped out
+  };
+
   typedef std::map<std::string, chromeos_metrics::FrequencyCounter*>
     FrequencyCounters;
 
@@ -152,6 +159,10 @@
   static const char kMetricWriteSectorsShortName[];
   static const char kMetricPageFaultsShortName[];
   static const char kMetricPageFaultsLongName[];
+  static const char kMetricSwapInLongName[];
+  static const char kMetricSwapInShortName[];
+  static const char kMetricSwapOutLongName[];
+  static const char kMetricSwapOutShortName[];
   static const char kMetricScaledCpuFrequencyName[];
   static const int kMetricStatsShortInterval;
   static const int kMetricStatsLongInterval;
@@ -284,10 +295,10 @@
   bool DiskStatsReadStats(long int* read_sectors, long int* write_sectors);
 
   // Reads cumulative vm statistics from procfs.  Returns true for success.
-  bool VmStatsReadStats(long int* page_faults);
+  bool VmStatsReadStats(struct VmstatRecord* stats);
 
   // Parse cumulative vm statistics from a C string.  Returns true for success.
-  bool VmStatsParseStats(char* stats, long int* page_faults);
+  bool VmStatsParseStats(const char* stats, struct VmstatRecord* record);
 
   // Reports disk and vm statistics (static version for glib).  Arguments are a
   // glib artifact.
@@ -403,7 +414,7 @@
   // Contain the most recent disk and vm cumulative stats.
   long int read_sectors_;
   long int write_sectors_;
-  long int page_faults_;
+  struct VmstatRecord vmstats_;
 
   StatsState stats_state_;
   double stats_initial_time_;