[Java] Use nextSmDeadlineNs instead of lastSmTimeNs as the code is si…

…mpler and safer.
real-logic · Nov 8, 2024 · 6f7e6a1 · 6f7e6a1
1 parent 5315439
commit 6f7e6a1
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/aeron-driver/src/main/java/io/aeron/driver/PublicationImage.java b/aeron-driver/src/main/java/io/aeron/driver/PublicationImage.java
@@ -145,7 +145,7 @@ enum State
     private long lastSmChangeNumber;
     private long lastSmPosition;
     private long lastOverrunThreshold;
-    private long timeOfLastSmNs;
+    private long nextSmDeadlineNs;
     private final long smTimeoutNs;
     private final long maxReceiverWindowLength;
 
@@ -494,7 +494,7 @@ void deactivate()
 
             if (isSendingEosSm)
             {
-                timeOfLastSmNs = nowNs - smTimeoutNs - 1;
+                nextSmDeadlineNs = nowNs - 1;
             }
 
             state(State.DRAINING);
@@ -705,7 +705,7 @@ void checkEosForDrainTransition(final long nowNs)
                 timeOfLastStateChangeNs = nowNs;
 
                 isSendingEosSm = true;
-                timeOfLastSmNs = nowNs - smTimeoutNs - 1;
+                nextSmDeadlineNs = nowNs - 1;
                 state(State.DRAINING);
             }
         }
@@ -721,7 +721,7 @@ int sendPendingStatusMessage(final long nowNs)
     {
         int workCount = 0;
         final long changeNumber = (long)END_SM_CHANGE_VH.getAcquire(this);
-        final boolean hasSmTimedOut = (nowNs - smTimeoutNs) > timeOfLastSmNs;
+        final boolean hasSmTimedOut = nowNs > nextSmDeadlineNs;
 
         if (null != rejectionReason)
         {
@@ -730,7 +730,7 @@ int sendPendingStatusMessage(final long nowNs)
                 channelEndpoint.sendErrorFrame(
                     imageConnections, sessionId, streamId, GENERIC_ERROR.value(), rejectionReason);
 
-                timeOfLastSmNs = nowNs;
+                nextSmDeadlineNs = nowNs + smTimeoutNs;
                 workCount++;
             }
 
@@ -765,7 +765,7 @@ int sendPendingStatusMessage(final long nowNs)
                 lastSmPosition = smPosition;
                 lastOverrunThreshold = smPosition + (termLength >> 1);
                 lastSmChangeNumber = changeNumber;
-                timeOfLastSmNs = nowNs;
+                nextSmDeadlineNs = nowNs + smTimeoutNs;
 
                 updateActiveTransportCount();
             }
@@ -943,7 +943,7 @@ void stopStatusMessagesIfNotActive()
     {
         if (State.ACTIVE != state)
         {
-            timeOfLastSmNs = Long.MAX_VALUE;
+            nextSmDeadlineNs = Long.MAX_VALUE;
         }
     }