EventPipe Circular Buffer Support and Ability to Start/Stop Tracing (#11507)

1 files changed, 7 insertions, 7 deletions

diff --git a/src/vm/sampleprofiler.cpp b/src/vm/sampleprofiler.cpp
index 6a6a23a03b..7c6429a211 100644
--- a/src/vm/sampleprofiler.cpp
+++ b/src/vm/sampleprofiler.cpp
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 #include "common.h"
+#include "eventpipebuffermanager.h"
 #include "eventpipeeventinstance.h"
 #include "sampleprofiler.h"
 #include "hosting.h"
@@ -136,7 +137,7 @@ DWORD WINAPI SampleProfiler::ThreadProc(void *args)
         }
     }
 
-    // Destroy the sampling thread when done running.
+    // Destroy the sampling thread when it is done running.
     DestroyThread(s_pSamplingThread);
     s_pSamplingThread = NULL;
 
@@ -158,19 +159,18 @@ void SampleProfiler::WalkManagedThreads()
     }
     CONTRACTL_END;
 
-    Thread *pThread = NULL;
+    Thread *pTargetThread = NULL;
 
     // Iterate over all managed threads.
     // Assumes that the ThreadStoreLock is held because we've suspended all threads.
-    while ((pThread = ThreadStore::GetThreadList(pThread)) != NULL)
+    while ((pTargetThread = ThreadStore::GetThreadList(pTargetThread)) != NULL)
     {
-        SampleProfilerEventInstance instance(pThread);
-        StackContents &stackContents = *(instance.GetStack());
+        StackContents stackContents;
 
         // Walk the stack and write it out as an event.
-        if(EventPipe::WalkManagedStackForThread(pThread, stackContents) && !stackContents.IsEmpty())
+        if(EventPipe::WalkManagedStackForThread(pTargetThread, stackContents) && !stackContents.IsEmpty())
         {
-            EventPipe::WriteSampleProfileEvent(instance);
+            EventPipe::WriteSampleProfileEvent(s_pSamplingThread, pTargetThread, stackContents);
         }
     }
 }