Improve server request handler (#1411)

-no need to search request list for every completed request, only if operation deadline is specified -move timer clean up to timer callback
OPCFoundation · May 25, 2021 · 8a986f4 · 8a986f4
1 parent be41459
commit 8a986f4
Showing 1 changed file with 14 additions and 23 deletions.
diff --git a/Libraries/Opc.Ua.Server/Server/RequestManager.cs b/Libraries/Opc.Ua.Server/Server/RequestManager.cs
@@ -140,29 +140,6 @@ public void RequestCompleted(OperationContext context)
 
             lock (m_requestsLock)
             {
-                // find the completed request.
-                bool deadlineExists = false;
-
-                foreach (OperationContext request in m_requests.Values)
-                {
-                    if (request.RequestId == context.RequestId)
-                    {
-                        continue;
-                    }
-
-                    if (request.OperationDeadline < DateTime.MaxValue)
-                    {
-                        deadlineExists = true;
-                    }
-                }
-
-                // check if the timer can be cancelled.
-                if (m_requestTimer != null && !deadlineExists)
-                {
-                    m_requestTimer.Dispose();
-                    m_requestTimer = null;
-                }
-
                 // remove the request.
                 m_requests.Remove(context.RequestId);
             }
@@ -223,13 +200,27 @@ private void OnTimerExpired(object state)
             // flag requests as expired.
             lock (m_requestsLock)
             {
+                // find the completed request.
+                bool deadlineExists = false;
+
                 foreach (OperationContext request in m_requests.Values)
                 {
                     if (request.OperationDeadline < DateTime.UtcNow)
                     {
                         request.SetStatusCode(StatusCodes.BadTimeout);
                         expiredRequests.Add(request.RequestId);
                     }
+                    else if (request.OperationDeadline < DateTime.MaxValue)
+                    {
+                        deadlineExists = true;
+                    }
+                }
+
+                // check if the timer can be cancelled.
+                if (m_requestTimer != null && !deadlineExists)
+                {
+                    m_requestTimer.Dispose();
+                    m_requestTimer = null;
                 }
             }