diff options
| author | Sung Yoon Whang <suwhang@microsoft.com> | 2018-12-15 22:10:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 22:10:51 -0800 |
| commit | 1db91c5acd17384952d1e1f8e3079c2c8cfb78f6 (patch) | |
| tree | 52290c8e2c510db1b7741123aa4029e14b0b5e64 /src/gc | |
| parent | c49b8f40fa3752d1afe85bf021e0225d0efd18e4 (diff) | |
| download | coreclr-1db91c5acd17384952d1e1f8e3079c2c8cfb78f6.tar.gz coreclr-1db91c5acd17384952d1e1f8e3079c2c8cfb78f6.tar.bz2 coreclr-1db91c5acd17384952d1e1f8e3079c2c8cfb78f6.zip | |
Enable PinPlugAtGCTime event for standalone GC (#21543)
Diffstat (limited to 'src/gc')
| -rw-r--r-- | src/gc/gc.cpp | 7 | ||||
| -rw-r--r-- | src/gc/gcevents.h | 1 | ||||
| -rw-r--r-- | src/gc/gcinterface.ee.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index 3ff1aa8566..095eb5c755 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -21680,7 +21680,7 @@ void gc_heap::plan_phase (int condemned_gen_number) generation_plan_allocation_start (temp_gen))); } - BOOL fire_pinned_plug_events_p = ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PRIVATE_PROVIDER_Context, PinPlugAtGCTime); + BOOL fire_pinned_plug_events_p = EVENT_ENABLED(PinPlugAtGCTime); size_t last_plug_len = 0; while (1) @@ -21966,9 +21966,8 @@ void gc_heap::plan_phase (int condemned_gen_number) if (pinned_plug_p) { if (fire_pinned_plug_events_p) - FireEtwPinPlugAtGCTime(plug_start, plug_end, - (merge_with_last_pin_p ? 0 : (uint8_t*)node_gap_size (plug_start)), - GetClrInstanceId()); + FIRE_EVENT(PinPlugAtGCTime, plug_start, plug_end, + (merge_with_last_pin_p ? 0 : (uint8_t*)node_gap_size (plug_start))); if (merge_with_last_pin_p) { diff --git a/src/gc/gcevents.h b/src/gc/gcevents.h index f0f6ff6f32..f834c1cd68 100644 --- a/src/gc/gcevents.h +++ b/src/gc/gcevents.h @@ -25,6 +25,7 @@ KNOWN_EVENT(GCAllocationTick_V1, GCEventProvider_Default, GCEventLevel_Verbose, KNOWN_EVENT(GCAllocationTick_V3, GCEventProvider_Default, GCEventLevel_Verbose, GCEventKeyword_GC) KNOWN_EVENT(PinObjectAtGCTime, GCEventProvider_Default, GCEventLevel_Verbose, GCEventKeyword_GC) KNOWN_EVENT(GCPerHeapHistory_V3, GCEventProvider_Default, GCEventLevel_Information, GCEventKeyword_GC) +KNOWN_EVENT(PinPlugAtGCTime, GCEventProvider_Private, GCEventLevel_Verbose, GCEventKeyword_GC) KNOWN_EVENT(SetGCHandle, GCEventProvider_Default, GCEventLevel_Information, GCEventKeyword_GCHandle) KNOWN_EVENT(DestroyGCHandle, GCEventProvider_Default, GCEventLevel_Information, GCEventKeyword_GCHandle) diff --git a/src/gc/gcinterface.ee.h b/src/gc/gcinterface.ee.h index f64ee97257..9a38f9f07c 100644 --- a/src/gc/gcinterface.ee.h +++ b/src/gc/gcinterface.ee.h @@ -106,6 +106,9 @@ public: void FirePinObjectAtGCTime(void* object, uint8_t** ppObject) = 0; virtual + void FirePinPlugAtGCTime(uint8_t* plug_start, uint8_t* plug_end, uint8_t* gapBeforeSize) = 0; + + virtual void FireGCPerHeapHistory_V3(void *freeListAllocated, void *freeListRejected, void *endOfSegAllocated, |