diff options
author | Andreas Strid <andreas_strid@bredband.net> | 2015-12-21 15:33:18 +0100 |
---|---|---|
committer | Andreas Strid <andreas_strid@bredband.net> | 2016-01-31 17:33:53 +0100 |
commit | 4c375f4ddfb1d35fd57d6f208e9de30350b4dbdd (patch) | |
tree | 2a4aaff0604b37f4bef68fbef46fe4afd7cbbb79 /src/gc | |
parent | 85f256e9b41cac20834d9695675e3ac8694454f9 (diff) | |
download | coreclr-4c375f4ddfb1d35fd57d6f208e9de30350b4dbdd.tar.gz coreclr-4c375f4ddfb1d35fd57d6f208e9de30350b4dbdd.tar.bz2 coreclr-4c375f4ddfb1d35fd57d6f208e9de30350b4dbdd.zip |
Enabling profiling on Unix/OS X.
Diffstat (limited to 'src/gc')
-rw-r--r-- | src/gc/gc.cpp | 2 | ||||
-rw-r--r-- | src/gc/gcee.cpp | 2 | ||||
-rw-r--r-- | src/gc/objecthandle.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index c91d2a6baf..014760aa93 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -23769,13 +23769,11 @@ void gc_heap::walk_plug (uint8_t* plug, size_t size, BOOL check_last_object_p, w STRESS_LOG_PLUG_MOVE(plug, (plug + size), -last_plug_relocation); -#ifdef FEATURE_EVENT_TRACE ETW::GCLog::MovedReference(plug, (plug + size), reloc, profiling_context, settings.compaction); -#endif if (check_last_object_p) { diff --git a/src/gc/gcee.cpp b/src/gc/gcee.cpp index 8e4e4480b4..a496979aeb 100644 --- a/src/gc/gcee.cpp +++ b/src/gc/gcee.cpp @@ -502,12 +502,14 @@ void GCProfileWalkHeapWorker(BOOL fProfilerPinned, BOOL fShouldWalkHeapRootsForE #endif //MULTIPLE_HEAPS } +#ifdef FEATURE_EVENT_TRACE // **** Done! Indicate to ETW helpers that the heap walk is done, so any buffers // should be flushed into the ETW stream if (fShouldWalkHeapObjectsForEtw || fShouldWalkHeapRootsForEtw) { ETW::GCLog::EndHeapDump(&profilerWalkHeapContext); } +#endif // FEATURE_EVENT_TRACE } } #endif // defined(GC_PROFILING) diff --git a/src/gc/objecthandle.cpp b/src/gc/objecthandle.cpp index 1654cf9b94..9aab7a103b 100644 --- a/src/gc/objecthandle.cpp +++ b/src/gc/objecthandle.cpp @@ -517,6 +517,7 @@ void CALLBACK ScanPointerForProfilerAndETW(_UNCHECKED_OBJECTREF *pObjRef, uintpt } #endif // GC_PROFILING +#if defined(FEATURE_EVENT_TRACE) // Notify ETW of the handle if (ETW::GCLog::ShouldWalkHeapRootsForEtw()) { @@ -535,6 +536,7 @@ void CALLBACK ScanPointerForProfilerAndETW(_UNCHECKED_OBJECTREF *pObjRef, uintpt 0, // dwGCFlags, rootFlags); // ETW handle flags } +#endif // defined(FEATURE_EVENT_TRACE) } #endif // defined(GC_PROFILING) || defined(FEATURE_EVENT_TRACE) |