Implement ToValue() for SystemMetrics, SystemMemoryInfoKB, DiskInfo, and SwapInfo.

base/process/process_metrics.h

 // Copyright (c) 2013 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.
 
 // This file contains routines for gathering resource statistics for processes
 // running on the system.
 
 #ifndef BASE_PROCESS_PROCESS_METRICS_H_
 #define BASE_PROCESS_PROCESS_METRICS_H_
 
@@ skipping 220 matching lines @@
 BASE_EXPORT int ParseProcStatCPU(const std::string& input);
 
 // Get the number of threads of |process| as available in /proc/<pid>/stat.
 // This should be used with care as no synchronization with running threads is
 // done. This is mostly useful to guarantee being single-threaded.
 // Returns 0 on failure.
 BASE_EXPORT int GetNumberOfThreads(ProcessHandle process);
 
 // /proc/self/exe refers to the current executable.
 BASE_EXPORT extern const char kProcSelfExe[];
+#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
 // Data from /proc/meminfo about system-wide memory consumption.
 // Values are in KB.
 struct BASE_EXPORT SystemMemoryInfoKB {
   SystemMemoryInfoKB();
 
+  // Serializes the platform specific fields to value.
+  Value* AsValue() const;
+
+#if defined(OS_LINUX) || defined(OS_ANDROID)
   int total;
   int free;
   int buffers;
   int cached;
   int active_anon;
   int inactive_anon;
   int active_file;
   int inactive_file;
   int swap_total;
   int swap_free;
   int dirty;
 
   // vmstats data.
   int pswpin;
   int pswpout;
   int pgmajfault;
   int bytes_swpin_per_sec;
   int bytes_swpout_per_sec;
   int pgmajfault_per_sec;
-
+#endif
 #ifdef OS_CHROMEOS
   int shmem;
   int slab;
   // Gem data will be -1 if not supported.
   int gem_objects;
   long long gem_size;
 #endif
 };
 
 // Retrieves data from /proc/meminfo and /proc/vmstat
 // about system-wide memory consumption.
 // Fills in the provided |meminfo| structure. Returns true on success.
 // Exposed for memory debugging widget.
 BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
 
 // Data from /proc/diskstats about system-wide disk I/O.
 struct BASE_EXPORT SystemDiskInfo {
   SystemDiskInfo();
 
+  // Serializes the platform specific fields to value.
+  Value* AsValue() const;
+
+#if defined(OS_LINUX)
   uint64 reads;
   uint64 reads_merged;
   uint64 sectors_read;
   uint64 read_time;
   uint64 writes;
   uint64 writes_merged;
   uint64 sectors_written;
   uint64 write_time;
   uint64 io;
   uint64 io_time;
   uint64 weighted_io_time;
   uint64 bytes_read_per_sec;
   uint64 bytes_written_per_sec;
+#endif
 };
 
 // Checks whether the candidate string is a valid disk name, [sh]d[a-z]+
 // for a generic disk or mmcblk[0-9]+ for the MMC case.
 // Names of disk partitions (e.g. sda1) are not valid.
 BASE_EXPORT bool ValidDiskName(const std::string& candidate);
 
 // Retrieves data from /proc/diskstats about system-wide disk I/O.
 // Fills in the provided |diskinfo| structure. Returns true on success.
 BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* diskinfo);
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
 // Data from files in directory /sys/block/zram0 about ZRAM usage.
 struct BASE_EXPORT SwapInfo {
   SwapInfo()
       : num_reads(0),
         num_writes(0),
         compr_data_size(0),
         orig_data_size(0),
         mem_used_total(0) {
   }
 
+  // Serializes the platform specific fields to value.
+  Value* AsValue() const;
+
   uint64 num_reads;
   uint64 num_writes;
   uint64 compr_data_size;
   uint64 orig_data_size;
   uint64 mem_used_total;
 };
 
 // In ChromeOS, reads files from /sys/block/zram0 that contain ZRAM usage data.
 // Fills in the provided |swap_data| structure.
 BASE_EXPORT void GetSwapInfo(SwapInfo* swap_info);
 #endif  // defined(OS_CHROMEOS)
 
 // Collects and holds performance metrics for system memory and disk.
 // Provides functionality to retrieve the data on various platforms and
 // to serialize the stored data.
 class SystemMetrics {
  public:
   SystemMetrics() : committed_memory_(0) { }
 
   static SystemMetrics GetCurrent();
 
+  // Serializes the system metrics to value.
+  Value* AsValue() const;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
 
   size_t committed_memory_;
-#if defined(OS_LINUX) || defined(OS_ANDROID)
   SystemMemoryInfoKB memory_info_;
+  SystemDiskInfo disk_info_;
+#ifdef OS_CHROMEOS
+  SwapInfo swap_info_;
 #endif
 };
 
 }  // namespace base
 
 #endif  // BASE_PROCESS_PROCESS_METRICS_H_