If IPC connections fails, then remove active session. (#24082)

1 files changed, 25 insertions, 2 deletions

diff --git a/src/vm/eventpipe.cpp b/src/vm/eventpipe.cpp
index dc94c2b451..b6ec530110 100644
--- a/src/vm/eventpipe.cpp
+++ b/src/vm/eventpipe.cpp
@@ -351,6 +351,19 @@ void EventPipe::Disable(EventPipeSessionID id)
 
     // Take the lock before disabling tracing.
     CrstHolder _crst(GetLock());
+    DisableInternal(reinterpret_cast<EventPipeSessionID>(s_pSession));
+}
+
+void EventPipe::DisableInternal(EventPipeSessionID id)
+{
+    CONTRACTL
+    {
+        THROWS;
+        GC_TRIGGERS;
+        MODE_ANY;
+        PRECONDITION(GetLock()->OwnedByCurrentThread());
+    }
+    CONTRACTL_END;
 
     if (s_pConfig != NULL && s_pConfig->Enabled())
     {
@@ -503,6 +516,8 @@ void WINAPI EventPipe::FlushTimer(PVOID parameter, BOOLEAN timerFired)
     }
     CONTRACTL_END;
 
+    GCX_PREEMP();
+
     // Take the lock control lock to make sure that tracing isn't disabled during this operation.
     CrstHolder _crst(GetLock());
 
@@ -513,8 +528,6 @@ void WINAPI EventPipe::FlushTimer(PVOID parameter, BOOLEAN timerFired)
     if (!Enabled() || s_pSession->GetSessionType() != EventPipeSessionType::IpcStream)
         return;
 
-    GCX_PREEMP();
-
     if (CLRGetTickCount64() > (s_lastFlushSwitchTime + 100))
     {
         // Get the current time stamp.
@@ -526,6 +539,16 @@ void WINAPI EventPipe::FlushTimer(PVOID parameter, BOOLEAN timerFired)
 
         s_lastFlushSwitchTime = CLRGetTickCount64();
     }
+
+    if (s_pFile->HasErrors())
+    {
+        EX_TRY
+        {
+            DisableInternal(reinterpret_cast<EventPipeSessionID>(s_pSession));
+        }
+        EX_CATCH {}
+        EX_END_CATCH(SwallowAllExceptions);
+    }
 }
 
 EventPipeSession *EventPipe::GetSession(EventPipeSessionID id)