Merge pull request #5194 from xmcclure/orbis-freeswept

[mono.git] / mono / profiler / log.h

diff --git a/mono/profiler/log.h b/mono/profiler/log.h
index 41e294dc719673dcb03a451d7e9bbf5b753b96c9..d8182d90ee27dfc7d3b266e31124bd7f3dae2baa 100644 (file)
--- a/mono/profiler/log.h
+++ b/mono/profiler/log.h
@@ -69,6 +69,7 @@
                added an exception object field to TYPE_CLAUSE
                class unload events no longer exist (they were never emitted)
                removed type field from TYPE_SAMPLE_HIT
+               removed MONO_GC_EVENT_{MARK,RECLAIM}_{START,END}
  */
 
 /*
@@ -466,14 +467,14 @@ typedef enum {
 #define PROFLOG_GC_MOVE_EVENTS (1 << 4)
 #define PROFLOG_GC_ROOT_EVENTS (1 << 5)
 #define PROFLOG_GC_HANDLE_EVENTS (1 << 6)
-#define PROFLOG_FINALIZATION_EVENTS (1 << 7)
+#define PROFLOG_GC_FINALIZATION_EVENTS (1 << 7)
 #define PROFLOG_COUNTER_EVENTS (1 << 8)
 #define PROFLOG_SAMPLE_EVENTS (1 << 9)
 #define PROFLOG_JIT_EVENTS (1 << 10)
 
 #define PROFLOG_ALLOC_ALIAS (PROFLOG_GC_EVENTS | PROFLOG_GC_ALLOCATION_EVENTS | PROFLOG_GC_MOVE_EVENTS)
 #define PROFLOG_HEAPSHOT_ALIAS (PROFLOG_GC_EVENTS | PROFLOG_GC_ROOT_EVENTS)
-#define PROFLOG_LEGACY_ALIAS (PROFLOG_EXCEPTION_EVENTS | PROFLOG_MONITOR_EVENTS | PROFLOG_GC_EVENTS | PROFLOG_GC_MOVE_EVENTS | PROFLOG_GC_ROOT_EVENTS | PROFLOG_GC_HANDLE_EVENTS | PROFLOG_FINALIZATION_EVENTS | PROFLOG_COUNTER_EVENTS)
+#define PROFLOG_LEGACY_ALIAS (PROFLOG_EXCEPTION_EVENTS | PROFLOG_MONITOR_EVENTS | PROFLOG_GC_EVENTS | PROFLOG_GC_MOVE_EVENTS | PROFLOG_GC_ROOT_EVENTS | PROFLOG_GC_HANDLE_EVENTS | PROFLOG_GC_FINALIZATION_EVENTS | PROFLOG_COUNTER_EVENTS)
 
 typedef struct {
        //Events explicitly enabled