X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fprofiler%2Fproflog.h;h=8fc22e432828e6c7692723d70088411ff3284fad;hb=6723d1e5cc970ec89c146ceb6f8895db96057919;hp=034a348effbf4297d0e7dee48b6cf37833b478ec;hpb=051ffdfbde88161199dd29a2db17fd181afb5e5a;p=mono.git diff --git a/mono/profiler/proflog.h b/mono/profiler/proflog.h index 034a348effb..8fc22e43282 100644 --- 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 6 +#define LOG_DATA_VERSION 11 /* * Changes in data versions: * version 2: added offsets in heap walk @@ -13,6 +13,18 @@ * version 4: added sample/statistical profiling * version 5: added counters sampling * version 6: added optional backtrace in sampling info + * version 8: added TYPE_RUNTIME and JIT helpers/trampolines + * version 9: added MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING + * version 10: added TYPE_COVERAGE + * version 11: added thread ID to TYPE_SAMPLE_HIT + added more load/unload events + unload for class + unload for image + load/unload for appdomain + load/unload for contexts + load/unload/name for assemblies + removed TYPE_LOAD_ERR flag (profiler never generated it, now removed from the format itself) + added TYPE_GC_HANDLE_{CREATED,DESTROYED}_BT */ enum { @@ -24,28 +36,31 @@ enum { TYPE_MONITOR, TYPE_HEAP, TYPE_SAMPLE, + TYPE_RUNTIME, + TYPE_COVERAGE, /* extended type for TYPE_HEAP */ TYPE_HEAP_START = 0 << 4, TYPE_HEAP_END = 1 << 4, TYPE_HEAP_OBJECT = 2 << 4, TYPE_HEAP_ROOT = 3 << 4, /* extended type for TYPE_METADATA */ - TYPE_START_LOAD = 1 << 4, TYPE_END_LOAD = 2 << 4, - TYPE_START_UNLOAD = 3 << 4, TYPE_END_UNLOAD = 4 << 4, - TYPE_LOAD_ERR = 1 << 7, + /* metadata type byte for TYPE_METADATA */ TYPE_CLASS = 1, TYPE_IMAGE = 2, TYPE_ASSEMBLY = 3, TYPE_DOMAIN = 4, TYPE_THREAD = 5, + TYPE_CONTEXT = 6, /* extended type for TYPE_GC */ TYPE_GC_EVENT = 1 << 4, TYPE_GC_RESIZE = 2 << 4, TYPE_GC_MOVE = 3 << 4, - TYPE_GC_HANDLE_CREATED = 4 << 4, - TYPE_GC_HANDLE_DESTROYED = 5 << 4, + TYPE_GC_HANDLE_CREATED = 4 << 4, + TYPE_GC_HANDLE_DESTROYED = 5 << 4, + TYPE_GC_HANDLE_CREATED_BT = 6 << 4, + TYPE_GC_HANDLE_DESTROYED_BT = 7 << 4, /* extended type for TYPE_METHOD */ TYPE_LEAVE = 1 << 4, TYPE_ENTER = 2 << 4, @@ -65,6 +80,13 @@ enum { TYPE_SAMPLE_UBIN = 2 << 4, TYPE_SAMPLE_COUNTERS_DESC = 3 << 4, TYPE_SAMPLE_COUNTERS = 4 << 4, + /* extended type for TYPE_RUNTIME */ + TYPE_JITHELPER = 1 << 4, + /* extended type for TYPE_COVERAGE */ + TYPE_COVERAGE_ASSEMBLY = 0 << 4, + TYPE_COVERAGE_METHOD = 1 << 4, + TYPE_COVERAGE_STATEMENT = 2 << 4, + TYPE_COVERAGE_CLASS = 3 << 4, TYPE_END }; @@ -79,4 +101,3 @@ enum { }; #endif /* __MONO_PROFLOG_H__ */ -