cashew: defer all D-Bus signal processing to main loop

src/service.h

 // Copyright (c) 2010 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.
 
 // TODO(vlaviano): update accessor style (GetFoo/SetFoo -> foo)
 
 #ifndef SRC_SERVICE_H_
 #define SRC_SERVICE_H_
 
 #include <glib.h>
 
 #include <map>
 #include <string>
 
 #include <base/basictypes.h>  // NOLINT
 #include <dbus-c++/dbus.h>    // NOLINT
 
 #include "src/data_plan.h"
 #include "src/data_plan_provider.h"
 #include "src/flimflam_service_client_glue.h"
+#include "src/property_changed_handler.h"
 
 namespace cashew {
 
 class Device;
 class Policy;
 class ServiceManager;
 
 // map of key, value pairs representing service properties received via D-Bus
 typedef std::map<std::string, DBus::Variant> PropertyMap;
 
 // represents a cellular service and monitors Flimflam state for that service
 class Service : public org::chromium::flimflam::Service_proxy,
                 public DBus::IntrospectableProxy,
                 public DBus::ObjectProxy,
-                public DataPlanProviderDelegate {
+                public DataPlanProviderDelegate,
+                public PropertyChangedDelegate {
   public:
     Service(ServiceManager * const parent,
             DBus::Connection& connection,  // NOLINT
             const DBus::Path& path);
     virtual ~Service();
 
     // get D-Bus path for this service
     virtual const DBus::Path& GetPath() const;
 
     // valid state values for this service
@@ skipping 45 matching lines @@
       kConnectivityStateRestricted,
       kConnectivityStateUnrestricted,
       kConnectivityStateNone,
     } ConnectivityState;
 
     // get connectivity state for this service
     virtual ConnectivityState GetConnectivityState() const;
 
     // Flimflam Service D-Bus Proxy methods
 
-    // receive incoming PropertyChanged D-Bus signal from Flimflam service
+    // receive incoming PropertyChanged D-Bus signal from Flimflam service and
+    // schedule deferred processing
     virtual void PropertyChanged(const std::string& property_name,
                                  const DBus::Variant& new_value);
 
+    // PropertyChangedDelegate methods
+
+    virtual void OnPropertyChanged(const PropertyChangedHandler *handler,
+                                   const std::string& property_name,
+                                   const DBus::Variant& new_value);
+
     // Device methods
 
     // we've received updated Cellular.Carrier info from our child Device
     virtual void OnCarrierUpdate(const std::string& carrier);
 
     // we've received updated byte counter info from our child Device
     virtual void OnByteCounterUpdate(uint64 rx_bytes, uint64 tx_bytes);
 
     // DataPlanProviderDelegate methods
 
@@ skipping 77 matching lines @@
 
     // are we in the process of retrying our GetProperties call?
     // this flag exists to distinguish between our initial g_idle_add call
     // and our subsequent timer calls
     bool retrying_get_properties_;
 
     // Service connectivity state
     // finer-grained connectivity info applicable when |state_| == kStateReady
     ConnectivityState connectivity_state_;
 
+    // Handler for deferred processing of D-Bus PropertyChanged signals.
+    // See comments in service_manager.h
+    PropertyChangedHandler property_changed_handler_;
+
     // convert connectivity state string to ConnectivityState enum value
     static ConnectivityState ConnectivityStateFromString(
         const std::string& connectivity_state);
 
     // convert state string to State enum value
     static State StateFromString(const std::string& state);
 
     // we've received updated Device info from Flimflam
     void OnDeviceUpdate(const DBus::Path& device_path);
 
@@ skipping 87 matching lines @@
 
     // consult policy to determine if we should send an unsolicited update
     void MaybeEmitDataPlansUpdate();
 
     DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_SERVICE_H_