Let a domain decide when he should be synchronized.

Domains are browsed twice when applying configurations.
The first one gather syncer of domains which are not
"sequence aware" and launch a sync on them.
The second one launch an apply without providing a syncer set.
It lets sequence aware domains to synchronize if needed.

This patch allows to browse domains only once. If a domain
is sequence aware, it will be synchronized during configurations
restauration. If not, the synchronisation will be delayed at
the end of all applies.

Sequence aware domains are now synchronized first.

Signed-off-by: Jules Clero <[email protected]>

Author: clero

parameter/ConfigurableDomain.cpp

@@ -519,15 +519,11 @@ const CDomainConfiguration* CConfigurableDomain::getPendingConfiguration() const
 }
 
 // Configuration application if required
-void CConfigurableDomain::apply(CParameterBlackboard* pParameterBlackboard, CSyncerSet* pSyncerSet, bool bForce) const
+void CConfigurableDomain::apply(
+        CParameterBlackboard* pParameterBlackboard,
+        CSyncerSet& syncerSet,
+        bool bForce) const
 {
-    // Apply configuration only if the blackboard will
-    // be synchronized either now or by syncerSet.
-    if(!pSyncerSet ^ _bSequenceAware) {
-        // The configuration can not be syncronised
-        return;
-    }
-
     if (bForce) {
         // Force a configuration restore by forgetting about last applied configuration
         _pLastAppliedConfiguration = NULL;
@@ -543,20 +539,17 @@ void CConfigurableDomain::apply(CParameterBlackboard* pParameterBlackboard, CSyn
                      pApplicableDomainConfiguration->getName().c_str(),
                      getName().c_str());
 
-            // Check if we need to synchronize during restore
-            bool bSync = !pSyncerSet && _bSequenceAware;
-
-            // Do the restore
-            pApplicableDomainConfiguration->restore(pParameterBlackboard, bSync, NULL);
+            // Do the restore, and synchronize if we are sequence aware
+            pApplicableDomainConfiguration->restore(pParameterBlackboard, _bSequenceAware, NULL);
 
             // Record last applied configuration
             _pLastAppliedConfiguration = pApplicableDomainConfiguration;
 
             // Check we need to provide syncer set to caller
-            if (pSyncerSet && !_bSequenceAware) {
+            if (!_bSequenceAware) {
 
                 // Since we applied changes, add our own sync set to the given one
-                *pSyncerSet += _syncerSet;
+                syncerSet += _syncerSet;
             }
         }
     }

parameter/ConfigurableDomain.h

@@ -95,8 +95,17 @@ class CConfigurableDomain : public CBinarySerializableElement
     // Ensure validity on whole domain from main blackboard
     void validate(const CParameterBlackboard* pMainBlackboard);
 
-    // Configuration application if required
-    void apply(CParameterBlackboard* pParameterBlackboard, CSyncerSet* pSyncerSet, bool bForced) const;
+    /**
+     * Apply the configuration if required
+     *
+     * @param[in] pParameterBlackboard the blackboard to synchronize
+     * @param[in] syncerSet the set containing application syncers
+     * @param[in] bForced boolean used to force configuration application
+     */
+    void apply(
+            CParameterBlackboard* pParameterBlackboard,
+            CSyncerSet& syncerSet,
+            bool bForced) const;
 
     // Return applicable configuration validity for given configurable element
     bool isApplicableConfigurationValid(const CConfigurableElement* pConfigurableElement) const;

parameter/ConfigurableDomains.cpp

@@ -83,19 +83,10 @@ void CConfigurableDomains::apply(CParameterBlackboard* pParameterBlackboard, CSy
         const CConfigurableDomain* pChildConfigurableDomain = static_cast<const CConfigurableDomain*>(getChild(uiChild));
 
         // Apply and collect syncers when relevant
-        pChildConfigurableDomain->apply(pParameterBlackboard, &syncerSet, bForce);
+        pChildConfigurableDomain->apply(pParameterBlackboard, syncerSet, bForce);
     }
     // Synchronize those collected syncers
     syncerSet.sync(*pParameterBlackboard, false, NULL);
-
-    // Then deal with domains that need to synchronize along apply
-    for (uiChild = 0; uiChild < uiNbConfigurableDomains; uiChild++) {
-
-        const CConfigurableDomain* pChildConfigurableDomain = static_cast<const CConfigurableDomain*>(getChild(uiChild));
-
-        // Apply and synchronize when relevant
-        pChildConfigurableDomain->apply(pParameterBlackboard, NULL, bForce);
-    }
 }
 
 // From IXmlSource