Add ProcessInfo command to Diagnostics Server

src/coreclr/src/vm/CMakeLists.txt

@@ -379,6 +379,7 @@ set(VM_SOURCES_WKS
     objectlist.cpp
     olevariant.cpp
     pendingload.cpp
+    processdiagnosticsprotocolhelper.cpp
     profdetach.cpp
     profilermetadataemitvalidator.cpp
     profilingenumerators.cpp
@@ -499,6 +500,7 @@ set(VM_HEADERS_WKS
     objectlist.h
     olevariant.h
     pendingload.h
+    processdiagnosticsprotocolhelper.h
     profdetach.h
     profilermetadataemitvalidator.h
     profilingenumerators.h

src/coreclr/src/vm/diagnosticserver.cpp

@@ -7,6 +7,7 @@
 #include "eventpipeprotocolhelper.h"
 #include "dumpdiagnosticprotocolhelper.h"
 #include "profilerdiagnosticprotocolhelper.h"
+#include "processdiagnosticsprotocolhelper.h"
 #include "diagnosticsprotocol.h"
 
 #ifdef TARGET_UNIX
@@ -75,10 +76,6 @@ DWORD WINAPI DiagnosticServer::DiagnosticsServerThread(LPVOID)
 
             switch ((DiagnosticsIpc::DiagnosticServerCommandSet)message.GetHeader().CommandSet)
             {
-            case DiagnosticsIpc::DiagnosticServerCommandSet::Server:
-                DiagnosticServerProtocolHelper::HandleIpcMessage(message, pStream);
-                break;
-
             case DiagnosticsIpc::DiagnosticServerCommandSet::EventPipe:
                 EventPipeProtocolHelper::HandleIpcMessage(message, pStream);
                 break;
@@ -87,6 +84,10 @@ DWORD WINAPI DiagnosticServer::DiagnosticsServerThread(LPVOID)
                 DumpDiagnosticProtocolHelper::HandleIpcMessage(message, pStream);
                 break;
 
+            case DiagnosticsIpc::DiagnosticServerCommandSet::Process:
+                ProcessDiagnosticsProtocolHelper::HandleIpcMessage(message,pStream);
+                break;
+
 #ifdef FEATURE_PROFAPI_ATTACH_DETACH
             case DiagnosticsIpc::DiagnosticServerCommandSet::Profiler:
                 ProfilerDiagnosticProtocolHelper::HandleIpcMessage(message, pStream);
@@ -291,49 +292,4 @@ void DiagnosticServer::ResumeRuntimeStartup()
         s_ResumeRuntimeStartupEvent->Set();
 }
 
-void DiagnosticServerProtocolHelper::HandleIpcMessage(DiagnosticsIpc::IpcMessage& message, IpcStream* pStream)
-{
-    CONTRACTL
-    {
-        THROWS;
-        GC_TRIGGERS;
-        MODE_ANY;
-        PRECONDITION(pStream != nullptr);
-    }
-    CONTRACTL_END;
-
-    switch ((DiagnosticsIpc::DiagnosticServerCommandId)message.GetHeader().CommandId)
-    {
-    case DiagnosticsIpc::DiagnosticServerCommandId::ResumeRuntime:
-        DiagnosticServerProtocolHelper::ResumeRuntimeStartup(message, pStream);
-        break;
-
-    default:
-        STRESS_LOG1(LF_DIAGNOSTICS_PORT, LL_WARNING, "Received unknown request type (%d)\n", message.GetHeader().CommandSet);
-        DiagnosticsIpc::IpcMessage::SendErrorMessage(pStream, CORDIAGIPC_E_UNKNOWN_COMMAND);
-        delete pStream;
-        break;
-    }
-}
-
-void DiagnosticServerProtocolHelper::ResumeRuntimeStartup(DiagnosticsIpc::IpcMessage& message, IpcStream *pStream)
-{
-    CONTRACTL
-    {
-        THROWS;
-        GC_TRIGGERS;
-        MODE_PREEMPTIVE;
-        PRECONDITION(pStream != nullptr);
-    }
-    CONTRACTL_END;
-
-    // no payload
-    DiagnosticServer::ResumeRuntimeStartup();
-    HRESULT res = S_OK;
-
-    DiagnosticsIpc::IpcMessage successResponse;
-    if (successResponse.Initialize(DiagnosticsIpc::GenericSuccessHeader, res))
-        successResponse.Send(pStream);
-}
-
 #endif // FEATURE_PERFTRACING

src/coreclr/src/vm/diagnosticserver.h

@@ -36,14 +36,6 @@ class DiagnosticServer final
     static CLREventStatic *s_ResumeRuntimeStartupEvent;
 };
 
-class DiagnosticServerProtocolHelper
-{
-public:
-    // IPC event handlers.
-    static void HandleIpcMessage(DiagnosticsIpc::IpcMessage& message, IpcStream *pStream);
-    static void ResumeRuntimeStartup(DiagnosticsIpc::IpcMessage& message, IpcStream *pStream);
-};
-
 #endif // FEATURE_PERFTRACING
 
 #endif // __DIAGNOSTIC_SERVER_H__

src/coreclr/src/vm/diagnosticsprotocol.h

@@ -70,24 +70,15 @@ namespace DiagnosticsIpc
         Dump          = 0x01,
         EventPipe     = 0x02,
         Profiler      = 0x03,
+        Process       = 0x04,
 
         Server        = 0xFF,
     };
 
-    // Overlaps with DiagnosticServerResponseId
-    // DON'T create overlapping values
-    enum class DiagnosticServerCommandId : uint8_t
-    {
-        // 0x00 used in DiagnosticServerResponseId
-        ResumeRuntime = 0x01,
-        // 0xFF used DiagnosticServerResponseId
-    };
-
-    // Overlaps with DiagnosticServerCommandId
-    // DON'T create overlapping values
     enum class DiagnosticServerResponseId : uint8_t
     {
         OK            = 0x00,
+        // future
         Error         = 0xFF,
     };
 
@@ -206,12 +197,12 @@ namespace DiagnosticsIpc
     //
     // For more details on this pattern, look up "Substitution Failure Is Not An Error" or SFINAE
 
-    // template meta-programming to check for bool(Flatten)(void*) member function
+    // template meta-programming to check for bool(Flatten)(BYTE*&, uint16_t&) member function
     template <typename T>
     struct HasFlatten
     {
         template <typename U, U u> struct Has;
-        template <typename U> static std::true_type test(Has<bool (U::*)(void*), &U::Flatten>*);
+        template <typename U> static std::true_type test(Has<bool (U::*)(BYTE*&, uint16_t&), &U::Flatten>*);
         template <typename U> static std::false_type test(...);
         static constexpr bool value = decltype(test<T>(nullptr))::value;
     };
@@ -464,7 +455,7 @@ namespace DiagnosticsIpc
         // Handles the case where the payload structure exposes Flatten
         // and GetSize methods
         template <typename U,
-                  typename std::enable_if<HasFlatten<U>::value&& HasGetSize<U>::value, int>::type = 0>
+                  typename std::enable_if<HasFlatten<U>::value && HasGetSize<U>::value, int>::type = 0>
         bool FlattenImpl(U& payload)
         {
             CONTRACTL
@@ -483,6 +474,7 @@ namespace DiagnosticsIpc
             ASSERT(!temp_size.IsOverflow());
 
             m_Size = temp_size.Value();
+            uint16_t remainingBytes = temp_size.Value();
 
             BYTE* temp_buffer = new (nothrow) BYTE[m_Size];
             if (temp_buffer == nullptr)
@@ -497,13 +489,14 @@ namespace DiagnosticsIpc
 
             memcpy(temp_buffer_cursor, &m_Header, sizeof(struct IpcHeader));
             temp_buffer_cursor += sizeof(struct IpcHeader);
+            remainingBytes -= sizeof(struct IpcHeader);
 
-            payload.Flatten(temp_buffer_cursor);
+            const bool fSuccess = payload.Flatten(temp_buffer_cursor, remainingBytes);
 
             ASSERT(m_pData == nullptr);
             m_pData = temp_buffer;
 
-            return true;
+            return fSuccess;
         };
 
         // handles the case where we were handed a struct with no Flatten or GetSize method

src/coreclr/src/vm/eventpipeeventsource.h

@@ -19,15 +19,15 @@ class EventPipeEventSource
     const static WCHAR* s_pProcessInfoEventName;
     EventPipeEvent *m_pProcessInfoEvent;
 
-    const static WCHAR* s_pOSInformation;
-    const static WCHAR* s_pArchInformation;
-
 public:
     EventPipeEventSource();
     ~EventPipeEventSource();
 
     void Enable(EventPipeSession *pSession);
     void SendProcessInfo(LPCWSTR pCommandLine);
+
+    const static WCHAR* s_pOSInformation;
+    const static WCHAR* s_pArchInformation;
 };
 
 #endif // FEATURE_PERFTRACING