diff options
author | dotnet-bot <dotnet-bot@microsoft.com> | 2015-04-07 17:23:32 -0700 |
---|---|---|
committer | dotnet-bot <dotnet-bot@microsoft.com> | 2015-04-07 17:23:32 -0700 |
commit | f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0 (patch) | |
tree | 7a7156b56e9b9283ae0668491157bf1526077a3a /src/vm/ClrEtwAllMeta.lst | |
parent | 1afe5ce4f45045d724a4e129df4b816655d486fb (diff) | |
download | coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.tar.gz coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.tar.bz2 coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.zip |
Merge changes from parent branch
[tfs-changeset: 1448103]
Diffstat (limited to 'src/vm/ClrEtwAllMeta.lst')
-rw-r--r-- | src/vm/ClrEtwAllMeta.lst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/vm/ClrEtwAllMeta.lst b/src/vm/ClrEtwAllMeta.lst index 355fe08601..baa138dedf 100644 --- a/src/vm/ClrEtwAllMeta.lst +++ b/src/vm/ClrEtwAllMeta.lst @@ -101,6 +101,8 @@ nomac:GarbageCollection:::GCMarkHandles nostack:GarbageCollection:::GCMarkHandles nomac:GarbageCollection:::GCMarkOlderGenerationRoots nostack:GarbageCollection:::GCMarkOlderGenerationRoots +nomac:GarbageCollection:::GCMarkWithType +nostack:GarbageCollection:::GCMarkWithType nostack:GarbageCollection:::PinObjectAtGCTime nostack:GarbageCollection:::FinalizeObject nostack:GarbageCollection:::GCGenerationRange @@ -113,6 +115,11 @@ nostack:GarbageCollection:::GCBulkMovedObjectRanges nostack:GarbageCollection:::GCBulkRootCCW nostack:GarbageCollection:::GCBulkRCW nostack:GarbageCollection:::GCBulkRootStaticVar +nomac:GarbageCollection:::GCPerHeapHistory_V3 +nostack:GarbageCollection:::GCPerHeapHistory_V3 +nomac:GarbageCollection:::GCGlobalHeap_V2 +nostack:GarbageCollection:::GCGlobalHeap_V2 +nomac:GarbageCollection:::GCJoin_V2 ############# # Type events |