Make codegen data model call increasing the cluster data version

Author: andreilitvin

src/app/codegen-data-model-provider/CodegenDataModelProvider_Write.cpp

@@ -14,6 +14,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include "app/util/attribute-storage.h"
 #include <app/codegen-data-model-provider/CodegenDataModelProvider.h>
 
 #include <access/AccessControl.h>
@@ -356,6 +357,8 @@ DataModel::ActionReturnStatus CodegenDataModelProvider::WriteAttribute(const Dat
             //       however for now this is called directly because ember code does this call
             //       inside emberAfWriteAttribute.
             MatterReportingAttributeChangeCallback(request.path);
+
+            emberAfIncreaseClusterDataVersion(request.path);
             CurrentContext().dataModelChangeListener->MarkDirty(request.path);
         }
         return *aai_result;
@@ -398,6 +401,7 @@ DataModel::ActionReturnStatus CodegenDataModelProvider::WriteAttribute(const Dat
     // - This likely maps to `MatterReportingAttributeChangeCallback` HOWEVER current ember write functions
     //   will selectively call that one depending on old attribute state (i.e. calling every time is a
     //   change in behavior)
+    emberAfIncreaseClusterDataVersion(request.path);
     CurrentContext().dataModelChangeListener->MarkDirty(request.path);
     return CHIP_NO_ERROR;
 }

src/app/reporting/Engine.cpp

@@ -1009,8 +1009,10 @@ void Engine::MarkDirty(const ConcreteAttributePath & path)
 {
     // NOTE: original MatterReportingAttributeChangeCallback ALSO does a
     //       IncreaseClusterDataVersion. However that ties directly to ember so it is not
-    //       done here. The code should be migrated to execute this.
-
+    //       done here.
+    //
+    //       Instead the DataModel::Provider is responsible to properly increase cluster
+    //       data versions.
     AttributePathParams info(path.mEndpointId, path.mClusterId, path.mAttributeId);
     CHIP_ERROR err = SetDirty(info);
     if (err != CHIP_NO_ERROR)

src/app/reporting/reporting.cpp

@@ -24,38 +24,19 @@
 using namespace chip;
 using namespace chip::app;
 
-namespace {
-
-void IncreaseClusterDataVersion(const ConcreteClusterPath & aConcreteClusterPath)
-{
-    DataVersion * version = emberAfDataVersionStorage(aConcreteClusterPath);
-    if (version == nullptr)
-    {
-        ChipLogError(DataManagement, "Endpoint %x, Cluster " ChipLogFormatMEI " not found in IncreaseClusterDataVersion!",
-                     aConcreteClusterPath.mEndpointId, ChipLogValueMEI(aConcreteClusterPath.mClusterId));
-    }
-    else
-    {
-        (*(version))++;
-        ChipLogDetail(DataManagement, "Endpoint %x, Cluster " ChipLogFormatMEI " update version to %" PRIx32,
-                      aConcreteClusterPath.mEndpointId, ChipLogValueMEI(aConcreteClusterPath.mClusterId), *(version));
-    }
-}
-
-} // namespace
-
 void MatterReportingAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId)
 {
     // Attribute writes have asserted this already, but this assert should catch
     // applications notifying about changes from their end.
     assertChipStackLockedByCurrentThread();
 
+    emberAfIncreaseClusterDataVersion(ConcreteClusterPath(endpoint, clusterId));
+
     AttributePathParams info;
     info.mClusterId   = clusterId;
     info.mAttributeId = attributeId;
     info.mEndpointId  = endpoint;
 
-    IncreaseClusterDataVersion(ConcreteClusterPath(endpoint, clusterId));
     InteractionModelEngine::GetInstance()->GetReportingEngine().SetDirty(info);
 }
 

src/app/util/attribute-storage.cpp

@@ -15,6 +15,7 @@
  *    limitations under the License.
  */
 
+#include "app/ConcreteClusterPath.h"
 #include <app/util/attribute-storage.h>
 
 #include <app/util/attribute-storage-detail.h>
@@ -1462,3 +1463,20 @@ DataVersion * emberAfDataVersionStorage(const chip::app::ConcreteClusterPath & a
 
     return ep.dataVersions + clusterIndex;
 }
+
+void emberAfIncreaseClusterDataVersion(const chip::app::ConcreteClusterPath & aConcreteClusterPath)
+{
+    DataVersion * version = emberAfDataVersionStorage(aConcreteClusterPath);
+    if (version == nullptr)
+    {
+        ChipLogError(DataManagement, "Endpoint %x, Cluster " ChipLogFormatMEI " not found in IncreaseClusterDataVersion!",
+                     aConcreteClusterPath.mEndpointId, ChipLogValueMEI(aConcreteClusterPath.mClusterId));
+    }
+    else
+    {
+        (*(version))++;
+        ChipLogDetail(DataManagement, "Endpoint %x, Cluster " ChipLogFormatMEI " update version to %" PRIx32,
+                      aConcreteClusterPath.mEndpointId, ChipLogValueMEI(aConcreteClusterPath.mClusterId), *(version));
+    }
+}
+

src/app/util/attribute-storage.h

@@ -177,6 +177,13 @@ uint16_t emberAfGetClusterServerEndpointIndex(chip::EndpointId endpoint, chip::C
  */
 chip::DataVersion * emberAfDataVersionStorage(const chip::app::ConcreteClusterPath & aConcreteClusterPath);
 
+/**
+ * Increases the cluster version for the specified path.
+ *
+ * Will log errors in case the version storage for the given path does not exist.
+ */
+void emberAfIncreaseClusterDataVersion(const chip::app::ConcreteClusterPath & aConcreteClusterPath);
+
 /**
  * @brief Returns the number of pre-compiled endpoints.
  */

src/app/util/mock/attribute-storage.cpp

@@ -313,6 +313,11 @@ DataVersion * emberAfDataVersionStorage(const chip::app::ConcreteClusterPath & a
     return &dataVersion;
 }
 
+void emberAfIncreaseClusterDataVersion(const chip::app::ConcreteClusterPath & aConcreteClusterPath)
+{
+    dataVersion++;
+}
+
 namespace chip {
 namespace app {