Refactor printing thread star/exit events

diff --git a/src/debug/netcoredbg/commands.cpp b/src/debug/netcoredbg/commands.cpp
index d382bc5b46c5aad0051abaf5bbae825dc269b9c2..86aa5e8e66974af783dbc4eee4b1c5e037ee972e 100644 (file)
--- a/src/debug/netcoredbg/commands.cpp
+++ b/src/debug/netcoredbg/commands.cpp
@@ -400,6 +400,22 @@ HRESULT Debugger::EmitExitedEvent(ExitedEvent event)
     return S_OK;
 }
 
+HRESULT Debugger::EmitThreadEvent(ThreadEvent event)
+{
+    const char *reasonText = "";
+    switch(event.reason)
+    {
+        case ThreadStarted:
+            reasonText = "thread-created";
+            break;
+        case ThreadExited:
+            reasonText = "thread-exited";
+            break;
+    }
+    Debugger::Printf("=%s,id=\"%i\"\n", reasonText, event.threadId);
+    return S_OK;
+}
+
 HRESULT Debugger::HandleCommand(std::string command,
                                 const std::vector<std::string> &args,
                                 std::string &output)

diff --git a/src/debug/netcoredbg/debugger.h b/src/debug/netcoredbg/debugger.h
index 62615f67ec3e0de3c8dba459b9f9cf032ed92394..2632ca273a46b99da9a058709df92a279e80ea32 100644 (file)
--- a/src/debug/netcoredbg/debugger.h
+++ b/src/debug/netcoredbg/debugger.h
@@ -56,6 +56,7 @@ class Debugger
 
     HRESULT EmitStoppedEvent(StoppedEvent event);
     HRESULT EmitExitedEvent(ExitedEvent event);
+    HRESULT EmitThreadEvent(ThreadEvent event);
 
 public:
     static HRESULT EmitBreakpointEvent(BreakpointEvent event);

diff --git a/src/debug/netcoredbg/main.cpp b/src/debug/netcoredbg/main.cpp
index b882b2f6c33a5bb221c1f75f9ef8309341b57b3d..c3f86201e3a2613ab9a5266bf932ca52b91de337 100644 (file)
--- a/src/debug/netcoredbg/main.cpp
+++ b/src/debug/netcoredbg/main.cpp
@@ -501,7 +501,7 @@ public:
         {
             DWORD threadId = 0;
             thread->GetID(&threadId);
-            Debugger::Printf("=thread-created,id=\"%i\"\n", (int)threadId);
+            m_debugger->EmitThreadEvent(ThreadEvent(ThreadStarted, threadId));
             pAppDomain->Continue(0);
             return S_OK;
         }
@@ -511,7 +511,10 @@ public:
             /* [in] */ ICorDebugThread *thread)
         {
             NotifyEvalComplete(thread, nullptr);
-            HandleEvent(pAppDomain, "ExitThread");
+            DWORD threadId = 0;
+            thread->GetID(&threadId);
+            m_debugger->EmitThreadEvent(ThreadEvent(ThreadExited, threadId));
+            pAppDomain->Continue(0);
             return S_OK;
         }
 

diff --git a/src/debug/netcoredbg/protocol.h b/src/debug/netcoredbg/protocol.h
index 7321278c4e7d329424264e1a613b5e5a33157cb8..78f40112eec877b7ee15cea43d53eb06ba70d441 100644 (file)
--- a/src/debug/netcoredbg/protocol.h
+++ b/src/debug/netcoredbg/protocol.h
@@ -108,3 +108,17 @@ struct ExitedEvent
 
     ExitedEvent(int exitCode) : exitCode(exitCode) {}
 };
+
+enum ThreadReason
+{
+    ThreadStarted,
+    ThreadExited
+};
+
+struct ThreadEvent
+{
+    ThreadReason reason;
+    int threadId;
+
+    ThreadEvent(ThreadReason reason, int threadId) : reason(reason), threadId(threadId) {}
+};