Introduce MTRAsyncWorkItemRetryCountBase

project-chip · Sep 28, 2023 · 315226c · 315226c
1 parent 8592ff4
commit 315226c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm b/src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSInteger, MTRAsyncWorkItemState) {
     MTRAsyncWorkItemComplete,
     MTRAsyncWorkItemEnqueued,
     MTRAsyncWorkItemRunning,
-    // values > MTRAsyncWorkItemRunning encode retryCount
+    MTRAsyncWorkItemRetryCountBase = MTRAsyncWorkItemRunning, // values >= MTRAsyncWorkItemRunning encode retryCount
 };
 
 MTR_DIRECT_MEMBERS
@@ -97,7 +97,7 @@ - (NSInteger)retryCount
     case MTRAsyncWorkItemEnqueued:
         return 0;
     default:
-        return ((NSInteger) _state) - MTRAsyncWorkItemRunning;
+        return ((NSInteger) _state) - MTRAsyncWorkItemRetryCountBase;
     }
 }
 
@@ -109,8 +109,8 @@ - (void)callReadyHandlerWithContext:(id)context completion:(MTRAsyncWorkCompleti
     if (_state == MTRAsyncWorkItemEnqueued) {
         _state = MTRAsyncWorkItemRunning;
     } else if (_state >= MTRAsyncWorkItemRunning) {
-        retryCount = (_state - MTRAsyncWorkItemRunning) + 1; // increment retryCount
-        _state = (MTRAsyncWorkItemState) (MTRAsyncWorkItemRunning + retryCount);
+        retryCount = (_state - MTRAsyncWorkItemRetryCountBase) + 1; // increment retryCount
+        _state = (MTRAsyncWorkItemState) (MTRAsyncWorkItemRetryCountBase + retryCount);
     } else {
         return; // asserted above
     }