#include <mono/utils/dtrace.h>
#include <mono/utils/mono-threads.h>
#include <mono/utils/mono-threads-coop.h>
+#include <mono/utils/unlocked.h>
#include "mini.h"
#include "seq-points.h"
#include "mini-llvm.h"
#include "lldb.h"
-MonoTraceSpec *mono_jit_trace_calls;
+MonoCallSpec *mono_jit_trace_calls;
MonoMethodDesc *mono_inject_async_exc_method;
int mono_inject_async_exc_pos;
MonoMethodDesc *mono_break_at_bb_method;
printf ("LAST: %s\n", mono_method_full_name (cfg->method, TRUE));
if (count > atoi (g_getenv ("COUNT3")))
slot = 0xffffff;
- else {
+ else
mono_print_ins (inst);
- }
}
#endif
}
}
+#if 0
{
static int count = 0;
count ++;
- /*
if (count == atoi (g_getenv ("COUNT")))
printf ("LAST: %s\n", mono_method_full_name (cfg->method, TRUE));
if (count > atoi (g_getenv ("COUNT")))
slot = 0xffffff;
- else {
+ else
mono_print_ins (inst);
- }
- */
}
+#endif
if (inst->flags & MONO_INST_LMF) {
/*
mono_arch_emit_epilog (cfg);
cfg->epilog_end = cfg->code_len;
}
+
+ if (bb->clause_hole)
+ mono_cfg_add_try_hole (cfg, bb->clause_hole, cfg->native_code + bb->native_offset, bb);
}
mono_arch_emit_exceptions (cfg);
MonoExceptionClause *ec = &header->clauses [i];
MonoJitExceptionInfo *ei = &jinfo->clauses [i];
MonoBasicBlock *tblock;
- MonoInst *exvar, *spvar;
+ MonoInst *exvar;
ei->flags = ec->flags;
if (G_UNLIKELY (cfg->verbose_level >= 4))
printf ("IL clause: try 0x%x-0x%x handler 0x%x-0x%x filter 0x%x\n", ec->try_offset, ec->try_offset + ec->try_len, ec->handler_offset, ec->handler_offset + ec->handler_len, ec->flags == MONO_EXCEPTION_CLAUSE_FILTER ? ec->data.filter_offset : 0);
- /*
- * The spvars are needed by mono_arch_install_handler_block_guard ().
- */
- if (ei->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
- int region;
-
- region = ((i + 1) << 8) | MONO_REGION_FINALLY | ec->flags;
- spvar = mono_find_spvar_for_region (cfg, region);
- g_assert (spvar);
- ei->exvar_offset = spvar->inst_offset;
- } else {
- exvar = mono_find_exvar_for_offset (cfg, ec->handler_offset);
- ei->exvar_offset = exvar ? exvar->inst_offset : 0;
- }
+ exvar = mono_find_exvar_for_offset (cfg, ec->handler_offset);
+ ei->exvar_offset = exvar ? exvar->inst_offset : 0;
if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
tblock = cfg->cil_offset_to_bb [ec->data.filter_offset];
MonoMethodSignature *sig;
MonoError err;
MonoCompile *cfg;
- int i, code_size_ratio;
+ int i;
gboolean try_generic_shared, try_llvm = FALSE;
MonoMethod *method_to_compile, *method_to_register;
gboolean method_is_gshared = FALSE;
if (opts & MONO_OPT_GSHARED) {
if (try_generic_shared)
- mono_stats.generics_sharable_methods++;
+ InterlockedIncrement (&mono_stats.generics_sharable_methods);
else if (mono_method_is_generic_impl (method))
- mono_stats.generics_unsharable_methods++;
+ InterlockedIncrement (&mono_stats.generics_unsharable_methods);
}
#ifdef ENABLE_LLVM
cfg->llvm_only = (flags & JIT_FLAG_LLVM_ONLY) != 0;
cfg->backend = current_backend;
-#ifdef PLATFORM_ANDROID
+#ifdef HOST_ANDROID
if (cfg->method->wrapper_type != MONO_WRAPPER_NONE) {
/* FIXME: Why is this needed */
cfg->gen_seq_points = FALSE;
}
#endif
+ cfg->prof_flags = mono_profiler_get_call_instrumentation_flags (cfg->method);
+
/* The debugger has no liveness information, so avoid sharing registers/stack slots */
- if (debug_options.mdb_optimizations) {
+ if (debug_options.mdb_optimizations || MONO_CFG_PROFILE_CALL_CONTEXT (cfg)) {
cfg->disable_reuse_registers = TRUE;
cfg->disable_reuse_stack_slots = TRUE;
/*
/* collect statistics */
#ifndef DISABLE_PERFCOUNTERS
- mono_perfcounters->jit_methods++;
- mono_perfcounters->jit_bytes += header->code_size;
+ InterlockedIncrement (&mono_perfcounters->jit_methods);
+ InterlockedAdd (&mono_perfcounters->jit_bytes, header->code_size);
#endif
- mono_jit_stats.allocated_code_size += cfg->code_len;
- code_size_ratio = cfg->code_len;
- if (code_size_ratio > mono_jit_stats.biggest_method_size && mono_jit_stats.enabled) {
- mono_jit_stats.biggest_method_size = code_size_ratio;
- g_free (mono_jit_stats.biggest_method);
- mono_jit_stats.biggest_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
- }
- code_size_ratio = (code_size_ratio * 100) / header->code_size;
- if (code_size_ratio > mono_jit_stats.max_code_size_ratio && mono_jit_stats.enabled) {
- mono_jit_stats.max_code_size_ratio = code_size_ratio;
- g_free (mono_jit_stats.max_ratio_method);
- mono_jit_stats.max_ratio_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
+ gint32 code_size_ratio = cfg->code_len;
+ InterlockedAdd (&mono_jit_stats.allocated_code_size, code_size_ratio);
+ InterlockedAdd (&mono_jit_stats.native_code_size, code_size_ratio);
+ /* FIXME: use an explicit function to read booleans */
+ if ((gboolean)InterlockedRead ((gint32*)&mono_jit_stats.enabled)) {
+ if (code_size_ratio > InterlockedRead (&mono_jit_stats.biggest_method_size)) {
+ InterlockedWrite (&mono_jit_stats.biggest_method_size, code_size_ratio);
+ char *biggest_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
+ biggest_method = InterlockedExchangePointer ((gpointer*)&mono_jit_stats.biggest_method, biggest_method);
+ g_free (biggest_method);
+ }
+ code_size_ratio = (code_size_ratio * 100) / header->code_size;
+ if (code_size_ratio > InterlockedRead (&mono_jit_stats.max_code_size_ratio)) {
+ InterlockedWrite (&mono_jit_stats.max_code_size_ratio, code_size_ratio);
+ char *max_ratio_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
+ max_ratio_method = InterlockedExchangePointer ((gpointer*)&mono_jit_stats.max_ratio_method, max_ratio_method);
+ g_free (max_ratio_method);
+ }
}
- mono_jit_stats.native_code_size += cfg->code_len;
if (MONO_METHOD_COMPILE_END_ENABLED ())
MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
return g_timer_new ();
}
-void mono_time_track_end (double *time, GTimer *timer)
+/*
+ * mono_time_track_end:
+ *
+ * Uses UnlockedAddDouble () to update \param time.
+ */
+void mono_time_track_end (gdouble *time, GTimer *timer)
{
g_timer_stop (timer);
- *time += g_timer_elapsed (timer, NULL);
+ UnlockedAddDouble (time, g_timer_elapsed (timer, NULL));
g_timer_destroy (timer);
}
-void mono_update_jit_stats (MonoCompile *cfg)
+/*
+ * mono_update_jit_stats:
+ *
+ * Only call this function in locked environments to avoid data races.
+ */
+MONO_NO_SANITIZE_THREAD
+void
+mono_update_jit_stats (MonoCompile *cfg)
{
mono_jit_stats.allocate_var += cfg->stat_allocate_var;
mono_jit_stats.locals_stack_size += cfg->stat_locals_stack_size;
jit_timer = mono_time_track_start ();
cfg = mini_method_compile (method, opt, target_domain, JIT_FLAG_RUN_CCTORS, 0, -1);
- double jit_time = 0.0;
+ gdouble jit_time = 0.0;
mono_time_track_end (&jit_time, jit_timer);
- mono_jit_stats.jit_time += jit_time;
+ UnlockedAddDouble (&mono_jit_stats.jit_time, jit_time);
prof_method = cfg->method;
code = cfg->native_code;
if (cfg->gshared && mono_method_is_generic_sharable (method, FALSE))
- mono_stats.generics_shared_methods++;
+ InterlockedIncrement (&mono_stats.generics_shared_methods);
if (cfg->gsharedvt)
- mono_stats.gsharedvt_methods++;
+ InterlockedIncrement (&mono_stats.gsharedvt_methods);
}
jinfo = cfg->jit_info;
projects / mono.git / blobdiff