PFW: Do not stop on hard sync errors
BZ: 76263
When synchronization fails, the parameter-framework should
log a warning and continue synchronization instead of stopping
Change-Id: Ic12d8798ea25584db714ee26e644fac793c28881
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
Reviewed-on: http://android.intel.com:8080/81825
Reviewed-by: Centelles, Sylvain <sylvain.centelles@intel.com>
Reviewed-by: Denneulin, Guillaume <guillaume.denneulin@intel.com>
Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>
diff --git a/parameter/SubsystemObject.h b/parameter/SubsystemObject.h
index 3b6f31a..6cbfd76 100644
--- a/parameter/SubsystemObject.h
+++ b/parameter/SubsystemObject.h
@@ -30,15 +30,12 @@
class CInstanceConfigurableElement;
class CMappingContext;
-class CSubsystemObject : public ISyncer
+class CSubsystemObject : private ISyncer
{
public:
CSubsystemObject(CInstanceConfigurableElement* pInstanceConfigurableElement);
virtual ~CSubsystemObject();
- // from ISyncer
- virtual bool sync(CParameterBlackboard& parameterBlackboard, bool bBack, string& strError);
-
protected:
// Blackboard data location
uint8_t* getBlackboardLocation() const;
@@ -57,15 +54,21 @@
void blackboardRead(void* pvData, uint32_t uiSize);
void blackboardWrite(const void* pvData, uint32_t uiSize);
// Logging
- void log(const string& strMessage, ...) const;
+ void log_info(const string& strMessage, ...) const;
+ void log_warning(const string& strMessage, ...) const;
// Mapping formatting
static string formatMappingValue(const string& strMappingValue, uint32_t uiFirstAmendKey, uint32_t uiNbAmendKeys, const CMappingContext& context);
// Configurable element retrieval
const CInstanceConfigurableElement* getConfigurableElement() const;
private:
+ // from ISyncer
+ virtual bool sync(CParameterBlackboard& parameterBlackboard, bool bBack, string& strError);
+
CSubsystemObject(const CSubsystemObject&);
- CSubsystemObject& operator=(const CSubsystemObject&);
+
+ // Define affection operator
+ const CSubsystemObject& operator=(const CSubsystemObject&);
// Instance element to sync from/to
CInstanceConfigurableElement* _pInstanceConfigurableElement;