Remove unused param from EventPipe (#32698)

diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipe.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipe.cs
index 020f24f..18ea8b9 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipe.cs
+++ b/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipe.cs
@@ -305,10 +305,7 @@ namespace System.Diagnostics.Tracing
         internal static extern int EventActivityIdControl(uint controlCode, ref Guid activityId);
 
         [DllImport(RuntimeHelpers.QCall, CharSet = CharSet.Unicode)]
-        internal static extern unsafe void WriteEvent(IntPtr eventHandle, uint eventID, void* pData, uint length, Guid* activityId, Guid* relatedActivityId);
-
-        [DllImport(RuntimeHelpers.QCall, CharSet = CharSet.Unicode)]
-        internal static extern unsafe void WriteEventData(IntPtr eventHandle, uint eventID, EventProvider.EventData* pEventData, uint dataCount, Guid* activityId, Guid* relatedActivityId);
+        internal static extern unsafe void WriteEventData(IntPtr eventHandle, EventProvider.EventData* pEventData, uint dataCount, Guid* activityId, Guid* relatedActivityId);
 
 
         //

diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipeEventProvider.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipeEventProvider.cs
index 655c07a..52b9e4d 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipeEventProvider.cs
+++ b/src/coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipeEventProvider.cs
@@ -50,12 +50,11 @@ namespace System.Diagnostics.Tracing
             int userDataCount,
             EventProvider.EventData* userData)
         {
-            uint eventID = (uint)eventDescriptor.EventId;
-            if (eventID != 0 && eventHandle != IntPtr.Zero)
+            if (eventDescriptor.EventId != 0 && eventHandle != IntPtr.Zero)
             {
                 if (userDataCount == 0)
                 {
-                    EventPipeInternal.WriteEventData(eventHandle, eventID, null, 0, activityId, relatedActivityId);
+                    EventPipeInternal.WriteEventData(eventHandle, null, 0, activityId, relatedActivityId);
                     return EventProvider.WriteEventErrorCode.NoError;
                 }
 
@@ -68,7 +67,7 @@ namespace System.Diagnostics.Tracing
                     userDataCount -= 3;
                     Debug.Assert(userDataCount >= 0);
                 }
-                EventPipeInternal.WriteEventData(eventHandle, eventID, userData, (uint)userDataCount, activityId, relatedActivityId);
+                EventPipeInternal.WriteEventData(eventHandle, userData, (uint)userDataCount, activityId, relatedActivityId);
             }
             return EventProvider.WriteEventErrorCode.NoError;
         }

diff --git a/src/coreclr/src/vm/ecalllist.h b/src/coreclr/src/vm/ecalllist.h
index 7fa9dc4..abcd390 100644 (file)
--- a/src/coreclr/src/vm/ecalllist.h
+++ b/src/coreclr/src/vm/ecalllist.h
@@ -1080,7 +1080,6 @@ FCFuncStart(gEventPipeInternalFuncs)
     QCFuncElement("DeleteProvider", EventPipeInternal::DeleteProvider)
     QCFuncElement("EventActivityIdControl", EventPipeInternal::EventActivityIdControl)
     QCFuncElement("GetProvider", EventPipeInternal::GetProvider)
-    QCFuncElement("WriteEvent", EventPipeInternal::WriteEvent)
     QCFuncElement("WriteEventData", EventPipeInternal::WriteEventData)
     QCFuncElement("GetNextEvent", EventPipeInternal::GetNextEvent)
     QCFuncElement("GetWaitHandle", EventPipeInternal::GetWaitHandle)

diff --git a/src/coreclr/src/vm/eventpipeinternal.cpp b/src/coreclr/src/vm/eventpipeinternal.cpp
index de3186c..1493441 100644 (file)
--- a/src/coreclr/src/vm/eventpipeinternal.cpp
+++ b/src/coreclr/src/vm/eventpipeinternal.cpp
@@ -216,27 +216,8 @@ int QCALLTYPE EventPipeInternal::EventActivityIdControl(uint32_t controlCode, GU
     return retVal;
 }
 
-void QCALLTYPE EventPipeInternal::WriteEvent(
-    INT_PTR eventHandle,
-    UINT32 eventID,
-    void *pData,
-    UINT32 length,
-    LPCGUID pActivityId,
-    LPCGUID pRelatedActivityId)
-{
-    QCALL_CONTRACT;
-    BEGIN_QCALL;
-
-    _ASSERTE(eventHandle != NULL);
-    EventPipeEvent *pEvent = reinterpret_cast<EventPipeEvent *>(eventHandle);
-    EventPipe::WriteEvent(*pEvent, (BYTE *)pData, length, pActivityId, pRelatedActivityId);
-
-    END_QCALL;
-}
-
 void QCALLTYPE EventPipeInternal::WriteEventData(
     INT_PTR eventHandle,
-    UINT32 eventID,
     EventData *pEventData,
     UINT32 eventDataCount,
     LPCGUID pActivityId,

diff --git a/src/coreclr/src/vm/eventpipeinternal.h b/src/coreclr/src/vm/eventpipeinternal.h
index 9367501..ad82554 100644 (file)
--- a/src/coreclr/src/vm/eventpipeinternal.h
+++ b/src/coreclr/src/vm/eventpipeinternal.h
@@ -81,16 +81,8 @@ public:
         uint32_t controlCode,
         GUID *pActivityId);
 
-    static void QCALLTYPE WriteEvent(
-        INT_PTR eventHandle,
-        UINT32 eventID,
-        void *pData,
-        UINT32 length,
-        LPCGUID pActivityId, LPCGUID pRelatedActivityId);
-
     static void QCALLTYPE WriteEventData(
         INT_PTR eventHandle,
-        UINT32 eventID,
         EventData *pEventData,
         UINT32 eventDataCount,
         LPCGUID pActivityId, LPCGUID pRelatedActivityId);