From 4713e0be3fc8ad1dfd860db912e1ce6447d6f36a Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusX@users.noreply.github.com>
Date: Fri, 21 Aug 2020 11:03:20 +0000
Subject: [PATCH] Port EventPipe CoreCLR changes to Mono.

Port changes done in the following CoreCLR PR's affecting corresponding Mono runtime EventPipe library sources:

https://github.com/dotnet/runtime/pull/36720
https://github.com/dotnet/runtime/pull/37002
https://github.com/dotnet/runtime/pull/38967
https://github.com/dotnet/runtime/pull/40191
https://github.com/dotnet/runtime/pull/40332
https://github.com/dotnet/runtime/pull/40499

EventPipe native code changes track by https://github.com/dotnet/runtime/issues/36820.
---
 mono/metadata/icall-eventpipe.c | 2 +-
 mono/mini/mini-runtime.c        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mono/metadata/icall-eventpipe.c b/mono/metadata/icall-eventpipe.c
index 3763ae3578b5..ae86f89ac426 100644
--- a/mono/metadata/icall-eventpipe.c
+++ b/mono/metadata/icall-eventpipe.c
@@ -320,7 +320,7 @@ ves_icall_System_Diagnostics_Tracing_EventPipeInternal_Enable (
 		(EventPipeSerializationFormat)format,
 		true,
 		NULL,
-		true);
+		NULL);
 	ep_start_streaming (session_id);
 
 	if (config_providers) {
diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 14ea80746a3a..403e1beef85d 100644
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -4555,6 +4555,7 @@ mini_init (const char *filename, const char *runtime_version)
 
 #if defined(ENABLE_PERFTRACING) && !defined(DISABLE_EVENTPIPE)
 	ep_init ();
+	ep_finish_init ();
 #endif
 
 	if (mono_aot_only) {