Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Remove EventPipeController static constructor #21718

Merged
merged 4 commits into from
Dec 31, 2018
Merged

Conversation

benaadams
Copy link
Member

@benaadams benaadams commented Dec 30, 2018

Is unnecessary work in the startup path (and doesn't get used until EventPipe is enabled)

Pre

image

Previous .cctor

.method private hidebysig specialname rtspecialname static 
	void .cctor () cil managed 
{
	// Method begins at RVA 0x472c8c
	// Code size 181 (0xb5)
	.maxstack 7

	IL_0000: ldc.i4.1
	IL_0001: newarr System.Char
	IL_0006: dup
	IL_0007: ldc.i4.0
	IL_0008: ldc.i4.s 44
	IL_000a: stelem.i2
	IL_000b: stsfld char[] System.Diagnostics.Tracing.EventPipeController::ProviderConfigDelimiter
	IL_0010: ldc.i4.1
	IL_0011: newarr System.Char
	IL_0016: dup
	IL_0017: ldc.i4.0
	IL_0018: ldc.i4.s 58
	IL_001a: stelem.i2
	IL_001b: stsfld char[] System.Diagnostics.Tracing.EventPipeController::ConfigComponentDelimiter
	IL_0020: ldc.i4.2
	IL_0021: newarr System.String
	IL_0026: dup
	IL_0027: ldc.i4.0
	IL_0028: ldstr "\r\n"
	IL_002d: stelem.ref
	IL_002e: dup
	IL_002f: ldc.i4.1
	IL_0030: ldstr "\n"
	IL_0035: stelem.ref
	IL_0036: stsfld string[] System.Diagnostics.Tracing.EventPipeController::ConfigFileLineDelimiters
	IL_003b: ldc.i4.3
	IL_003c: newarr System.Diagnostics.Tracing.EventPipeProviderConfiguration
	IL_0041: dup
	IL_0042: ldc.i4.0
	IL_0043: ldstr "Microsoft-Windows-DotNETRuntime"
	IL_0048: ldc.i8 20423101629
	IL_0051: ldc.i4.5
	IL_0052: ldnull
	IL_0053: newobj instance void System.Diagnostics.Tracing.EventPipeProviderConfiguration::.ctor(string, uint64, uint32, string)
	IL_0058: stelem System.Diagnostics.Tracing.EventPipeProviderConfiguration
	IL_005d: dup
	IL_005e: ldc.i4.1
	IL_005f: ldstr "Microsoft-Windows-DotNETRuntimePrivate"
	IL_0064: ldc.i4 1073872907
	IL_0069: conv.i8
	IL_006a: ldc.i4.5
	IL_006b: ldnull
	IL_006c: newobj instance void System.Diagnostics.Tracing.EventPipeProviderConfiguration::.ctor(string, uint64, uint32, string)
	IL_0071: stelem System.Diagnostics.Tracing.EventPipeProviderConfiguration
	IL_0076: dup
	IL_0077: ldc.i4.2
	IL_0078: ldstr "Microsoft-DotNETCore-SampleProfiler"
	IL_007d: ldc.i4.0
	IL_007e: conv.i8
	IL_007f: ldc.i4.5
	IL_0080: ldnull
	IL_0081: newobj instance void System.Diagnostics.Tracing.EventPipeProviderConfiguration::.ctor(string, uint64, uint32, string)
	IL_0086: stelem System.Diagnostics.Tracing.EventPipeProviderConfiguration
	IL_008b: stsfld valuetype System.Diagnostics.Tracing.EventPipeProviderConfiguration[] System.Diagnostics.Tracing.EventPipeController::DefaultProviderConfiguration
	IL_0090: ldnull
	IL_0091: stsfld class System.Diagnostics.Tracing.EventPipeController System.Diagnostics.Tracing.EventPipeController::s_controllerInstance
	IL_0096: ldc.i4.0
	IL_0097: stsfld bool System.Diagnostics.Tracing.EventPipeController::s_initializing
	IL_009c: ldc.i4.m1
	IL_009d: stsfld int32 System.Diagnostics.Tracing.EventPipeController::s_Config_EnableEventPipe
	IL_00a2: ldnull
	IL_00a3: stsfld string System.Diagnostics.Tracing.EventPipeController::s_Config_EventPipeConfig
	IL_00a8: ldc.i4.0
	IL_00a9: stsfld uint32 System.Diagnostics.Tracing.EventPipeController::s_Config_EventPipeCircularMB
	IL_00ae: ldnull
	IL_00af: stsfld string System.Diagnostics.Tracing.EventPipeController::s_Config_EventPipeOutputPath
	IL_00b4: ret
} // end of method EventPipeController::.cctor

Post

image

/cc @jkotas @vancem @brianrob

Contributes to https://github.com/dotnet/corefx/issues/34283#issuecomment-451015598

@benaadams
Copy link
Member Author

@dotnet-bot test Ubuntu arm Cross Checked no_tiered_compilation_innerloop Build and Test

@benaadams
Copy link
Member Author

@dotnet-bot test OSX10.12 x64 Checked Innerloop Build and Test

@jkotas jkotas merged commit 73d7d22 into dotnet:master Dec 31, 2018
@benaadams benaadams deleted the eventpipe branch December 31, 2018 17:58
jorive added a commit that referenced this pull request Apr 25, 2019
* Remove file polling only, and leave the COMPlus_* functionality.
* Fix bug/typo introduced with #21718
Dotnet-GitSync-Bot pushed a commit to Dotnet-GitSync-Bot/corefx that referenced this pull request Apr 25, 2019
* Remove file polling only, and leave the COMPlus_* functionality.
* Fix bug/typo introduced with dotnet/coreclr#21718

Signed-off-by: dotnet-bot <[email protected]>
Dotnet-GitSync-Bot pushed a commit to Dotnet-GitSync-Bot/corert that referenced this pull request Apr 25, 2019
* Remove file polling only, and leave the COMPlus_* functionality.
* Fix bug/typo introduced with dotnet/coreclr#21718

Signed-off-by: dotnet-bot <[email protected]>
jkotas pushed a commit to dotnet/corert that referenced this pull request Apr 25, 2019
* Remove file polling only, and leave the COMPlus_* functionality.
* Fix bug/typo introduced with dotnet/coreclr#21718

Signed-off-by: dotnet-bot <[email protected]>
jkotas pushed a commit to dotnet/corefx that referenced this pull request Apr 26, 2019
* Remove file polling only, and leave the COMPlus_* functionality.
* Fix bug/typo introduced with dotnet/coreclr#21718

Signed-off-by: dotnet-bot <[email protected]>
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
* Remove EventPipeController static constructor

* Don't cache DefaultProviderConfiguration


Commit migrated from dotnet/coreclr@73d7d22
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
…oreclr#24225)

* Remove file polling only, and leave the COMPlus_* functionality.
* Fix bug/typo introduced with dotnet/coreclr#21718

Commit migrated from dotnet/coreclr@e302634
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants