[remoting] If remoting is disabled, don't assert looking for LoadRemoteFieldNew ...

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

diff --git a/mono/profiler/proflog.h b/mono/profiler/proflog.h
index 548d86b5065448c0981f2d64fa1fbdb92e883795..ecb0e43b82334160ce788b255733b12902fce6ae 100644 (file)
--- a/mono/profiler/proflog.h
+++ b/mono/profiler/proflog.h
@@ -5,7 +5,7 @@
 #define LOG_HEADER_ID 0x4D505A01
 #define LOG_VERSION_MAJOR 0
 #define LOG_VERSION_MINOR 4
-#define LOG_DATA_VERSION 11
+#define LOG_DATA_VERSION 12
 /*
  * Changes in data versions:
  * version 2: added offsets in heap walk
@@ -26,6 +26,7 @@
                removed TYPE_LOAD_ERR flag (profiler never generated it, now removed from the format itself)
                added TYPE_GC_HANDLE_{CREATED,DESTROYED}_BT
                TYPE_JIT events are no longer guaranteed to have code start/size info (can be zero)
+ * version 12: added MONO_COUNTER_PROFILER
  */
 
 enum {
@@ -72,9 +73,11 @@ enum {
        TYPE_CLAUSE       = 1 << 4,
        TYPE_EXCEPTION_BT = 1 << 7,
        /* extended type for TYPE_ALLOC */
-       TYPE_ALLOC_BT  = 1 << 4,
+       TYPE_ALLOC_NO_BT  = 0 << 4,
+       TYPE_ALLOC_BT     = 1 << 4,
        /* extended type for TYPE_MONITOR */
-       TYPE_MONITOR_BT  = 1 << 7,
+       TYPE_MONITOR_NO_BT  = 0 << 7,
+       TYPE_MONITOR_BT     = 1 << 7,
        /* extended type for TYPE_SAMPLE */
        TYPE_SAMPLE_HIT           = 0 << 4,
        TYPE_SAMPLE_USYM          = 1 << 4,
@@ -91,6 +94,8 @@ enum {
        TYPE_END
 };
 
+// Sampling sources
+// Unless you have compiled with --enable-perf-events, only SAMPLE_CYCLES is available
 enum {
        SAMPLE_CYCLES = 1,
        SAMPLE_INSTRUCTIONS,