Aggregate device activity, and report per-day activity in device status reports.

chrome/browser/policy/device_status_collector.cc

Index: chrome/browser/policy/device_status_collector.cc
diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc
index f4fb74699fba2af87ca9fddd0c36869eb8fc8178..ff55981956f10987dff2cf3a1a422e85ac788671 100644
--- a/chrome/browser/policy/device_status_collector.cc
+++ b/chrome/browser/policy/device_status_collector.cc
@@ -26,19 +26,28 @@ namespace {
 // How many seconds of inactivity triggers the idle state.
 const unsigned int kIdleStateThresholdSeconds = 300;
 
-// The maximum number of time periods stored in the local state.
-const unsigned int kMaxStoredActivePeriods = 500;
-
-// Stores a list of timestamps representing device active periods.
-const char* const kPrefDeviceActivePeriods = "device_status.active_periods";
-
-bool GetTimestamp(const ListValue* list, int index, int64* out_value) {
-  std::string string_value;
-  if (list->GetString(index, &string_value))
-    return base::StringToInt64(string_value, out_value);
-  return false;
+// How many days in the past to store active periods for.
+const unsigned int kMaxStoredPastActivityDays = 30;
+
+// How many days in the future to store active periods for.
+const unsigned int kMaxStoredFutureActivityDays = 2;
+
+const char* const kPrefDeviceActivityTimes = "device_status.activity_times";
+
+// Record device activity for the specified day into the given dictionary.
+void AddDeviceActivity(
+    DictionaryValue* activity_times, Time day_midnight, TimeDelta activity) {

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

If you break the declaration, you need to put all parameters on a separate line.

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

+  DCHECK(activity < TimeDelta::FromDays(1));
+  int64 day_start_timestamp =
+    (day_midnight - Time::UnixEpoch()).InMilliseconds();

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

indentation

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

+  std::string day_key = base::Int64ToString(day_start_timestamp);
+  int previous_activity = 0;
+  activity_times->GetInteger(day_key, &previous_activity);
+  activity_times->SetInteger(day_key,
+                             previous_activity + activity.InMilliseconds());
 }
 

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

remove extra blank line

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

+
 }  // namespace
 
 namespace policy {
@@ -46,17 +55,16 @@ namespace policy {
 DeviceStatusCollector::DeviceStatusCollector(
     PrefService* local_state,
     chromeos::system::StatisticsProvider* provider)
-    : max_stored_active_periods_(kMaxStoredActivePeriods),
+    : max_stored_past_activity_days_(kMaxStoredPastActivityDays),
+      max_stored_future_activity_days_(kMaxStoredFutureActivityDays),
       local_state_(local_state),
       last_idle_check_(Time()),
-      last_idle_state_(IDLE_STATE_UNKNOWN),
       statistics_provider_(provider),
       report_version_info_(false),
       report_activity_times_(false),
       report_boot_mode_(false) {
   timer_.Start(FROM_HERE,
-               TimeDelta::FromSeconds(
-                   DeviceStatusCollector::kPollIntervalSeconds),
+               TimeDelta::FromSeconds(kPollIntervalSeconds),
                this, &DeviceStatusCollector::CheckIdleState);
 
   cros_settings_ = chromeos::CrosSettings::Get();
@@ -91,7 +99,8 @@ DeviceStatusCollector::~DeviceStatusCollector() {
 
 // static
 void DeviceStatusCollector::RegisterPrefs(PrefService* local_state) {
-  local_state->RegisterListPref(kPrefDeviceActivePeriods, new ListValue);
+  local_state->RegisterDictionaryPref(
+      kPrefDeviceActivityTimes, new DictionaryValue);
 }
 
 void DeviceStatusCollector::CheckIdleState() {
@@ -122,36 +131,59 @@ Time DeviceStatusCollector::GetCurrentTime() {
   return Time::Now();
 }
 
-void DeviceStatusCollector::AddActivePeriod(Time start, Time end) {
-  // Maintain the list of active periods in a local_state pref.
-  ListPrefUpdate update(local_state_, kPrefDeviceActivePeriods);
-  ListValue* active_periods = update.Get();
-
-  // Cap the number of active periods that we store.
-  if (active_periods->GetSize() >= 2 * max_stored_active_periods_)
+// Remove all out-of-range activity times from the local store.
+void DeviceStatusCollector::PruneStoredActivityPeriods(Time base_time) {
+  const DictionaryValue* activity_times =
+      local_state_->GetDictionary(kPrefDeviceActivityTimes);
+  if (activity_times->size() <=
+      max_stored_past_activity_days_ + max_stored_future_activity_days_)
     return;
 
+  Time min_time =
+      base_time - TimeDelta::FromDays(max_stored_past_activity_days_);
+  Time max_time =
+      base_time + TimeDelta::FromDays(max_stored_future_activity_days_);
   Time epoch = Time::UnixEpoch();

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

declare const.

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

-  int64 start_timestamp = (start - epoch).InMilliseconds();
-  Value* end_value = new StringValue(
-      base::Int64ToString((end - epoch).InMilliseconds()));
-
-  int list_size = active_periods->GetSize();
-  DCHECK(list_size % 2 == 0);
-
-  // Check if this period can be combined with the previous one.
-  if (list_size > 0 && last_idle_state_ == IDLE_STATE_ACTIVE) {
-    int64 last_period_end;
-    if (GetTimestamp(active_periods, list_size - 1, &last_period_end) &&
-        last_period_end == start_timestamp) {
-      active_periods->Set(list_size - 1, end_value);
-      return;
+
+  DictionaryValue* copy = activity_times->DeepCopy();
+  for (DictionaryValue::key_iterator it = activity_times->begin_keys();
+       it != activity_times->end_keys(); ++it) {
+    int64 timestamp;
+
+    if (base::StringToInt64(*it, &timestamp)) {

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

We should probably also remove it if we cannot parse the entry.

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

+      // Remove data that is too old, or too far in the future.
+      Time day_midnight = epoch + TimeDelta::FromMilliseconds(timestamp);
+      if (day_midnight < min_time || day_midnight > max_time)
+        copy->Remove(*it, NULL);
     }
   }
-  // Add a new period to the list.
-  active_periods->Append(
-      new StringValue(base::Int64ToString(start_timestamp)));
-  active_periods->Append(end_value);
+  local_state_->Set(kPrefDeviceActivityTimes, *copy);
+}
+
+void DeviceStatusCollector::AddActivePeriod(Time start, Time end) {
+  DCHECK(start < end);
+
+  // Maintain the list of active periods in a local_state pref.
+  DictionaryPrefUpdate update(local_state_, kPrefDeviceActivityTimes);
+  DictionaryValue* activity_times = update.Get();
+
+  Time midnight = end.LocalMidnight();
+
+  // Figure out UTC midnight on the same day as the local day.
+  Time::Exploded exploded;
+  midnight.LocalExplode(&exploded);
+  Time utc_midnight = Time::FromUTCExploded(exploded);
+
+  // Record the device activity for today.
+  TimeDelta activity_today = end - MAX(midnight, start);
+  AddDeviceActivity(activity_times, utc_midnight, activity_today);
+
+  // If this interval spans two days, record activity for yesterday too.
+  if (start < midnight) {
+    AddDeviceActivity(activity_times,
+                      utc_midnight - TimeDelta::FromDays(1),
+                      midnight - start);
+  }
 }
 
 void DeviceStatusCollector::IdleStateCallback(IdleState state) {
@@ -162,44 +194,42 @@ void DeviceStatusCollector::IdleStateCallback(IdleState state) {
   Time now = GetCurrentTime();
 
   if (state == IDLE_STATE_ACTIVE) {
-    unsigned int poll_interval = DeviceStatusCollector::kPollIntervalSeconds;
-
-    // If it's been too long since the last report, assume that the system was
-    // in standby, and only count a single interval of activity.
-    if ((now - last_idle_check_).InSeconds() >= (2 * poll_interval))
-      AddActivePeriod(now - TimeDelta::FromSeconds(poll_interval), now);
+    // If it's been too long since the last report, or if the activity is
+    // negative (which can happen when the clock changes), assume a single
+    // interval of activity.
+    unsigned int active_seconds = (now - last_idle_check_).InSeconds();
+    if (active_seconds < 0 || active_seconds >= (2 * kPollIntervalSeconds))
+      AddActivePeriod(now - TimeDelta::FromSeconds(kPollIntervalSeconds), now);
     else
       AddActivePeriod(last_idle_check_, now);
+
+    PruneStoredActivityPeriods(now);
   }
   last_idle_check_ = now;
-  last_idle_state_ = state;
 }
 
 void DeviceStatusCollector::GetActivityTimes(
     em::DeviceStatusReportRequest* request) {
-  const ListValue* active_periods =
-      local_state_->GetList(kPrefDeviceActivePeriods);
-  em::TimePeriod* time_period;
-
-  DCHECK(active_periods->GetSize() % 2 == 0);
-
-  int period_count = active_periods->GetSize() / 2;
-  for (int i = 0; i < period_count; i++) {
-    int64 start, end;
-
-    if (!GetTimestamp(active_periods, 2 * i, &start) ||
-        !GetTimestamp(active_periods, 2 * i + 1, &end) ||
-        end < start) {
-      // Something is amiss -- bail out.
+  DictionaryPrefUpdate update(local_state_, kPrefDeviceActivityTimes);
+  DictionaryValue* activity_times = update.Get();
+  int64 milliseconds_per_day = TimeDelta::FromDays(1).InMilliseconds();

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

declare const

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

+
+  for (DictionaryValue::key_iterator it = activity_times->begin_keys();
+       it != activity_times->end_keys(); ++it) {
+    int64 start_timestamp;
+    int activity_milliseconds;
+    if (base::StringToInt64(*it, &start_timestamp) &&
+        activity_times->GetInteger(*it, &activity_milliseconds)) {
+      em::ActiveTimePeriod* active_period = request->add_active_period();
+      em::TimePeriod* period = active_period->mutable_time_period();
+      period->set_start_timestamp(start_timestamp);
+      period->set_end_timestamp(start_timestamp + milliseconds_per_day);
+      active_period->set_active_duration(activity_milliseconds);
+    } else {
       NOTREACHED();
-      break;
     }
-    time_period = request->add_active_time();
-    time_period->set_start_timestamp(start);
-    time_period->set_end_timestamp(end);
   }
-  ListPrefUpdate update(local_state_, kPrefDeviceActivePeriods);
-  update.Get()->Clear();
+  activity_times->Clear();
 }
 
 void DeviceStatusCollector::GetVersionInfo(