Updated device reporting code to report multiple samples of free RAM

chrome/browser/chromeos/policy/device_status_collector.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 60 matching lines @@
       enterprise_management::DeviceStatusReportRequest* status) override;
   bool GetSessionStatus(
       enterprise_management::SessionStatusReportRequest* status) override;
   void OnSubmittedSuccessfully() override;
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // How often, in seconds, to poll to see if the user is idle.
   static const unsigned int kIdlePollIntervalSeconds = 30;
 
-  // The total number of CPU samples cached internally.
-  static const unsigned int kMaxCPUSamples = 10;
+  // The total number of hardware resource usage samples cached internally.
+  static const unsigned int kMaxResourceUsageSamples = 10;
 
  protected:
   // Check whether the user has been idle for a certain period of time.
   virtual void CheckIdleState();
 
   // Used instead of base::Time::Now(), to make testing possible.
   virtual base::Time GetCurrentTime();
 
   // Callback which receives the results of the idle state check.
   void IdleStateCallback(ui::IdleState state);
 
-  // Samples the current CPU usage and updates our cache of samples.
-  void SampleCPUUsage();
+  // Samples the current CPU and RAM usage and updates our cache of samples.
+  void SampleResourceUsage();
 
   // Returns the percentage of total CPU that each process uses. Virtual so it
   // can be mocked.
   virtual std::vector<double> GetPerProcessCPUUsage();
 
   // The number of days in the past to store device activity.
   // This is kept in case device status uploads fail for a number of days.
   unsigned int max_stored_past_activity_days_;
 
   // The number of days in the future to store device activity.
@@ skipping 74 matching lines @@
   base::OneShotTimer<DeviceStatusCollector> geolocation_update_timer_;
 
   std::string os_version_;
   std::string firmware_version_;
 
   content::Geoposition position_;
 
   // Cached disk volume information.
   std::vector<enterprise_management::VolumeInfo> volume_info_;
 
-  // Cached percentage-of-CPU-used data (contains multiple samples taken
+  struct ResourceUsage {
+    // Sample of percentage-of-CPU-used across all processes (0-100)
+    int cpu_usage_percent;
+
+    // Amount of free RAM (measures raw memory used by processes, not internal
+    // memory waiting to be reclaimed by GC).
+    int64 bytes_of_ram_free;
+  };
+
+  // Samples of resource usage (contains multiple samples taken
   // periodically every kHardwareStatusSampleIntervalSeconds).
-  std::deque<int> cpu_usage_percent_;
+  std::deque<ResourceUsage> resource_usage_;
 
   // Callback invoked to fetch information about the mounted disk volumes.
   VolumeInfoFetcher volume_info_fetcher_;
 
   chromeos::system::StatisticsProvider* statistics_provider_;
 
   chromeos::CrosSettings* cros_settings_;
 
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
@@ skipping 27 matching lines @@
       hardware_status_subscription_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_