Skip to content

Commit 82dac28

Browse files
jkotasjkotas
authored
Share EventSource QCall definitions between NAOT and CoreCLR (#99441)
1 parent 03b5de7 commit 82dac28

18 files changed

+106
-557
lines changed

‎src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@
137137
<Compile Include="$(BclSourcesRoot)\System\Delegate.CoreCLR.cs" />
138138
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Debugger.cs" />
139139
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\EditAndContinueHelper.cs" />
140-
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipe.CoreCLR.cs" />
141-
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\NativeRuntimeEventSource.Threading.NativeSinks.CoreCLR.cs" />
142140
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\ICustomDebuggerNotification.cs" />
143141
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\StackFrame.CoreCLR.cs" />
144142
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\StackFrameHelper.cs" />

‎src/coreclr/nativeaot/Runtime/disabledeventpipeinternal.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct EventPipeEventInstanceData;
1313

1414
struct EventPipeSessionInfo;
1515

16-
EXTERN_C uint64_t QCALLTYPE RhEventPipeInternal_Enable(
16+
EXTERN_C uint64_t QCALLTYPE EventPipeInternal_Enable(
1717
const WCHAR* outputFile,
1818
EventPipeSerializationFormat format,
1919
uint32_t circularBufferSizeInMB,
@@ -23,19 +23,19 @@ EXTERN_C uint64_t QCALLTYPE RhEventPipeInternal_Enable(
2323
return 0;
2424
}
2525

26-
EXTERN_C void QCALLTYPE RhEventPipeInternal_Disable(uint64_t sessionID)
26+
EXTERN_C void QCALLTYPE EventPipeInternal_Disable(uint64_t sessionID)
2727
{
2828
}
2929

30-
EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_CreateProvider(
30+
EXTERN_C intptr_t QCALLTYPE EventPipeInternal_CreateProvider(
3131
const WCHAR* providerName,
3232
EventPipeCallback pCallbackFunc,
3333
void* pCallbackContext)
3434
{
3535
return 0;
3636
}
3737

38-
EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_DefineEvent(
38+
EXTERN_C intptr_t QCALLTYPE EventPipeInternal_DefineEvent(
3939
intptr_t provHandle,
4040
uint32_t eventID,
4141
int64_t keywords,
@@ -47,21 +47,21 @@ EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_DefineEvent(
4747
return 0;
4848
}
4949

50-
EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_GetProvider(const WCHAR* providerName)
50+
EXTERN_C intptr_t QCALLTYPE EventPipeInternal_GetProvider(const WCHAR* providerName)
5151
{
5252
return 0;
5353
}
5454

55-
EXTERN_C void QCALLTYPE RhEventPipeInternal_DeleteProvider(intptr_t provHandle)
55+
EXTERN_C void QCALLTYPE EventPipeInternal_DeleteProvider(intptr_t provHandle)
5656
{
5757
}
5858

59-
EXTERN_C int QCALLTYPE RhEventPipeInternal_EventActivityIdControl(uint32_t controlCode, GUID *pActivityId)
59+
EXTERN_C int QCALLTYPE EventPipeInternal_EventActivityIdControl(uint32_t controlCode, GUID *pActivityId)
6060
{
6161
return 0;
6262
}
6363

64-
EXTERN_C void QCALLTYPE RhEventPipeInternal_WriteEventData(
64+
EXTERN_C void QCALLTYPE EventPipeInternal_WriteEventData(
6565
intptr_t eventHandle,
6666
EventData *pEventData,
6767
uint32_t eventDataCount,
@@ -70,22 +70,22 @@ EXTERN_C void QCALLTYPE RhEventPipeInternal_WriteEventData(
7070
{
7171
}
7272

73-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_GetSessionInfo(uint64_t sessionID, EventPipeSessionInfo *pSessionInfo)
73+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_GetSessionInfo(uint64_t sessionID, EventPipeSessionInfo *pSessionInfo)
7474
{
7575
return FALSE;
7676
}
7777

78-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_GetNextEvent(uint64_t sessionID, EventPipeEventInstanceData *pInstance)
78+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_GetNextEvent(uint64_t sessionID, EventPipeEventInstanceData *pInstance)
7979
{
8080
return FALSE;
8181
}
8282

83-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_SignalSession(uint64_t sessionID)
83+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_SignalSession(uint64_t sessionID)
8484
{
8585
return FALSE;
8686
}
8787

88-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_WaitForSessionSignal(uint64_t sessionID, int32_t timeoutMs)
88+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_WaitForSessionSignal(uint64_t sessionID, int32_t timeoutMs)
8989
{
9090
return FALSE;
9191
}

‎src/coreclr/nativeaot/Runtime/eventpipeinternal.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct EventPipeProviderConfigurationNative
4343
WCHAR *pFilterData;
4444
};
4545

46-
EXTERN_C uint64_t QCALLTYPE RhEventPipeInternal_Enable(
46+
EXTERN_C uint64_t QCALLTYPE EventPipeInternal_Enable(
4747
const WCHAR* outputFile,
4848
EventPipeSerializationFormat format,
4949
uint32_t circularBufferSizeInMB,
@@ -104,12 +104,12 @@ EXTERN_C uint64_t QCALLTYPE RhEventPipeInternal_Enable(
104104
return result;
105105
}
106106

107-
EXTERN_C void QCALLTYPE RhEventPipeInternal_Disable(uint64_t sessionID)
107+
EXTERN_C void QCALLTYPE EventPipeInternal_Disable(uint64_t sessionID)
108108
{
109109
ep_disable(sessionID);
110110
}
111111

112-
EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_CreateProvider(
112+
EXTERN_C intptr_t QCALLTYPE EventPipeInternal_CreateProvider(
113113
const WCHAR* providerName,
114114
EventPipeCallback pCallbackFunc,
115115
void* pCallbackContext)
@@ -120,7 +120,7 @@ EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_CreateProvider(
120120
return reinterpret_cast<intptr_t>(pProvider);
121121
}
122122

123-
EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_DefineEvent(
123+
EXTERN_C intptr_t QCALLTYPE EventPipeInternal_DefineEvent(
124124
intptr_t provHandle,
125125
uint32_t eventID,
126126
int64_t keywords,
@@ -139,7 +139,7 @@ EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_DefineEvent(
139139
return reinterpret_cast<intptr_t>(pEvent);
140140
}
141141

142-
EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_GetProvider(const WCHAR* providerName)
142+
EXTERN_C intptr_t QCALLTYPE EventPipeInternal_GetProvider(const WCHAR* providerName)
143143
{
144144
EventPipeProvider * provider = NULL;
145145
if (providerName)
@@ -152,7 +152,7 @@ EXTERN_C intptr_t QCALLTYPE RhEventPipeInternal_GetProvider(const WCHAR* provide
152152
return reinterpret_cast<intptr_t>(provider);
153153
}
154154

155-
EXTERN_C void QCALLTYPE RhEventPipeInternal_DeleteProvider(intptr_t provHandle)
155+
EXTERN_C void QCALLTYPE EventPipeInternal_DeleteProvider(intptr_t provHandle)
156156
{
157157
if (provHandle != 0)
158158
{
@@ -172,7 +172,7 @@ enum class ActivityControlCode
172172
EVENT_ACTIVITY_CONTROL_CREATE_SET_ID = 5
173173
};
174174

175-
EXTERN_C int QCALLTYPE RhEventPipeInternal_EventActivityIdControl(uint32_t controlCode, GUID *pActivityId)
175+
EXTERN_C int QCALLTYPE EventPipeInternal_EventActivityIdControl(uint32_t controlCode, GUID *pActivityId)
176176
{
177177
int retVal = 0;
178178
ep_rt_thread_activity_id_handle_t activityIdHandle = ep_thread_get_activity_id_handle ();
@@ -224,7 +224,7 @@ EXTERN_C int QCALLTYPE RhEventPipeInternal_EventActivityIdControl(uint32_t contr
224224
return retVal;
225225
}
226226

227-
EXTERN_C void QCALLTYPE RhEventPipeInternal_WriteEventData(
227+
EXTERN_C void QCALLTYPE EventPipeInternal_WriteEventData(
228228
intptr_t eventHandle,
229229
EventData *pEventData,
230230
uint32_t eventDataCount,
@@ -236,7 +236,7 @@ EXTERN_C void QCALLTYPE RhEventPipeInternal_WriteEventData(
236236
ep_write_event_2(pEvent, pEventData, eventDataCount, reinterpret_cast<const uint8_t*>(pActivityId), reinterpret_cast<const uint8_t*>(pRelatedActivityId));
237237
}
238238

239-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_GetSessionInfo(uint64_t sessionID, EventPipeSessionInfo *pSessionInfo)
239+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_GetSessionInfo(uint64_t sessionID, EventPipeSessionInfo *pSessionInfo)
240240
{
241241
bool retVal = false;
242242
if (pSessionInfo != NULL)
@@ -253,7 +253,7 @@ EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_GetSessionInfo(uint64_t sessi
253253
return retVal;
254254
}
255255

256-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_GetNextEvent(uint64_t sessionID, EventPipeEventInstanceData *pInstance)
256+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_GetNextEvent(uint64_t sessionID, EventPipeEventInstanceData *pInstance)
257257
{
258258
EventPipeEventInstance *pNextInstance = NULL;
259259
_ASSERTE(pInstance != NULL);
@@ -274,7 +274,7 @@ EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_GetNextEvent(uint64_t session
274274
return pNextInstance != NULL;
275275
}
276276

277-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_SignalSession(uint64_t sessionID)
277+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_SignalSession(uint64_t sessionID)
278278
{
279279
EventPipeSession *const session = ep_get_session (sessionID);
280280
if (!session)
@@ -283,7 +283,7 @@ EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_SignalSession(uint64_t sessio
283283
return ep_rt_wait_event_set (ep_session_get_wait_event (session));
284284
}
285285

286-
EXTERN_C UInt32_BOOL QCALLTYPE RhEventPipeInternal_WaitForSessionSignal(uint64_t sessionID, int32_t timeoutMs)
286+
EXTERN_C UInt32_BOOL QCALLTYPE EventPipeInternal_WaitForSessionSignal(uint64_t sessionID, int32_t timeoutMs)
287287
{
288288
EventPipeSession *const session = ep_get_session (sessionID);
289289
if (!session)

‎src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@
176176
<Compile Include="System\Diagnostics\StackFrame.NativeAot.cs" />
177177
<Compile Include="System\Diagnostics\StackFrameExtensions.cs" />
178178
<Compile Include="System\Diagnostics\StackTrace.NativeAot.cs" />
179-
<Compile Include="System\Diagnostics\Eventing\EventPipe.NativeAot.cs" />
180-
<Compile Include="System\Diagnostics\Eventing\NativeRuntimeEventSource.Threading.NativeSinks.NativeAot.cs" Condition="'$(FeaturePerfTracing)' == 'true'" />
181179
<Compile Include="System\Enum.NativeAot.cs" />
182180
<Compile Include="System\Environment.NativeAot.cs" />
183181
<Compile Include="System\GC.NativeAot.cs" />

‎src/coreclr/nativeaot/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipe.NativeAot.cs

-163
This file was deleted.

0 commit comments

Comments
 (0)