* - column: The column on the line
*/
#include <config.h>
-#include "mono-profiler-log.h"
+#include "log.h"
#include <string.h>
#include <assert.h>
#include <stdio.h>
#define HASH_SIZE 9371
#define SMALL_HASH_SIZE 31
-#if defined(__native_client__) || defined(__native_client_codegen__)
-volatile int __nacl_thread_suspension_needed = 0;
-void __nacl_suspend_thread_if_needed() {}
-#endif
-
static int debug = 0;
static int collect_traces = 0;
static int show_traces = 0;
uintptr_t i;
uintptr_t start_pos;
HeapObjectDesc **hash = hs->objects_hash;
+ if (hs->objects_hash_size == 0)
+ return -1;
start_pos = ((uintptr_t)objaddr >> 3) % hs->objects_hash_size;
i = start_pos;
do {
decode_uleb128 (p, &p); /* flags */
if (debug)
fprintf (outfile, "%s class %p (%s in %p) at %llu\n", load_str, (void*)(ptr_base + ptrdiff), p, (void*)(ptr_base + imptrdiff), (unsigned long long) time_base);
- if (subtype == TYPE_END_LOAD)
- add_class (ptr_base + ptrdiff, (char*)p);
+ add_class (ptr_base + ptrdiff, (char*)p);
while (*p) p++;
p++;
} else if (mtype == TYPE_IMAGE) {
while (*p) p++;
p++;
} else if (mtype == TYPE_ASSEMBLY) {
+ if (ctx->data_version > 13)
+ decode_sleb128 (p, &p); // image
if (ctx->data_version < 13)
decode_uleb128 (p, &p); /* flags */
if (debug)
break;
}
case TYPE_MONITOR: {
- int event = (*p >> 4) & 0x3;
int has_bt = *p & TYPE_MONITOR_BT;
+ int event;
+ if (ctx->data_version < 13)
+ event = (*p >> 4) & 0x3;
uint64_t tdiff = decode_uleb128 (p + 1, &p);
+ if (ctx->data_version > 13)
+ event = *p++;
intptr_t objdiff = decode_sleb128 (p, &p);
MethodDesc* sframes [8];
MethodDesc** frames = sframes;
record = (!thread_filter || thread_filter == thread->thread_id);
if (!(time_base >= time_from && time_base < time_to))
record = 0;
+ MonitorDesc *mdesc = lookup_monitor (OBJ_ADDR (objdiff));
if (event == MONO_PROFILER_MONITOR_CONTENTION) {
- MonitorDesc *mdesc = lookup_monitor (OBJ_ADDR (objdiff));
if (record) {
monitor_contention++;
mdesc->contentions++;
thread->monitor = mdesc;
thread->contention_start = time_base;
}
- if (has_bt) {
- num_bt = 8;
- frames = decode_bt (ctx, sframes, &num_bt, p, &p, ptr_base, &method_base);
- if (!frames) {
- fprintf (outfile, "Cannot load backtrace\n");
- return 0;
- }
- if (record)
- add_trace_methods (frames, num_bt, &mdesc->traces, 1);
- } else {
- if (record)
- add_trace_thread (thread, &mdesc->traces, 1);
- }
} else if (event == MONO_PROFILER_MONITOR_FAIL) {
if (record) {
monitor_failed++;
}
}
}
+ if (has_bt) {
+ num_bt = 8;
+ frames = decode_bt (ctx, sframes, &num_bt, p, &p, ptr_base, &method_base);
+ if (!frames) {
+ fprintf (outfile, "Cannot load backtrace\n");
+ return 0;
+ }
+ if (record && event == MONO_PROFILER_MONITOR_CONTENTION)
+ add_trace_methods (frames, num_bt, &mdesc->traces, 1);
+ } else {
+ if (record)
+ add_trace_thread (thread, &mdesc->traces, 1);
+ }
if (debug)
fprintf (outfile, "monitor %s for object %p\n", monitor_ev_name (event), (void*)OBJ_ADDR (objdiff));
if (frames != sframes)
int clause_num = decode_uleb128 (p, &p);
int64_t ptrdiff = decode_sleb128 (p, &p);
method_base += ptrdiff;
+ if (ctx->data_version > 13)
+ decode_uleb128 (p, &p); // exception object
if (record)
clause_summary [clause_type]++;
if (debug)
/* un unmanaged binary loaded in memory */
uint64_t tdiff = decode_uleb128 (p + 1, &p);
uintptr_t addr = decode_sleb128 (p, &p);
+ if (ctx->data_version > 13)
+ addr += ptr_base;
uint64_t offset G_GNUC_UNUSED = decode_uleb128 (p, &p);
uintptr_t size = decode_uleb128 (p, &p);
char *name;