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

base/process/process_metrics_linux.cc

 // 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.
 
 #include "base/process/process_metrics.h"
 
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ skipping 496 matching lines @@
   pgmajfault_per_sec = 0;
 
 #ifdef OS_CHROMEOS
   shmem = 0;
   slab = 0;
   gem_objects = -1;
   gem_size = -1;
 #endif
 }
 
+Value* SystemMemoryInfoKB::AsValue() const {

[nduca, 2013/08/14 18:08:58]

this hsould be in process_metrics.cc with #ifdefs for the things that are
common.

+  DictionaryValue* res = new base::DictionaryValue();
+
+  res->SetInteger("total", total);
+  res->SetInteger("free", free);
+  res->SetInteger("buffers", buffers);
+  res->SetInteger("cached", cached);
+  res->SetInteger("active_anon", active_anon);
+  res->SetInteger("inactive_anon", inactive_anon);
+  res->SetInteger("active_file", active_file);
+  res->SetInteger("inactive_file", inactive_file);
+  res->SetInteger("swap_total", swap_total);
+  res->SetInteger("swap_free", swap_free);
+  res->SetInteger("swap_used", swap_total - swap_free);
+  res->SetInteger("dirty", dirty);
+  res->SetInteger("pswpin", pswpin);
+  res->SetInteger("pswpout", pswpout);
+  res->SetInteger("pgmajfault", pgmajfault);
+  res->SetInteger("bytes_swpin_per_sec", bytes_swpin_per_sec);
+  res->SetInteger("bytes_swpout_per_sec", bytes_swpout_per_sec);
+  res->SetInteger("pgmajfault_per_sec", pgmajfault_per_sec);
+#ifdef OS_CHROMEOS
+  res->SetInteger("shmem", shmem);
+  res->SetInteger("slab", slab);
+  res->SetInteger("gem_objects", gem_objects);
+  res->SetInteger("gem_size", gem_size);
+#endif
+
+  return res;
+}
+
 bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
   // Synchronously reading files in /proc is safe.
   ThreadRestrictions::ScopedAllowIO allow_io;
 
   // Used memory is: total - free - buffers - caches
   FilePath meminfo_file("/proc/meminfo");
   std::string meminfo_data;
   if (!file_util::ReadFileToString(meminfo_file, &meminfo_data)) {
     DLOG(WARNING) << "Failed to open " << meminfo_file.value();
     return false;
@@ skipping 107 matching lines @@
   writes_merged = 0;
   sectors_written = 0;
   write_time = 0;
   io = 0;
   io_time = 0;
   weighted_io_time = 0;
   bytes_read_per_sec = 0;
   bytes_written_per_sec = 0;
 }
 
+Value* SystemDiskInfo::AsValue() const {
+  DictionaryValue* res = new base::DictionaryValue();
+
+  res->SetInteger("bytes_read_per_sec",bytes_read_per_sec);
+  res->SetInteger("bytes_written_per_sec", bytes_written_per_sec);
+
+  return res;
+}
+
 bool ValidDiskName(const std::string& candidate) {
   if (candidate.length() < 3)
     return false;
   if (candidate.substr(0,2) == "sd" || candidate.substr(0,2) == "hd") {
     // [sh]d[a-z]+ case
     for (size_t i = 2; i < candidate.length(); i++) {
       if (!islower(candidate[i]))
         return false;
     }
   } else {
@@ skipping 85 matching lines @@
       diskinfo->io += io;
       diskinfo->io_time += io_time;
       diskinfo->weighted_io_time += weighted_io_time;
     }
   }
 
   return true;
 }
 
 #if defined(OS_CHROMEOS)
+Value* SwapInfo::AsValue() const {
+  DictionaryValue* res = new base::DictionaryValue();
+
+  res->SetInteger("num_reads", num_reads);
+  res->SetInteger("num_writes", num_writes);
+  res->SetInteger("orig_data_size", orig_data_size);
+  res->SetInteger("compr_data_size", compr_data_size);
+  res->SetInteger("mem_used_total", mem_used_total);
+  if (compr_data_size > 0) {

[nduca, 2013/08/14 18:08:58]

one line ifs dont get braces

+    res->SetInteger("compression_ratio", orig_data_size / compr_data_size);
+  }
+
+  return res;
+}
+
 void GetSwapInfo(SwapInfo* swap_info) {
   // Synchronously reading files in /sys/block/zram0 is safe.
   ThreadRestrictions::ScopedAllowIO allow_io;
 
   base::FilePath zram_path("/sys/block/zram0");
   uint64 orig_data_size = ReadFileToUint64(zram_path.Append("orig_data_size"));
   if (orig_data_size <= 4096) {
     // A single page is compressed at startup, and has a high compression
     // ratio. We ignore this as it doesn't indicate any real swapping.
     swap_info->orig_data_size = 0;
     swap_info->num_reads = 0;
     swap_info->num_writes = 0;
     swap_info->compr_data_size = 0;
     swap_info->mem_used_total = 0;
     return;
   }
   swap_info->orig_data_size = orig_data_size;
   swap_info->num_reads = ReadFileToUint64(zram_path.Append("num_reads"));
   swap_info->num_writes = ReadFileToUint64(zram_path.Append("num_writes"));
   swap_info->compr_data_size =
       ReadFileToUint64(zram_path.Append("compr_data_size"));
   swap_info->mem_used_total =
       ReadFileToUint64(zram_path.Append("mem_used_total"));
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace base