cashew: reset local counter on plan transition

src/service_impl.cc

 // Copyright (c) 2010, 2011 The Chromium OS 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 "src/service_impl.h"
 
 #include <glog/logging.h>
 
 #include "src/data_plan_provider.h"
 #include "src/device.h"
@@ skipping 241 matching lines @@
   // if we already have usage url, set new provider in motion
   if (!usage_url_.empty()) {
     provider_->SetUsageUrl(usage_url_);
     ReconsiderSendingUsageRequests();
   } else {
     // we'll do this later in OnUsageUrlUpdate
   }
 }
 
 void ServiceImpl::OnByteCounterUpdate(uint64 rx_bytes, uint64 tx_bytes) {
-  DCHECK(device_ != NULL);
-  DCHECK(device_->ByteCounterRunning());
   DLOG(INFO) << path_ << ": OnByteCounterUpdate: rx_bytes = " << rx_bytes
       << ", tx_bytes = " << tx_bytes;
-  DataPlan *active_plan = DataPlan::GetActivePlan(data_plans_);
-  if (active_plan == NULL) {
-    DLOG(WARNING) << path_ << ": OnByteCounterUpdate: no active plan";
-    return;
+  // dispatch this notification to our data plans list and consider sending
+  // out a signal if any plans were updated
+  if (DataPlan::OnByteCounterUpdate(&data_plans_, this, parent_, device_,
+                                    rx_bytes, tx_bytes)) {
+    MaybeEmitDataPlansUpdate();
   }
-  Bytes local_bytes_used = rx_bytes + tx_bytes;
-  DLOG(INFO) << path_ << ": OnByteCounterUpdate: local_bytes_used = "
-      << local_bytes_used;
-  // try to detect two error conditions:
-  // (1) overflow of the unsigned addition above prior to the assignment
-  // (2) no overflow, but result has high order bit set and so is interpreted as
-  //     a negative number when assigned to |local_bytes_used|
-  if (local_bytes_used < 0 ||
-      static_cast<uint64>(local_bytes_used) < rx_bytes ||
-      static_cast<uint64>(local_bytes_used) < tx_bytes) {
-    LOG(WARNING) << path_ << ": OnByteCounterUpdate: overflow detected";
-    return;
-  }
-  active_plan->SetLocalBytesUsed(local_bytes_used);
-  DLOG(INFO) << path_
-      << ": OnByteCounterUpdate: updated plan state: data bytes used = "
-      << active_plan->GetDataBytesUsed() << ", local bytes used = "
-      << active_plan->GetLocalBytesUsed() << ", total bytes used = "
-      << active_plan->GetTotalBytesUsed();
-  MaybeEmitDataPlansUpdate();
 }
 
 // DataPlanProviderDelegate methods
 
 void ServiceImpl::OnRequestComplete(const DataPlanProvider *provider,
                                     bool successful,
                                     const Value *parsed_usage_update) {
   DCHECK(provider != NULL);
   DCHECK(!successful || parsed_usage_update != NULL);
   if (provider != provider_) {
@@ skipping 388 matching lines @@
   }
 }
 
 void ServiceImpl::AddHardcodedDataPlan() {
   const std::string name = "Chromium OS Test Plan";
   DataPlan::Type type = DataPlan::kTypeMeteredPaid;
   base::Time update_time = base::Time::Now();
   base::TimeDelta twelve_hours = base::TimeDelta::FromHours(12);
   base::Time start_time = base::Time::Now() - twelve_hours;
   base::Time end_time = base::Time::Now() + twelve_hours;
-  Bytes data_bytes_max = 100*1024*1024;  // 100 MB
-  Bytes data_bytes_used = 30*1024*1024;  // 30 MB
+  ByteCount data_bytes_max = 100*1024*1024;  // 100 MB
+  ByteCount data_bytes_used = 30*1024*1024;  // 30 MB
 
   DataPlan *plan = new(std::nothrow) DataPlan(name, type, update_time,
                                               start_time, end_time,
                                               data_bytes_max, data_bytes_used);
   if (plan == NULL) {
     LOG(ERROR) << path_ << ": AddHardcodedDataPlan: could not create plan";
     return;
   }
 
   data_plans_.push_back(plan);
@@ skipping 203 matching lines @@
   DCHECK(policy_ != NULL);
   if (policy_->ShouldEmitDataPlansUpdate(data_plans_)) {
     DLOG(INFO) << path_ << ": MaybeEmitDataPlansUpdate: sending update";
     parent_->EmitDataPlansUpdate(*this);
   } else {
     DLOG(INFO) << path_ << ": MaybeEmitDataPlansUpdate: not sending update";
   }
 }
 
 }  // namespace cashew