Optimize report begin/end in read client side (#12443)

-- Add mIsInitialReport to signify the begin for chunk reports -- Rename mInitialReport to mIsPrimingReports to mark the first report for read/subscription client
project-chip · Mar 2, 2022 · 4bafafc · 4bafafc
1 parent 3618e76
commit 4bafafc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
@@ -44,7 +44,8 @@ CHIP_ERROR ReadClient::Init(Messaging::ExchangeManager * apExchangeMgr, Callback
     mMinIntervalFloorSeconds   = 0;
     mMaxIntervalCeilingSeconds = 0;
     mSubscriptionId            = 0;
-    mInitialReport             = true;
+    mIsInitialReport           = true;
+    mIsPrimingReports          = true;
     mInteractionType           = aInteractionType;
     AbortExistingExchangeContext();
 
@@ -79,7 +80,8 @@ void ReadClient::ShutdownInternal(CHIP_ERROR aError)
     mInteractionType           = InteractionType::Read;
     mpExchangeMgr              = nullptr;
     mpExchangeCtx              = nullptr;
-    mInitialReport             = true;
+    mIsInitialReport           = true;
+    mIsPrimingReports          = true;
     mPeerNodeId                = kUndefinedNodeId;
     mFabricIndex               = kUndefinedFabricIndex;
     MoveToState(ClientState::Uninitialized);
@@ -322,7 +324,7 @@ CHIP_ERROR ReadClient::ProcessReportData(System::PacketBufferHandle && aPayload)
     err = report.GetSubscriptionId(&subscriptionId);
     if (CHIP_NO_ERROR == err)
     {
-        if (IsInitialReport())
+        if (mIsPrimingReports)
         {
             mSubscriptionId = subscriptionId;
         }
@@ -380,9 +382,10 @@ CHIP_ERROR ReadClient::ProcessReportData(System::PacketBufferHandle && aPayload)
         TLV::TLVReader attributeReportIBsReader;
         attributeReportIBs.GetReader(&attributeReportIBsReader);
 
-        if (IsInitialReport())
+        if (mIsInitialReport)
         {
             mpCallback->OnReportBegin(this);
+            mIsInitialReport = false;
         }
 
         err = ProcessAttributeReportIBs(attributeReportIBsReader);
@@ -391,6 +394,7 @@ CHIP_ERROR ReadClient::ProcessReportData(System::PacketBufferHandle && aPayload)
         if (!mPendingMoreChunks)
         {
             mpCallback->OnReportEnd(this);
+            mIsInitialReport = true;
         }
     }
 
@@ -420,7 +424,7 @@ CHIP_ERROR ReadClient::ProcessReportData(System::PacketBufferHandle && aPayload)
         }
     }
 
-    mInitialReport = false;
+    mIsPrimingReports = false;
     return err;
 }
 

diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h
@@ -294,12 +294,12 @@ class ReadClient : public Messaging::ExchangeDelegate
      * our exchange and don't need to manually close it.
      */
     void ShutdownInternal(CHIP_ERROR aError);
-    bool IsInitialReport() { return mInitialReport; }
     Messaging::ExchangeManager * mpExchangeMgr = nullptr;
     Messaging::ExchangeContext * mpExchangeCtx = nullptr;
     Callback * mpCallback                      = nullptr;
     ClientState mState                         = ClientState::Uninitialized;
-    bool mInitialReport                        = true;
+    bool mIsInitialReport                      = true;
+    bool mIsPrimingReports                     = true;
     bool mPendingMoreChunks                    = false;
     uint16_t mMinIntervalFloorSeconds          = 0;
     uint16_t mMaxIntervalCeilingSeconds        = 0;