[linux]: Implement the optional attributes for software diagnostic cl…

…uster (#11706) * [linux]: Implement the optional attributes for software diagnostic cluster * Run codegen
project-chip · Mar 30, 2022 · 1125707 · 1125707
1 parent ee9b9a3
commit 1125707
Show file tree

Hide file tree

Showing 54 changed files with 1,502 additions and 257 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -1294,7 +1294,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",
@@ -1921,6 +1921,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,
@@ -8380,7 +8395,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",

diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -894,6 +894,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -1780,6 +1780,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -1688,6 +1688,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
@@ -1602,6 +1602,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -1602,6 +1602,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -1271,7 +1271,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",
@@ -1801,6 +1801,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,
@@ -7821,7 +7836,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",

diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
@@ -1256,7 +1256,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",
@@ -1786,6 +1786,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -1271,7 +1271,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",
@@ -1801,6 +1801,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,
@@ -7821,7 +7836,7 @@
  "outgoing": 1
  },
  {
- "name": "ApplyUpdateRequestResponse",
+ "name": "ApplyUpdateResponse",
  "code": 4,
  "mfgCode": null,
  "source": "server",

diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
@@ -1350,6 +1350,21 @@
  "enabled": 1,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
@@ -46,6 +46,7 @@ class SoftwareDiagosticsAttrAccess : public AttributeAccessInterface
 
 private:
  CHIP_ERROR ReadIfSupported(CHIP_ERROR (PlatformManager::*getter)(uint64_t &), AttributeValueEncoder & aEncoder);
+ CHIP_ERROR ReadThreadMetrics(AttributeValueEncoder & aEncoder);
 };
 
 SoftwareDiagosticsAttrAccess gAttrAccess;
@@ -69,6 +70,9 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::Read(const ConcreteAttributePath & aPat
  case CurrentHeapHighWatermark::Id: {
  return ReadIfSupported(&PlatformManager::GetCurrentHeapHighWatermark, aEncoder);
  }
+ case ThreadMetrics::Id: {
+ return ReadThreadMetrics(aEncoder);
+ }
  default: {
  break;
  }
@@ -92,6 +96,32 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (PlatformMan
 
  return aEncoder.Encode(data);
 }
+
+CHIP_ERROR SoftwareDiagosticsAttrAccess::ReadThreadMetrics(AttributeValueEncoder & aEncoder)
+{
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ DeviceLayer::ThreadMetrics * threadMetrics;
+
+ if (DeviceLayer::PlatformMgr().GetThreadMetrics(&threadMetrics) == CHIP_NO_ERROR)
+ {
+ err = aEncoder.EncodeList([&threadMetrics](const TagBoundEncoder & encoder) -> CHIP_ERROR {
+ for (DeviceLayer::ThreadMetrics * thread = threadMetrics; thread != nullptr; thread = thread->Next)
+ {
+ ReturnErrorOnFailure(encoder.Encode(*thread));
+ }
+
+ return CHIP_NO_ERROR;
+ });
+
+ DeviceLayer::PlatformMgr().ReleaseThreadMetrics(threadMetrics);
+ }
+ else
+ {
+ err = aEncoder.Encode(DataModel::List<EndpointId>());
+ }
+
+ return err;
+}
 } // anonymous namespace
 
 bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandler * commandObj,

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -3148,6 +3148,21 @@
  "enabled": 0,
  "commands": [],
  "attributes": [
+ {
+ "name": "ThreadMetrics",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 0,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
  {
  "name": "CurrentHeapFree",
  "code": 1,

diff --git a/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp