Skip to content

Move EventPipe environment variable parsing logic to native code #32516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sywhang merged 22 commits into from
Mar 4, 2020
Merged

Move EventPipe environment variable parsing logic to native code #32516

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
967e672
Move environment variable parsing logic to native code
sywhang Jan 10, 2020
7b5e97f
Fix multiple provider issue
sywhang Jan 15, 2020
5df4b8d
Merging with master
sywhang Feb 13, 2020
d2a787b
Use env vars to set up eventpipe config
sywhang Feb 14, 2020
9d2f0b8
Add default provider configuration if eventpipeconfig is not set
sywhang Feb 15, 2020
f2a9138
Remove EventPipeController
sywhang Feb 18, 2020
73dbabd
Add Argument parsing logic to XplatEventLoggerConfiguration
sywhang Feb 18, 2020
6098b6c
cleanup
sywhang Feb 18, 2020
d845bb0
Fix Linux build
sywhang Feb 19, 2020
6515b7b
Check provider configuration before enabling them
sywhang Feb 19, 2020
63a4a46
wrap new code under ifdef, put EventPipeController back
sywhang Feb 19, 2020
217fbd3
pr feedback
sywhang Feb 19, 2020
bba1446
fix x86 build
sywhang Feb 19, 2020
d1632c5
fix typo
sywhang Feb 19, 2020
75a5325
Fix loop condition
sywhang Feb 20, 2020
0bbcaea
ifdef out call to EnableViaEnvironmentVariables()
sywhang Feb 20, 2020
878e0f4
Use CLRConfigStringHolder
sywhang Feb 21, 2020
8fcf438
pr comments
sywhang Feb 21, 2020
e6fa99d
Merge branch 'master' into dev/suwhang/move-eventpipe-envvar-parsing
sywhang Feb 26, 2020
fc849a6
Fix merge conflict
sywhang Feb 26, 2020
eee8f0e
Merge branch 'dev/suwhang/move-eventpipe-envvar-parsing' of github.co…
sywhang Feb 27, 2020
3b0f1a8
use NewHolder to avoid leak
sywhang Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Debugger.cs" />
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\EditAndContinueHelper.cs" />
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipe.cs" />
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipeController.cs" />
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipeEventDispatcher.cs" />
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipeEventProvider.cs" />
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\EventPipeMetadataGenerator.cs" />
Expand Down
221 changes: 0 additions & 221 deletions ...coreclr/src/System.Private.CoreLib/src/System/Diagnostics/Eventing/EventPipeController.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/coreclr/src/System.Private.CoreLib/src/System/StartupHookProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ private struct StartupHookNameOrPath
// containing a startup hook, and call each hook in turn.
private static void ProcessStartupHooks()
{
// Initialize tracing before any user code can be called.
System.Diagnostics.Tracing.EventPipeController.Initialize();
// Initialize System.Runtime EventSource
System.Diagnostics.Tracing.RuntimeEventSource.Initialize();

string? startupHooksVariable = (string?)AppContext.GetData("STARTUP_HOOKS");
if (startupHooksVariable == null)
Expand Down
Loading