From 7524d72d4f0f634fe5407280b83c25181dc8c556 Mon Sep 17 00:00:00 2001
From: "Victor \"Nate\" Graf" <nategraf1@gmail.com>
Date: Wed, 20 Dec 2017 18:07:52 -0800
Subject: Enable EventPipe across Unix and Windows (#14772)

* [squashed] most work complete to enable EventPipe on Windows

* Eventpipe now builds on Windows

* Ensure evevntpipe is intialized on Windows

* Resolve the location of python from build.cmd

* Ensure eventing files are generated when needed

* moving linkage declaration to cmake

* create new event from constructor

* enable FEATURE_EVENT_TRACE and FEATURE_PERF_TRACE everywhere

* [WIP] checkpoint in fixing contarct errors

* add another possible python location

* Fix double delete bug in EventPipeConfiguration destructor

* Fix typo in function name

* Revert changes to .gitgnore

* bump to netstandard1.6 in preperation for new version of TraceEvent

* Revert changes to groovy files

* revert changes to perf-prep scripts

* add common.h and use nothrow

* Fix issue which was causing double delete of configprovider

* Add new test utilizing TraceEvent

* Remove accidentally added local directory reference

* Add comment to explain the addition of misc/tracepointprovider.cpp

* Add back sys.exit(0) and refactor

* Change conditional to be more direct

* Better handle NULL config

* Initialize m_deleteDefered

* Eliminate obsolete field

* Fix spelling error

* Fix nits

* Make smaple progiler timing functions easier to read

* Move projects back to netstandard1.4

* Incomplete improvements to EventPipeTrace test

* Add event integrity checks to test

* Clean up some left over code

* Add EventSource based test

* Remove unused PAL tests on Windows

* Fix Linux build breaks

* Minor changes to CMake files

* Remove //HACK for hack that was previously removed

* Fix formatting and negate a #ifdef

* Add conditional to ensure PERFTRACING is not enabled without EVENT_TRACE

* Take lock on EventPipeProvider and EventPipeConfiguration destruction

* Load winmm.dll at runtime

* Change function name and compile conditions

* Move typedef into #ifndef

* Use the correct config in setup

* Change lifecycle managment of EventPipeConfiguration's configuration provider

* Enable EventPipe tests pri0 and disable broken tests

* Replace python3 only error with python2 compatable one

* Make common.csproj build pri0

* Change TraceEvent version to 2.0.2 to match published verison

* Address cross build failure

* Remove use of undefined variable

* Add crossgen fix to .cmd

* Use more specific types to avoid marshalling errors

* Use Assert-style statements and remove one check

* Fix cross arch build

* Fix flipped branch

* Bring build.cmd changes to build.sh

* Fix cmake writing

* Revert "Bring build.cmd changes to build.sh"

This reverts commit 893c6492548d8bc9859ebba5b1b810aa630fac63.

* remove stdlib.h

* Fix out of order null check
---
 src/vm/eventpipefile.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/vm/eventpipefile.cpp')

diff --git a/src/vm/eventpipefile.cpp b/src/vm/eventpipefile.cpp
index 26e04480ee..ba4eb39b29 100644
--- a/src/vm/eventpipefile.cpp
+++ b/src/vm/eventpipefile.cpp
@@ -62,7 +62,7 @@ EventPipeFile::~EventPipeFile()
 {
     CONTRACTL
     {
-        THROWS;
+        NOTHROW;
         GC_TRIGGERS;
         MODE_ANY;
     }
@@ -87,7 +87,7 @@ void EventPipeFile::WriteEvent(EventPipeEventInstance &instance)
     CONTRACTL
     {
         THROWS;
-        GC_TRIGGERS;
+        GC_NOTRIGGER;
         MODE_ANY;
     }
     CONTRACTL_END;
@@ -126,8 +126,8 @@ StreamLabel EventPipeFile::GetMetadataLabel(EventPipeEvent &event)
 {
     CONTRACTL
     {
-        THROWS;
-        GC_TRIGGERS;
+        NOTHROW;
+        GC_NOTRIGGER;
         MODE_ANY;
     }
     CONTRACTL_END;
@@ -147,7 +147,7 @@ void EventPipeFile::SaveMetadataLabel(EventPipeEvent &event, StreamLabel label)
     CONTRACTL
     {
         THROWS;
-        GC_TRIGGERS;
+        GC_NOTRIGGER;
         MODE_ANY;
         PRECONDITION(label > 0);
     }
-- 
cgit v1.2.3