static int do_debug = 0;
static int do_coverage = 0;
static gboolean no_counters = FALSE;
-static gboolean only_coverage = FALSE;
static gboolean debug_coverage = FALSE;
static int max_allocated_sample_hits;
code_buffers_ctr,
exception_throws_ctr,
exception_clauses_ctr,
- monitor_contentions_ctr,
- monitor_acquisitions_ctr,
- monitor_failures_ctr,
+ monitor_events_ctr,
thread_starts_ctr,
thread_ends_ctr,
thread_names_ctr,
*
* type alloc format:
* type: TYPE_ALLOC
- * exinfo: flags: TYPE_ALLOC_BT
+ * exinfo: zero or TYPE_ALLOC_BT
* [ptr: sleb128] class as a byte difference from ptr_base
* [obj: sleb128] object address as a byte difference from obj_base
* [size: uleb128] size of the object in the heap
- * If the TYPE_ALLOC_BT flag is set, a backtrace follows.
+ * If exinfo == TYPE_ALLOC_BT, a backtrace follows.
*
* type GC format:
* type: TYPE_GC
* num is always an even number: the even items are the old
* addresses, the odd numbers are the respective new object addresses
* if exinfo == TYPE_GC_HANDLE_CREATED[_BT]
- * [handle_type: uleb128] GC handle type (System.Runtime.InteropServices.GCHandleType)
+ * [handle_type: uleb128] MonoGCHandleType enum value
* upper bits reserved as flags
* [handle: uleb128] GC handle value
* [objaddr: sleb128] object pointer differences from obj_base
* If exinfo == TYPE_GC_HANDLE_CREATED_BT, a backtrace follows.
* if exinfo == TYPE_GC_HANDLE_DESTROYED[_BT]
- * [handle_type: uleb128] GC handle type (System.Runtime.InteropServices.GCHandleType)
+ * [handle_type: uleb128] MonoGCHandleType enum value
* upper bits reserved as flags
* [handle: uleb128] GC handle value
* If exinfo == TYPE_GC_HANDLE_DESTROYED_BT, a backtrace follows.
*
* type metadata format:
* type: TYPE_METADATA
- * exinfo: one of: TYPE_END_LOAD, TYPE_END_UNLOAD (optional for TYPE_THREAD and TYPE_DOMAIN)
+ * exinfo: one of: TYPE_END_LOAD, TYPE_END_UNLOAD (optional for TYPE_THREAD and TYPE_DOMAIN,
+ * doesn't occur for TYPE_CLASS)
* [mtype: byte] metadata type, one of: TYPE_CLASS, TYPE_IMAGE, TYPE_ASSEMBLY, TYPE_DOMAIN,
* TYPE_THREAD, TYPE_CONTEXT
* [pointer: sleb128] pointer of the metadata type depending on mtype
* if mtype == TYPE_IMAGE
* [name: string] image file name
* if mtype == TYPE_ASSEMBLY
+ * [image: sleb128] MonoImage* as a pointer difference from ptr_base
* [name: string] assembly name
* if mtype == TYPE_DOMAIN && exinfo == 0
* [name: string] domain friendly name
*
* type exception format:
* type: TYPE_EXCEPTION
- * exinfo: TYPE_THROW_BT flag or one of: TYPE_CLAUSE
+ * exinfo: zero, TYPE_CLAUSE, or TYPE_THROW_BT
* if exinfo == TYPE_CLAUSE
* [clause type: byte] MonoExceptionEnum enum value
* [clause index: uleb128] index of the current clause
* [method: sleb128] MonoMethod* as a pointer difference from the last such
* pointer or the buffer method_base
+ * [object: sleb128] the exception object as a difference from obj_base
* else
* [object: sleb128] the exception object as a difference from obj_base
- * if exinfo has TYPE_THROW_BT set, a backtrace follows.
+ * If exinfo == TYPE_THROW_BT, a backtrace follows.
*
* type runtime format:
* type: TYPE_RUNTIME
*
* type monitor format:
* type: TYPE_MONITOR
- * exinfo: TYPE_MONITOR_BT flag and one of: MONO_PROFILER_MONITOR_(CONTENTION|FAIL|DONE)
+ * exinfo: zero or TYPE_MONITOR_BT
+ * [type: byte] MonoProfilerMonitorEvent enum value
* [object: sleb128] the lock object as a difference from obj_base
- * if exinfo.low3bits == MONO_PROFILER_MONITOR_CONTENTION
- * If the TYPE_MONITOR_BT flag is set, a backtrace follows.
+ * If exinfo == TYPE_MONITOR_BT, a backtrace follows.
*
* type heap format
* type: TYPE_HEAP
* [size: uleb128] symbol size (may be 0 if unknown)
* [name: string] symbol name
* if exinfo == TYPE_SAMPLE_UBIN
- * [address: sleb128] address where binary has been loaded
+ * [address: sleb128] address where binary has been loaded as a difference from ptr_base
* [offset: uleb128] file offset of mapping (the same file can be mapped multiple times)
* [size: uleb128] memory size
* [name: string] binary name
* [type: byte] type of counter value
* if type == string:
* if value == null:
- * [0: uleb128] 0 -> value is null
+ * [0: byte] 0 -> value is null
* else:
- * [1: uleb128] 1 -> value is not null
+ * [1: byte] 1 -> value is not null
* [value: string] counter value
* else:
* [value: uleb128/sleb128/double] counter value, can be sleb128, uleb128 or double (determined by using type)
// Has this thread written a thread end event to `buffer`?
gboolean ended;
+
+ // Stored in `buffer_lock_state` to take the exclusive lock.
+ int small_id;
} MonoProfilerThread;
+// Do not use these TLS macros directly unless you know what you're doing.
+
+#ifdef HOST_WIN32
+
+#define PROF_TLS_SET(VAL) (TlsSetValue (profiler_tls, (VAL)))
+#define PROF_TLS_GET() ((MonoProfilerThread *) TlsGetValue (profiler_tls))
+#define PROF_TLS_INIT() (profiler_tls = TlsAlloc ())
+#define PROF_TLS_FREE() (TlsFree (profiler_tls))
+
+static DWORD profiler_tls;
+
+#elif HAVE_KW_THREAD
+
+#define PROF_TLS_SET(VAL) (profiler_tls = (VAL))
+#define PROF_TLS_GET() (profiler_tls)
+#define PROF_TLS_INIT()
+#define PROF_TLS_FREE()
+
+static __thread MonoProfilerThread *profiler_tls;
+
+#else
+
+#define PROF_TLS_SET(VAL) (pthread_setspecific (profiler_tls, (VAL)))
+#define PROF_TLS_GET() ((MonoProfilerThread *) pthread_getspecific (profiler_tls))
+#define PROF_TLS_INIT() (pthread_key_create (&profiler_tls, NULL))
+#define PROF_TLS_FREE() (pthread_key_delete (profiler_tls))
+
+static pthread_key_t profiler_tls;
+
+#endif
+
static uintptr_t
thread_id (void)
{
}
/*
- * These macros should be used when writing an event to a log buffer. They take
- * care of a bunch of stuff that can be repetitive and error-prone, such as
- * acquiring/releasing the buffer lock, incrementing the event counter,
- * expanding the log buffer, processing requests, etc. They also create a scope
- * so that it's harder to leak the LogBuffer pointer, which can be problematic
- * as the pointer is unstable when the buffer lock isn't acquired.
+ * These macros should be used when writing an event to a log buffer. They
+ * take care of a bunch of stuff that can be repetitive and error-prone, such
+ * as attaching the current thread, acquiring/releasing the buffer lock,
+ * incrementing the event counter, expanding the log buffer, etc. They also
+ * create a scope so that it's harder to leak the LogBuffer pointer, which can
+ * be problematic as the pointer is unstable when the buffer lock isn't
+ * acquired.
+ *
+ * If the calling thread is already attached, these macros will not alter its
+ * attach mode (i.e. whether it's added to the LLS). If the thread is not
+ * attached, init_thread () will be called with add_to_lls = TRUE.
*/
#define ENTER_LOG(COUNTER, BUFFER, SIZE) \
do { \
- MonoProfilerThread *thread__ = PROF_TLS_GET (); \
+ MonoProfilerThread *thread__ = get_thread (); \
if (thread__->attached) \
buffer_lock (); \
g_assert (!thread__->busy && "Why are we trying to write a new event while already writing one?"); \
InterlockedIncrement ((COUNTER)); \
LogBuffer *BUFFER = ensure_logbuf_unsafe (thread__, (SIZE))
-#define EXIT_LOG_EXPLICIT(SEND, REQUESTS) \
+#define EXIT_LOG_EXPLICIT(SEND) \
thread__->busy = FALSE; \
if ((SEND)) \
send_log_unsafe (TRUE); \
if (thread__->attached) \
buffer_unlock (); \
- if ((REQUESTS)) \
- process_requests (); \
} while (0)
// Pass these to EXIT_LOG_EXPLICIT () for easier reading.
#define DO_SEND TRUE
#define NO_SEND FALSE
-#define DO_REQUESTS TRUE
-#define NO_REQUESTS FALSE
-
-#define EXIT_LOG EXIT_LOG_EXPLICIT (DO_SEND, DO_REQUESTS)
-
-static volatile gint32 buffer_rwlock_count;
-static volatile gpointer buffer_rwlock_exclusive;
-
-// Can be used recursively.
-static void
-buffer_lock (void)
-{
- /*
- * If the thread holding the exclusive lock tries to modify the
- * reader count, just make it a no-op. This way, we also avoid
- * invoking the GC safe point macros below, which could break if
- * done from a thread that is currently the initiator of STW.
- *
- * In other words, we rely on the fact that the GC thread takes
- * the exclusive lock in the gc_event () callback when the world
- * is about to stop.
- */
- if (InterlockedReadPointer (&buffer_rwlock_exclusive) != (gpointer) thread_id ()) {
- MONO_ENTER_GC_SAFE;
-
- while (InterlockedReadPointer (&buffer_rwlock_exclusive))
- mono_thread_info_yield ();
- InterlockedIncrement (&buffer_rwlock_count);
-
- MONO_EXIT_GC_SAFE;
- }
-
- mono_memory_barrier ();
-}
-
-static void
-buffer_unlock (void)
-{
- mono_memory_barrier ();
-
- // See the comment in buffer_lock ().
- if (InterlockedReadPointer (&buffer_rwlock_exclusive) == (gpointer) thread_id ())
- return;
-
- g_assert (InterlockedRead (&buffer_rwlock_count) && "Why are we trying to decrement a zero reader count?");
-
- InterlockedDecrement (&buffer_rwlock_count);
-}
-
-// Cannot be used recursively.
-static void
-buffer_lock_excl (void)
-{
- gpointer tid = (gpointer) thread_id ();
-
- g_assert (InterlockedReadPointer (&buffer_rwlock_exclusive) != tid && "Why are we taking the exclusive lock twice?");
-
- MONO_ENTER_GC_SAFE;
-
- while (InterlockedCompareExchangePointer (&buffer_rwlock_exclusive, tid, 0))
- mono_thread_info_yield ();
-
- while (InterlockedRead (&buffer_rwlock_count))
- mono_thread_info_yield ();
-
- MONO_EXIT_GC_SAFE;
-
- mono_memory_barrier ();
-}
-
-static void
-buffer_unlock_excl (void)
-{
- mono_memory_barrier ();
-
- g_assert (InterlockedReadPointer (&buffer_rwlock_exclusive) && "Why is the exclusive lock not held?");
- g_assert (InterlockedReadPointer (&buffer_rwlock_exclusive) == (gpointer) thread_id () && "Why does another thread hold the exclusive lock?");
- g_assert (!InterlockedRead (&buffer_rwlock_count) && "Why are there readers when the exclusive lock is held?");
-
- InterlockedWritePointer (&buffer_rwlock_exclusive, NULL);
-}
+#define EXIT_LOG EXIT_LOG_EXPLICIT (DO_SEND)
typedef struct _BinaryObject BinaryObject;
struct _BinaryObject {
char *name;
};
+static MonoProfiler *log_profiler;
+
struct _MonoProfiler {
+ MonoProfilerHandle handle;
FILE* file;
#if defined (HAVE_SYS_ZLIB)
gzFile gzfile;
uint64_t time;
} MethodInfo;
-#ifdef HOST_WIN32
-
-#define PROF_TLS_SET(VAL) (TlsSetValue (profiler_tls, (VAL)))
-#define PROF_TLS_GET() ((MonoProfilerThread *) TlsGetValue (profiler_tls))
-#define PROF_TLS_INIT() (profiler_tls = TlsAlloc ())
-#define PROF_TLS_FREE() (TlsFree (profiler_tls))
-
-static DWORD profiler_tls;
-
-#elif HAVE_KW_THREAD
-
-#define PROF_TLS_SET(VAL) (profiler_tls = (VAL))
-#define PROF_TLS_GET() (profiler_tls)
-#define PROF_TLS_INIT()
-#define PROF_TLS_FREE()
-
-static __thread MonoProfilerThread *profiler_tls;
-
-#else
-
-#define PROF_TLS_SET(VAL) (pthread_setspecific (profiler_tls, (VAL)))
-#define PROF_TLS_GET() ((MonoProfilerThread *) pthread_getspecific (profiler_tls))
-#define PROF_TLS_INIT() (pthread_key_create (&profiler_tls, NULL))
-#define PROF_TLS_FREE() (pthread_key_delete (profiler_tls))
-
-static pthread_key_t profiler_tls;
-
-#endif
-
static char*
pstrdup (const char *s)
{
}
static LogBuffer*
-create_buffer (uintptr_t tid)
+create_buffer (uintptr_t tid, int bytes)
{
- LogBuffer* buf = (LogBuffer *) alloc_buffer (BUFFER_SIZE);
+ LogBuffer* buf = (LogBuffer *) alloc_buffer (MAX (BUFFER_SIZE, bytes));
InterlockedIncrement (&buffer_allocations_ctr);
static void
init_buffer_state (MonoProfilerThread *thread)
{
- thread->buffer = create_buffer (thread->node.key);
+ thread->buffer = create_buffer (thread->node.key, 0);
thread->methods = NULL;
}
init_buffer_state (thread);
+ thread->small_id = mono_thread_info_register_small_id ();
+
/*
* Some internal profiler threads don't need to be cleaned up
* by the main thread on shutdown.
PROF_TLS_SET (NULL);
}
+static MonoProfilerThread *
+get_thread (void)
+{
+ return init_thread (log_profiler, TRUE);
+}
+
// Only valid if init_thread () was called with add_to_lls = FALSE.
static LogBuffer *
ensure_logbuf_unsafe (MonoProfilerThread *thread, int bytes)
{
LogBuffer *old = thread->buffer;
- if (old && old->cursor + bytes + 100 < old->buf_end)
+ if (old->cursor + bytes < old->buf_end)
return old;
- LogBuffer *new_ = create_buffer (thread->node.key);
+ LogBuffer *new_ = create_buffer (thread->node.key, bytes);
new_->next = old;
thread->buffer = new_;
return new_;
}
+/*
+ * This is a reader/writer spin lock of sorts used to protect log buffers.
+ * When a thread modifies its own log buffer, it increments the reader
+ * count. When a thread wants to access log buffers of other threads, it
+ * takes the exclusive lock.
+ *
+ * `buffer_lock_state` holds the reader count in its lower 16 bits, and
+ * the small ID of the thread currently holding the exclusive (writer)
+ * lock in its upper 16 bits. Both can be zero. It's important that the
+ * whole lock state is a single word that can be read/written atomically
+ * to avoid race conditions where there could end up being readers while
+ * the writer lock is held.
+ *
+ * The lock is writer-biased. When a thread wants to take the exclusive
+ * lock, it increments `buffer_lock_exclusive_intent` which will make new
+ * readers spin until it's back to zero, then takes the exclusive lock
+ * once the reader count has reached zero. After releasing the exclusive
+ * lock, it decrements `buffer_lock_exclusive_intent`, which, when it
+ * reaches zero again, allows readers to increment the reader count.
+ *
+ * The writer bias is necessary because we take the exclusive lock in
+ * `gc_event ()` during STW. If the writer bias was not there, and a
+ * program had a large number of threads, STW-induced pauses could be
+ * significantly longer than they have to be. Also, we emit periodic
+ * sync points from the helper thread, which requires taking the
+ * exclusive lock, and we need those to arrive with a reasonably
+ * consistent frequency so that readers don't have to queue up too many
+ * events between sync points.
+ *
+ * The lock does not support recursion.
+ */
+static volatile gint32 buffer_lock_state;
+static volatile gint32 buffer_lock_exclusive_intent;
+
+static void
+buffer_lock (void)
+{
+ /*
+ * If the thread holding the exclusive lock tries to modify the
+ * reader count, just make it a no-op. This way, we also avoid
+ * invoking the GC safe point macros below, which could break if
+ * done from a thread that is currently the initiator of STW.
+ *
+ * In other words, we rely on the fact that the GC thread takes
+ * the exclusive lock in the gc_event () callback when the world
+ * is about to stop.
+ */
+ if (InterlockedRead (&buffer_lock_state) != get_thread ()->small_id << 16) {
+ MONO_ENTER_GC_SAFE;
+
+ gint32 old, new_;
+
+ do {
+ restart:
+ // Hold off if a thread wants to take the exclusive lock.
+ while (InterlockedRead (&buffer_lock_exclusive_intent))
+ mono_thread_info_yield ();
+
+ old = InterlockedRead (&buffer_lock_state);
+
+ // Is a thread holding the exclusive lock?
+ if (old >> 16) {
+ mono_thread_info_yield ();
+ goto restart;
+ }
+
+ new_ = old + 1;
+ } while (InterlockedCompareExchange (&buffer_lock_state, new_, old) != old);
+
+ MONO_EXIT_GC_SAFE;
+ }
+
+ mono_memory_barrier ();
+}
+
+static void
+buffer_unlock (void)
+{
+ mono_memory_barrier ();
+
+ gint32 state = InterlockedRead (&buffer_lock_state);
+
+ // See the comment in buffer_lock ().
+ if (state == PROF_TLS_GET ()->small_id << 16)
+ return;
+
+ g_assert (state && "Why are we decrementing a zero reader count?");
+ g_assert (!(state >> 16) && "Why is the exclusive lock held?");
+
+ InterlockedDecrement (&buffer_lock_state);
+}
+
+static void
+buffer_lock_excl (void)
+{
+ gint32 new_ = get_thread ()->small_id << 16;
+
+ g_assert (InterlockedRead (&buffer_lock_state) != new_ && "Why are we taking the exclusive lock twice?");
+
+ InterlockedIncrement (&buffer_lock_exclusive_intent);
+
+ MONO_ENTER_GC_SAFE;
+
+ while (InterlockedCompareExchange (&buffer_lock_state, new_, 0))
+ mono_thread_info_yield ();
+
+ MONO_EXIT_GC_SAFE;
+
+ mono_memory_barrier ();
+}
+
+static void
+buffer_unlock_excl (void)
+{
+ mono_memory_barrier ();
+
+ gint32 state = InterlockedRead (&buffer_lock_state);
+ gint32 excl = state >> 16;
+
+ g_assert (excl && "Why is the exclusive lock not held?");
+ g_assert (excl == PROF_TLS_GET ()->small_id && "Why does another thread hold the exclusive lock?");
+ g_assert (!(state & 0xFFFF) && "Why are there readers when the exclusive lock is held?");
+
+ InterlockedWrite (&buffer_lock_state, 0);
+ InterlockedDecrement (&buffer_lock_exclusive_intent);
+}
+
static void
encode_uleb128 (uint64_t value, uint8_t *buf, uint8_t **endbuf)
{
}
static void
-emit_ptr (LogBuffer *logbuffer, void *ptr)
+emit_ptr (LogBuffer *logbuffer, const void *ptr)
{
if (!logbuffer->ptr_base)
logbuffer->ptr_base = (uintptr_t) ptr;
g_assert (logbuffer->cursor <= logbuffer->buf_end && "Why are we writing past the buffer end?");
}
+// The reader lock must be held.
static void
register_method_local (MonoMethod *method, MonoJitInfo *ji)
{
- MonoProfilerThread *thread = PROF_TLS_GET ();
+ MonoProfilerThread *thread = get_thread ();
if (!mono_conc_hashtable_lookup (thread->profiler->method_table, method)) {
MethodInfo *info = (MethodInfo *) g_malloc (sizeof (MethodInfo));
dump_buffer (profiler, buf);
}
-static void
-process_requests (void)
-{
- if (heapshot_requested)
- mono_gc_collect (mono_gc_max_generation ());
-}
-
// Only valid if init_thread () was called with add_to_lls = FALSE.
static void
send_log_unsafe (gboolean if_needed)
static void
sync_point_flush (void)
{
- g_assert (InterlockedReadPointer (&buffer_rwlock_exclusive) == (gpointer) thread_id () && "Why don't we hold the exclusive lock?");
+ g_assert (InterlockedRead (&buffer_lock_state) == PROF_TLS_GET ()->small_id << 16 && "Why don't we hold the exclusive lock?");
MONO_LLS_FOREACH_SAFE (&profiler_thread_list, MonoProfilerThread, thread) {
g_assert (thread->attached && "Why is a thread in the LLS not attached?");
static void
sync_point_mark (MonoProfilerSyncPointType type)
{
- g_assert (InterlockedReadPointer (&buffer_rwlock_exclusive) == (gpointer) thread_id () && "Why don't we hold the exclusive lock?");
+ g_assert (InterlockedRead (&buffer_lock_state) == PROF_TLS_GET ()->small_id << 16 && "Why don't we hold the exclusive lock?");
ENTER_LOG (&sync_points_ctr, logbuffer,
EVENT_SIZE /* event */ +
emit_event (logbuffer, TYPE_META | TYPE_SYNC_POINT);
emit_byte (logbuffer, type);
- EXIT_LOG_EXPLICIT (NO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (NO_SEND);
send_log_unsafe (FALSE);
}
emit_obj (logbuffer, refs [i]);
}
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
return 0;
}
static unsigned int gc_count = 0;
static uint64_t last_hs_time = 0;
static gboolean do_heap_walk = FALSE;
+static gboolean ignore_heap_events;
static void
-heap_walk (MonoProfiler *profiler)
+gc_roots (MonoProfiler *prof, MonoObject *const *objects, const MonoProfilerGCRootType *root_types, const uintptr_t *extra_info, uint64_t num)
{
- ENTER_LOG (&heap_starts_ctr, logbuffer,
- EVENT_SIZE /* event */
- );
-
- emit_event (logbuffer, TYPE_HEAP_START | TYPE_HEAP);
-
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
-
- mono_gc_walk_heap (0, gc_reference, NULL);
-
- ENTER_LOG (&heap_ends_ctr, logbuffer,
- EVENT_SIZE /* event */
- );
-
- emit_event (logbuffer, TYPE_HEAP_END | TYPE_HEAP);
-
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
-}
+ if (ignore_heap_events)
+ return;
-static void
-gc_roots (MonoProfiler *prof, int num, void **objects, int *root_types, uintptr_t *extra_info)
-{
ENTER_LOG (&heap_roots_ctr, logbuffer,
EVENT_SIZE /* event */ +
LEB128_SIZE /* num */ +
emit_value (logbuffer, extra_info [i]);
}
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
+
static void
-gc_event (MonoProfiler *profiler, MonoGCEvent ev, int generation)
+trigger_on_demand_heapshot (void)
{
- ENTER_LOG (&gc_events_ctr, logbuffer,
- EVENT_SIZE /* event */ +
- BYTE_SIZE /* gc event */ +
- BYTE_SIZE /* generation */
- );
-
- if (ENABLED (PROFLOG_GC_EVENTS)) {
- emit_event (logbuffer, TYPE_GC_EVENT | TYPE_GC);
- emit_byte (logbuffer, ev);
- emit_byte (logbuffer, generation);
- }
-
- EXIT_LOG_EXPLICIT (NO_SEND, NO_REQUESTS);
+ if (heapshot_requested)
+ mono_gc_collect (mono_gc_max_generation ());
+}
- switch (ev) {
- case MONO_GC_EVENT_START:
- if (generation == mono_gc_max_generation ())
- gc_count++;
+#define ALL_GC_EVENTS_MASK (PROFLOG_GC_MOVES_EVENTS | PROFLOG_GC_ROOT_EVENTS | PROFLOG_GC_EVENTS | PROFLOG_HEAPSHOT_FEATURE)
+static void
+gc_event (MonoProfiler *profiler, MonoProfilerGCEvent ev, uint32_t generation)
+{
+ if (ev == MONO_GC_EVENT_START) {
uint64_t now = current_time ();
if (hs_mode_ms && (now - last_hs_time) / 1000 * 1000 >= hs_mode_ms)
do_heap_walk = heapshot_requested;
else if (!hs_mode_ms && !hs_mode_gc && generation == mono_gc_max_generation ())
do_heap_walk = TRUE;
+
+ //If using heapshot, ignore events for collections we don't care
+ if (ENABLED (PROFLOG_HEAPSHOT_FEATURE)) {
+ // Ignore events generated during the collection itself (IE GC ROOTS)
+ ignore_heap_events = !do_heap_walk;
+ }
+ }
+
+
+ if (ENABLED (PROFLOG_GC_EVENTS)) {
+ ENTER_LOG (&gc_events_ctr, logbuffer,
+ EVENT_SIZE /* event */ +
+ BYTE_SIZE /* gc event */ +
+ BYTE_SIZE /* generation */
+ );
+
+ emit_event (logbuffer, TYPE_GC_EVENT | TYPE_GC);
+ emit_byte (logbuffer, ev);
+ emit_byte (logbuffer, generation);
+
+ EXIT_LOG_EXPLICIT (NO_SEND);
+ }
+
+ switch (ev) {
+ case MONO_GC_EVENT_START:
+ if (generation == mono_gc_max_generation ())
+ gc_count++;
+
break;
case MONO_GC_EVENT_PRE_STOP_WORLD_LOCKED:
/*
* committed to the log file before any object move events
* that will be produced during this GC.
*/
- sync_point (SYNC_POINT_WORLD_STOP);
+ if (ENABLED (ALL_GC_EVENTS_MASK))
+ sync_point (SYNC_POINT_WORLD_STOP);
+
+ /*
+ * All heap events are surrounded by a HEAP_START and a HEAP_ENV event.
+ * Right now, that's the case for GC Moves, GC Roots or heapshots.
+ */
+ if (ENABLED (PROFLOG_GC_MOVES_EVENTS | PROFLOG_GC_ROOT_EVENTS) || do_heap_walk) {
+ ENTER_LOG (&heap_starts_ctr, logbuffer,
+ EVENT_SIZE /* event */
+ );
+
+ emit_event (logbuffer, TYPE_HEAP_START | TYPE_HEAP);
+
+ EXIT_LOG_EXPLICIT (DO_SEND);
+ }
+
break;
case MONO_GC_EVENT_PRE_START_WORLD:
- if (do_heap_shot && do_heap_walk) {
- heap_walk (profiler);
+ if (do_heap_shot && do_heap_walk)
+ mono_gc_walk_heap (0, gc_reference, NULL);
+
+ /* Matching HEAP_END to the HEAP_START from above */
+ if (ENABLED (PROFLOG_GC_MOVES_EVENTS | PROFLOG_GC_ROOT_EVENTS) || do_heap_walk) {
+ ENTER_LOG (&heap_ends_ctr, logbuffer,
+ EVENT_SIZE /* event */
+ );
+
+ emit_event (logbuffer, TYPE_HEAP_END | TYPE_HEAP);
+ EXIT_LOG_EXPLICIT (DO_SEND);
+ }
+
+ if (do_heap_shot && do_heap_walk) {
do_heap_walk = FALSE;
heapshot_requested = 0;
last_hs_time = current_time ();
}
- break;
- case MONO_GC_EVENT_POST_START_WORLD_UNLOCKED:
+
/*
* Similarly, we must now make sure that any object moves
* written to the GC thread's buffer are flushed. Otherwise,
* object allocation events for certain addresses could come
* after the move events that made those addresses available.
*/
- sync_point_mark (SYNC_POINT_WORLD_START);
-
+ if (ENABLED (ALL_GC_EVENTS_MASK))
+ sync_point_mark (SYNC_POINT_WORLD_START);
+ break;
+ case MONO_GC_EVENT_POST_START_WORLD_UNLOCKED:
/*
* Finally, it is safe to allow other threads to write to
* their buffers again.
}
static void
-gc_resize (MonoProfiler *profiler, int64_t new_size)
+gc_resize (MonoProfiler *profiler, uintptr_t new_size)
{
ENTER_LOG (&gc_resizes_ctr, logbuffer,
EVENT_SIZE /* event */ +
emit_event (logbuffer, TYPE_GC_RESIZE | TYPE_GC);
emit_value (logbuffer, new_size);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
typedef struct {
static void
emit_bt (MonoProfiler *prof, LogBuffer *logbuffer, FrameData *data)
{
- /* FIXME: this is actually tons of data and we should
- * just output it the first time and use an id the next
- */
if (data->count > num_frames)
printf ("bad num frames: %d\n", data->count);
+
emit_value (logbuffer, data->count);
- //if (*p != data.count) {
- // printf ("bad num frames enc at %d: %d -> %d\n", count, data.count, *p); printf ("frames end: %p->%p\n", p, logbuffer->cursor); exit(0);}
- while (data->count) {
+
+ while (data->count)
emit_method (logbuffer, data->methods [--data->count]);
- }
}
static void
-gc_alloc (MonoProfiler *prof, MonoObject *obj, MonoClass *klass)
+gc_alloc (MonoProfiler *prof, MonoObject *obj)
{
- init_thread (prof, TRUE);
-
int do_bt = (nocalls && InterlockedRead (&runtime_inited) && !notraces) ? TYPE_ALLOC_BT : 0;
FrameData data;
uintptr_t len = mono_object_get_size (obj);
);
emit_event (logbuffer, do_bt | TYPE_ALLOC);
- emit_ptr (logbuffer, klass);
+ emit_ptr (logbuffer, mono_object_get_class (obj));
emit_obj (logbuffer, obj);
emit_value (logbuffer, len);
}
static void
-gc_moves (MonoProfiler *prof, void **objects, int num)
+gc_moves (MonoProfiler *prof, MonoObject *const *objects, uint64_t num)
{
ENTER_LOG (&gc_moves_ctr, logbuffer,
EVENT_SIZE /* event */ +
for (int i = 0; i < num; ++i)
emit_obj (logbuffer, objects [i]);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
static void
-gc_handle (MonoProfiler *prof, int op, int type, uintptr_t handle, MonoObject *obj)
+gc_handle (MonoProfiler *prof, int op, MonoGCHandleType type, uint32_t handle, MonoObject *obj)
{
int do_bt = nocalls && InterlockedRead (&runtime_inited) && !notraces;
FrameData data;
EXIT_LOG;
}
+static void
+gc_handle_created (MonoProfiler *prof, uint32_t handle, MonoGCHandleType type, MonoObject *obj)
+{
+ gc_handle (prof, MONO_PROFILER_GC_HANDLE_CREATED, type, handle, obj);
+}
+
+static void
+gc_handle_deleted (MonoProfiler *prof, uint32_t handle, MonoGCHandleType type)
+{
+ gc_handle (prof, MONO_PROFILER_GC_HANDLE_DESTROYED, type, handle, NULL);
+}
+
static void
finalize_begin (MonoProfiler *prof)
{
static void
finalize_end (MonoProfiler *prof)
{
- ENTER_LOG (&finalize_ends_ctr, buf,
- EVENT_SIZE /* event */
- );
+ trigger_on_demand_heapshot ();
+ if (ENABLED (PROFLOG_FINALIZATION_EVENTS)) {
+ ENTER_LOG (&finalize_ends_ctr, buf,
+ EVENT_SIZE /* event */
+ );
- emit_event (buf, TYPE_GC_FINALIZE_END | TYPE_GC);
+ emit_event (buf, TYPE_GC_FINALIZE_END | TYPE_GC);
- EXIT_LOG;
+ EXIT_LOG;
+ }
}
static void
}
static void
-image_loaded (MonoProfiler *prof, MonoImage *image, int result)
+image_loaded (MonoProfiler *prof, MonoImage *image)
{
- if (result != MONO_PROFILE_OK)
- return;
-
const char *name = mono_image_get_filename (image);
int nlen = strlen (name) + 1;
}
static void
-assembly_loaded (MonoProfiler *prof, MonoAssembly *assembly, int result)
+assembly_loaded (MonoProfiler *prof, MonoAssembly *assembly)
{
- if (result != MONO_PROFILE_OK)
- return;
-
char *name = mono_stringify_assembly_name (mono_assembly_get_name (assembly));
int nlen = strlen (name) + 1;
+ MonoImage *image = mono_assembly_get_image (assembly);
ENTER_LOG (&assembly_loads_ctr, logbuffer,
EVENT_SIZE /* event */ +
BYTE_SIZE /* type */ +
LEB128_SIZE /* assembly */ +
+ LEB128_SIZE /* image */ +
nlen /* name */
);
emit_event (logbuffer, TYPE_END_LOAD | TYPE_METADATA);
emit_byte (logbuffer, TYPE_ASSEMBLY);
emit_ptr (logbuffer, assembly);
+ emit_ptr (logbuffer, image);
memcpy (logbuffer->cursor, name, nlen);
logbuffer->cursor += nlen;
{
char *name = mono_stringify_assembly_name (mono_assembly_get_name (assembly));
int nlen = strlen (name) + 1;
+ MonoImage *image = mono_assembly_get_image (assembly);
ENTER_LOG (&assembly_unloads_ctr, logbuffer,
EVENT_SIZE /* event */ +
BYTE_SIZE /* type */ +
LEB128_SIZE /* assembly */ +
+ LEB128_SIZE /* image */ +
nlen /* name */
);
emit_event (logbuffer, TYPE_END_UNLOAD | TYPE_METADATA);
emit_byte (logbuffer, TYPE_ASSEMBLY);
emit_ptr (logbuffer, assembly);
+ emit_ptr (logbuffer, image);
memcpy (logbuffer->cursor, name, nlen);
logbuffer->cursor += nlen;
}
static void
-class_loaded (MonoProfiler *prof, MonoClass *klass, int result)
+class_loaded (MonoProfiler *prof, MonoClass *klass)
{
- if (result != MONO_PROFILE_OK)
- return;
-
char *name;
if (InterlockedRead (&runtime_inited))
g_free (name);
}
-static void
-class_unloaded (MonoProfiler *prof, MonoClass *klass)
-{
- char *name;
-
- if (InterlockedRead (&runtime_inited))
- name = mono_type_get_name (mono_class_get_type (klass));
- else
- name = type_name (klass);
-
- int nlen = strlen (name) + 1;
- MonoImage *image = mono_class_get_image (klass);
-
- ENTER_LOG (&class_unloads_ctr, logbuffer,
- EVENT_SIZE /* event */ +
- BYTE_SIZE /* type */ +
- LEB128_SIZE /* klass */ +
- LEB128_SIZE /* image */ +
- nlen /* name */
- );
-
- emit_event (logbuffer, TYPE_END_UNLOAD | TYPE_METADATA);
- emit_byte (logbuffer, TYPE_CLASS);
- emit_ptr (logbuffer, klass);
- emit_ptr (logbuffer, image);
- memcpy (logbuffer->cursor, name, nlen);
- logbuffer->cursor += nlen;
-
- EXIT_LOG;
-
- if (runtime_inited)
- mono_free (name);
- else
- g_free (name);
-}
-
-static void process_method_enter_coverage (MonoProfiler *prof, MonoMethod *method);
-
static void
method_enter (MonoProfiler *prof, MonoMethod *method)
{
- process_method_enter_coverage (prof, method);
-
- if (!only_coverage && PROF_TLS_GET ()->call_depth++ <= max_call_depth) {
+ if (get_thread ()->call_depth++ <= max_call_depth) {
ENTER_LOG (&method_entries_ctr, logbuffer,
EVENT_SIZE /* event */ +
LEB128_SIZE /* method */
static void
method_leave (MonoProfiler *prof, MonoMethod *method)
{
- if (!only_coverage && --PROF_TLS_GET ()->call_depth <= max_call_depth) {
+ if (--get_thread ()->call_depth <= max_call_depth) {
ENTER_LOG (&method_exits_ctr, logbuffer,
EVENT_SIZE /* event */ +
LEB128_SIZE /* method */
}
static void
-method_exc_leave (MonoProfiler *prof, MonoMethod *method)
+method_exc_leave (MonoProfiler *prof, MonoMethod *method, MonoObject *exc)
{
- if (!only_coverage && !nocalls && --PROF_TLS_GET ()->call_depth <= max_call_depth) {
+ if (!nocalls && --get_thread ()->call_depth <= max_call_depth) {
ENTER_LOG (&method_exception_exits_ctr, logbuffer,
EVENT_SIZE /* event */ +
LEB128_SIZE /* method */
}
}
+static MonoProfilerCallInstrumentationFlags
+method_filter (MonoProfiler *prof, MonoMethod *method)
+{
+ return MONO_PROFILER_CALL_INSTRUMENTATION_PROLOGUE | MONO_PROFILER_CALL_INSTRUMENTATION_EPILOGUE;
+}
+
static void
-method_jitted (MonoProfiler *prof, MonoMethod *method, MonoJitInfo *ji, int result)
+method_jitted (MonoProfiler *prof, MonoMethod *method, MonoJitInfo *ji)
{
- if (result != MONO_PROFILE_OK)
- return;
+ buffer_lock ();
register_method_local (method, ji);
- process_requests ();
+ buffer_unlock ();
}
static void
-code_buffer_new (MonoProfiler *prof, void *buffer, int size, MonoProfilerCodeBufferType type, void *data)
+code_buffer_new (MonoProfiler *prof, const mono_byte *buffer, uint64_t size, MonoProfilerCodeBufferType type, const void *data)
{
- char *name;
+ const char *name;
int nlen;
if (type == MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE) {
- name = (char *) data;
+ name = (const char *) data;
nlen = strlen (name) + 1;
} else {
name = NULL;
}
static void
-clause_exc (MonoProfiler *prof, MonoMethod *method, int clause_type, int clause_num)
+clause_exc (MonoProfiler *prof, MonoMethod *method, uint32_t clause_num, MonoExceptionEnum clause_type, MonoObject *exc)
{
ENTER_LOG (&exception_clauses_ctr, logbuffer,
EVENT_SIZE /* event */ +
emit_byte (logbuffer, clause_type);
emit_value (logbuffer, clause_num);
emit_method (logbuffer, method);
+ emit_obj (logbuffer, exc);
EXIT_LOG;
}
static void
-monitor_event (MonoProfiler *profiler, MonoObject *object, MonoProfilerMonitorEvent event)
+monitor_event (MonoProfiler *profiler, MonoObject *object, MonoProfilerMonitorEvent ev)
{
- int do_bt = (nocalls && InterlockedRead (&runtime_inited) && !notraces && event == MONO_PROFILER_MONITOR_CONTENTION) ? TYPE_MONITOR_BT : 0;
+ int do_bt = (nocalls && InterlockedRead (&runtime_inited) && !notraces) ? TYPE_MONITOR_BT : 0;
FrameData data;
if (do_bt)
collect_bt (&data);
- gint32 *ctr;
-
- switch (event) {
- case MONO_PROFILER_MONITOR_CONTENTION:
- ctr = &monitor_contentions_ctr;
- break;
- case MONO_PROFILER_MONITOR_DONE:
- ctr = &monitor_acquisitions_ctr;
- break;
- case MONO_PROFILER_MONITOR_FAIL:
- ctr = &monitor_failures_ctr;
- break;
- default:
- g_assert_not_reached ();
- break;
- }
-
- ENTER_LOG (ctr, logbuffer,
+ ENTER_LOG (&monitor_events_ctr, logbuffer,
EVENT_SIZE /* event */ +
+ BYTE_SIZE /* ev */ +
LEB128_SIZE /* object */ +
(do_bt ? (
LEB128_SIZE /* count */ +
) : 0)
);
- emit_event (logbuffer, (event << 4) | do_bt | TYPE_MONITOR);
+ emit_event (logbuffer, do_bt | TYPE_MONITOR);
+ emit_byte (logbuffer, ev);
emit_obj (logbuffer, object);
if (do_bt)
}
static void
-thread_start (MonoProfiler *prof, uintptr_t tid)
+monitor_contention (MonoProfiler *prof, MonoObject *object)
+{
+ monitor_event (prof, object, MONO_PROFILER_MONITOR_CONTENTION);
+}
+
+static void
+monitor_acquired (MonoProfiler *prof, MonoObject *object)
{
- init_thread (prof, TRUE);
+ monitor_event (prof, object, MONO_PROFILER_MONITOR_DONE);
+}
+static void
+monitor_failed (MonoProfiler *prof, MonoObject *object)
+{
+ monitor_event (prof, object, MONO_PROFILER_MONITOR_FAIL);
+}
+
+static void
+thread_start (MonoProfiler *prof, uintptr_t tid)
+{
if (ENABLED (PROFLOG_THREAD_EVENTS)) {
ENTER_LOG (&thread_starts_ctr, logbuffer,
EVENT_SIZE /* event */ +
emit_byte (logbuffer, TYPE_THREAD);
emit_ptr (logbuffer, (void*) tid);
- EXIT_LOG_EXPLICIT (NO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (NO_SEND);
}
- MonoProfilerThread *thread = PROF_TLS_GET ();
+ MonoProfilerThread *thread = get_thread ();
thread->ended = TRUE;
remove_thread (thread);
}
static void
-domain_loaded (MonoProfiler *prof, MonoDomain *domain, int result)
+domain_loaded (MonoProfiler *prof, MonoDomain *domain)
{
- if (result != MONO_PROFILE_OK)
- return;
-
ENTER_LOG (&domain_loads_ctr, logbuffer,
EVENT_SIZE /* event */ +
BYTE_SIZE /* type */ +
MonoProfiler *prof;
uint64_t time;
uintptr_t tid;
- void *ip;
+ const void *ip;
int count;
AsyncFrameInfo frames [MONO_ZERO_LEN_ARRAY];
} SampleHit;
}
static void
-mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
+mono_sample_hit (MonoProfiler *profiler, const mono_byte *ip, const void *context)
{
/*
* Please note: We rely on the runtime loading the profiler with
}
sample->count = 0;
- mono_stack_walk_async_safe (&async_walk_stack, context, sample);
+ mono_stack_walk_async_safe (&async_walk_stack, (void *) context, sample);
sample->time = current_time ();
sample->tid = thread_id ();
);
emit_event (logbuffer, TYPE_SAMPLE | TYPE_SAMPLE_UBIN);
- emit_svalue (logbuffer, load_addr);
+ emit_ptr (logbuffer, load_addr);
emit_uvalue (logbuffer, offset);
emit_uvalue (logbuffer, size);
memcpy (logbuffer->cursor, filename, len);
logbuffer->cursor += len;
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
#endif
memcpy (logbuffer->cursor, name, len);
logbuffer->cursor += len;
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
/* ELF code crashes on some systems. */
agent->emitted = 1;
}
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
done:
mono_os_mutex_unlock (&counters_mutex);
emit_value (logbuffer, 0);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
mono_os_mutex_unlock (&counters_mutex);
}
pcagent->emitted = 1;
}
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
static gboolean
emit_value (logbuffer, 0);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
done:
mono_os_mutex_unlock (&counters_mutex);
static MonoConcurrentHashTable *coverage_classes = NULL;
static MonoConcurrentHashTable *filtered_classes = NULL;
-static MonoConcurrentHashTable *entered_methods = NULL;
static MonoConcurrentHashTable *image_to_methods = NULL;
static MonoConcurrentHashTable *suppressed_assemblies = NULL;
static gboolean coverage_initialized = FALSE;
}
static void
-obtain_coverage_for_method (MonoProfiler *prof, const MonoProfileCoverageEntry *entry)
+obtain_coverage_for_method (MonoProfiler *prof, const MonoProfilerCoverageData *entry)
{
- int offset = entry->iloffset - previous_offset;
+ int offset = entry->il_offset - previous_offset;
CoverageEntry *e = g_new (CoverageEntry, 1);
- previous_offset = entry->iloffset;
+ previous_offset = entry->il_offset;
e->offset = offset;
e->counter = entry->counter;
- e->filename = g_strdup(entry->filename ? entry->filename : "");
+ e->filename = g_strdup(entry->file_name ? entry->file_name : "");
e->line = entry->line;
- e->column = entry->col;
+ e->column = entry->column;
g_ptr_array_add (coverage_data, e);
}
previous_offset = 0;
coverage_data = g_ptr_array_new ();
- mono_profiler_coverage_get (prof, method, obtain_coverage_for_method);
+ mono_profiler_get_coverage_data (prof->handle, method, obtain_coverage_for_method);
klass = mono_method_get_class (method);
image = mono_class_get_image (klass);
emit_uvalue (logbuffer, method_id);
emit_value (logbuffer, coverage_data->len);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
for (i = 0; i < coverage_data->len; i++) {
CoverageEntry *entry = (CoverageEntry *)coverage_data->pdata[i];
emit_uvalue (logbuffer, entry->line);
emit_uvalue (logbuffer, entry->column);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
method_id++;
emit_uvalue (logbuffer, fully_covered);
emit_uvalue (logbuffer, partially_covered);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
g_free (class_name);
}
emit_uvalue (logbuffer, fully_covered);
emit_uvalue (logbuffer, partially_covered);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
}
static void
COVERAGE_DEBUG(fprintf (stderr, "Coverage: Finished dump\n");)
}
-static void
-process_method_enter_coverage (MonoProfiler *prof, MonoMethod *method)
-{
- MonoClass *klass;
- MonoImage *image;
-
- if (!coverage_initialized)
- return;
-
- klass = mono_method_get_class (method);
- image = mono_class_get_image (klass);
-
- if (mono_conc_hashtable_lookup (suppressed_assemblies, (gpointer) mono_image_get_name (image)))
- return;
-
- mono_os_mutex_lock (&coverage_mutex);
- mono_conc_hashtable_insert (entered_methods, method, method);
- mono_os_mutex_unlock (&coverage_mutex);
-}
-
static MonoLockFreeQueueNode *
create_method_node (MonoMethod *method)
{
coverage_assemblies = mono_conc_hashtable_new (NULL, NULL);
coverage_classes = mono_conc_hashtable_new (NULL, NULL);
filtered_classes = mono_conc_hashtable_new (NULL, NULL);
- entered_methods = mono_conc_hashtable_new (NULL, NULL);
image_to_methods = mono_conc_hashtable_new (NULL, NULL);
init_suppressed_assemblies ();
*/
mono_thread_hazardous_try_free_all ();
- g_assert (!InterlockedRead (&buffer_rwlock_count) && "Why is the reader count still non-zero?");
- g_assert (!InterlockedReadPointer (&buffer_rwlock_exclusive) && "Why does someone still hold the exclusive lock?");
+ gint32 state = InterlockedRead (&buffer_lock_state);
+
+ g_assert (!(state & 0xFFFF) && "Why is the reader count still non-zero?");
+ g_assert (!(state >> 16) && "Why is the exclusive lock still held?");
#if defined (HAVE_SYS_ZLIB)
if (prof->gzfile)
mono_conc_hashtable_destroy (coverage_classes);
mono_conc_hashtable_destroy (filtered_classes);
- mono_conc_hashtable_destroy (entered_methods);
mono_conc_hashtable_destroy (image_to_methods);
mono_conc_hashtable_destroy (suppressed_assemblies);
mono_os_mutex_destroy (&coverage_mutex);
buf [len] = 0;
if (!strcmp (buf, "heapshot\n") && hs_mode_ondemand) {
- // Rely on the finalization callbacks invoking process_requests ().
+ // Rely on the finalization callback triggering a GC.
heapshot_requested = 1;
mono_gc_finalize_notify ();
}
memcpy (logbuffer->cursor, name, nlen);
logbuffer->cursor += nlen;
- EXIT_LOG_EXPLICIT (NO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (NO_SEND);
mono_free (name);
g_ptr_array_free (entry->methods, TRUE);
if (wrote_methods) {
- dump_buffer_threadless (prof, PROF_TLS_GET ()->buffer);
- init_buffer_state (PROF_TLS_GET ());
+ MonoProfilerThread *thread = PROF_TLS_GET ();
+
+ dump_buffer_threadless (prof, thread->buffer);
+ init_buffer_state (thread);
}
no_methods:
);
emit_event_time (logbuffer, TYPE_SAMPLE | TYPE_SAMPLE_HIT, sample->time);
- emit_byte (logbuffer, SAMPLE_CYCLES);
emit_ptr (logbuffer, (void *) sample->tid);
emit_value (logbuffer, 1);
for (int i = 0; i < sample->count; ++i)
emit_method (logbuffer, sample->frames [i].method);
- EXIT_LOG_EXPLICIT (DO_SEND, NO_REQUESTS);
+ EXIT_LOG_EXPLICIT (DO_SEND);
mono_thread_hazardous_try_free (sample, reuse_sample_hit);
MonoProfilerThread *thread = init_thread (prof, FALSE);
while (InterlockedRead (&prof->run_dumper_thread)) {
- mono_os_sem_wait (&prof->dumper_queue_sem, MONO_SEM_FLAGS_NONE);
+ /*
+ * Flush samples every second so it doesn't seem like the profiler is
+ * not working if the program is mostly idle.
+ */
+ if (mono_os_sem_timedwait (&prof->dumper_queue_sem, 1000, MONO_SEM_FLAGS_NONE) == MONO_SEM_TIMEDWAIT_RET_TIMEDOUT)
+ send_log_unsafe (FALSE);
+
handle_dumper_queue_entry (prof);
}
register_counter ("Event: Code buffers", &code_buffers_ctr);
register_counter ("Event: Exception throws", &exception_throws_ctr);
register_counter ("Event: Exception clauses", &exception_clauses_ctr);
- register_counter ("Event: Monitor contentions", &monitor_contentions_ctr);
- register_counter ("Event: Monitor acquisitions", &monitor_acquisitions_ctr);
- register_counter ("Event: Monitor failures", &monitor_failures_ctr);
+ register_counter ("Event: Monitor events", &monitor_events_ctr);
register_counter ("Event: Thread starts", &thread_starts_ctr);
register_counter ("Event: Thread ends", &thread_ends_ctr);
register_counter ("Event: Thread names", &thread_names_ctr);
start_dumper_thread (profiler);
}
-static MonoProfiler*
+static void
create_profiler (const char *args, const char *filename, GPtrArray *filters)
{
- MonoProfiler *prof;
char *nf;
int force_delete = 0;
- prof = (MonoProfiler *) g_calloc (1, sizeof (MonoProfiler));
- prof->args = pstrdup (args);
- prof->command_port = command_port;
+ log_profiler = (MonoProfiler *) g_calloc (1, sizeof (MonoProfiler));
+ log_profiler->args = pstrdup (args);
+ log_profiler->command_port = command_port;
+
if (filename && *filename == '-') {
force_delete = 1;
filename++;
g_warning ("WARNING: the output:-FILENAME option is deprecated, the profiler now always overrides the output file\n");
}
+
+ //If filename begin with +, append the pid at the end
+ if (filename && *filename == '+')
+ filename = g_strdup_printf ("%s.%d", filename + 1, getpid ());
+
+
if (!filename) {
if (do_report)
filename = "|mprof-report -";
}
}
if (*nf == '|') {
- prof->file = popen (nf + 1, "w");
- prof->pipe_output = 1;
+ log_profiler->file = popen (nf + 1, "w");
+ log_profiler->pipe_output = 1;
} else if (*nf == '#') {
int fd = strtol (nf + 1, NULL, 10);
- prof->file = fdopen (fd, "a");
+ log_profiler->file = fdopen (fd, "a");
} else {
if (force_delete)
unlink (nf);
- prof->file = fopen (nf, "wb");
+ log_profiler->file = fopen (nf, "wb");
}
- if (!prof->file) {
+ if (!log_profiler->file) {
fprintf (stderr, "Cannot create profiler output: %s\n", nf);
exit (1);
}
#if defined (HAVE_SYS_ZLIB)
if (use_zip)
- prof->gzfile = gzdopen (fileno (prof->file), "wb");
+ log_profiler->gzfile = gzdopen (fileno (log_profiler->file), "wb");
#endif
/*
g_assert (SAMPLE_SLOT_SIZE (MAX_FRAMES) * 2 < LOCK_FREE_ALLOC_SB_USABLE_SIZE (SAMPLE_BLOCK_SIZE));
// FIXME: We should free this stuff too.
- mono_lock_free_allocator_init_size_class (&prof->sample_size_class, SAMPLE_SLOT_SIZE (num_frames), SAMPLE_BLOCK_SIZE);
- mono_lock_free_allocator_init_allocator (&prof->sample_allocator, &prof->sample_size_class, MONO_MEM_ACCOUNT_PROFILER);
+ mono_lock_free_allocator_init_size_class (&log_profiler->sample_size_class, SAMPLE_SLOT_SIZE (num_frames), SAMPLE_BLOCK_SIZE);
+ mono_lock_free_allocator_init_allocator (&log_profiler->sample_allocator, &log_profiler->sample_size_class, MONO_MEM_ACCOUNT_PROFILER);
- mono_lock_free_queue_init (&prof->sample_reuse_queue);
+ mono_lock_free_queue_init (&log_profiler->sample_reuse_queue);
g_assert (sizeof (WriterQueueEntry) * 2 < LOCK_FREE_ALLOC_SB_USABLE_SIZE (WRITER_ENTRY_BLOCK_SIZE));
// FIXME: We should free this stuff too.
- mono_lock_free_allocator_init_size_class (&prof->writer_entry_size_class, sizeof (WriterQueueEntry), WRITER_ENTRY_BLOCK_SIZE);
- mono_lock_free_allocator_init_allocator (&prof->writer_entry_allocator, &prof->writer_entry_size_class, MONO_MEM_ACCOUNT_PROFILER);
+ mono_lock_free_allocator_init_size_class (&log_profiler->writer_entry_size_class, sizeof (WriterQueueEntry), WRITER_ENTRY_BLOCK_SIZE);
+ mono_lock_free_allocator_init_allocator (&log_profiler->writer_entry_allocator, &log_profiler->writer_entry_size_class, MONO_MEM_ACCOUNT_PROFILER);
- mono_lock_free_queue_init (&prof->writer_queue);
- mono_os_sem_init (&prof->writer_queue_sem, 0);
+ mono_lock_free_queue_init (&log_profiler->writer_queue);
+ mono_os_sem_init (&log_profiler->writer_queue_sem, 0);
- mono_lock_free_queue_init (&prof->dumper_queue);
- mono_os_sem_init (&prof->dumper_queue_sem, 0);
+ mono_lock_free_queue_init (&log_profiler->dumper_queue);
+ mono_os_sem_init (&log_profiler->dumper_queue_sem, 0);
- mono_os_mutex_init (&prof->method_table_mutex);
- prof->method_table = mono_conc_hashtable_new (NULL, NULL);
+ mono_os_mutex_init (&log_profiler->method_table_mutex);
+ log_profiler->method_table = mono_conc_hashtable_new (NULL, NULL);
if (do_coverage)
- coverage_init (prof);
- prof->coverage_filters = filters;
+ coverage_init (log_profiler);
+ log_profiler->coverage_filters = filters;
- prof->startup_time = current_time ();
- return prof;
+ log_profiler->startup_time = current_time ();
}
/*
* mono will load from the shared library and call.
*/
extern void
-mono_profiler_startup (const char *desc);
+mono_profiler_init (const char *desc);
extern void
-mono_profiler_startup_log (const char *desc);
+mono_profiler_init_log (const char *desc);
/*
* this is the entry point that will be used when the profiler
* is embedded inside the main executable.
*/
void
-mono_profiler_startup_log (const char *desc)
+mono_profiler_init_log (const char *desc)
{
- mono_profiler_startup (desc);
+ mono_profiler_init (desc);
}
void
-mono_profiler_startup (const char *desc)
+mono_profiler_init (const char *desc)
{
GPtrArray *filters = NULL;
- MonoProfiler *prof;
proflog_parse_args (&config, desc [3] == ':' ? desc + 4 : "");
max_call_depth = config.max_call_depth;
do_coverage = (config.effective_mask & PROFLOG_CODE_COV_FEATURE);
debug_coverage = config.debug_coverage;
- only_coverage = config.only_coverage;
if (config.cov_filter_files) {
filters = g_ptr_array_new ();
PROF_TLS_INIT ();
- prof = create_profiler (desc, config.output_filename, filters);
- if (!prof) {
- PROF_TLS_FREE ();
- return;
- }
+ create_profiler (desc, config.output_filename, filters);
mono_lls_init (&profiler_thread_list, NULL);
- init_thread (prof, TRUE);
-
- //This two events are required for the profiler to work
- int events = MONO_PROFILE_THREADS | MONO_PROFILE_GC;
+ MonoProfilerHandle handle = log_profiler->handle = mono_profiler_install (log_profiler);
//Required callbacks
- mono_profiler_install (prof, log_shutdown);
- mono_profiler_install_runtime_initialized (runtime_initialized);
+ mono_profiler_set_runtime_shutdown_end_callback (handle, log_shutdown);
+ mono_profiler_set_runtime_initialized_callback (handle, runtime_initialized);
- mono_profiler_install_gc (gc_event, gc_resize);
- mono_profiler_install_thread (thread_start, thread_end);
+ mono_profiler_set_gc_event_callback (handle, gc_event);
+ mono_profiler_set_gc_resize_callback (handle, gc_resize);
+ mono_profiler_set_thread_started_callback (handle, thread_start);
+ mono_profiler_set_thread_stopped_callback (handle, thread_end);
//It's questionable whether we actually want this to be mandatory, maybe put it behind the actual event?
- mono_profiler_install_thread_name (thread_name);
-
+ mono_profiler_set_thread_name_callback (handle, thread_name);
if (config.effective_mask & PROFLOG_DOMAIN_EVENTS) {
- events |= MONO_PROFILE_APPDOMAIN_EVENTS;
- mono_profiler_install_appdomain (NULL, domain_loaded, domain_unloaded, NULL);
- mono_profiler_install_appdomain_name (domain_name);
+ mono_profiler_set_domain_loaded_callback (handle, domain_loaded);
+ mono_profiler_set_domain_unloading_callback (handle, domain_unloaded);
+ mono_profiler_set_domain_name_callback (handle, domain_name);
}
if (config.effective_mask & PROFLOG_ASSEMBLY_EVENTS) {
- events |= MONO_PROFILE_ASSEMBLY_EVENTS;
- mono_profiler_install_assembly (NULL, assembly_loaded, assembly_unloaded, NULL);
+ mono_profiler_set_assembly_loaded_callback (handle, assembly_loaded);
+ mono_profiler_set_assembly_unloading_callback (handle, assembly_unloaded);
}
if (config.effective_mask & PROFLOG_MODULE_EVENTS) {
- events |= MONO_PROFILE_MODULE_EVENTS;
- mono_profiler_install_module (NULL, image_loaded, image_unloaded, NULL);
+ mono_profiler_set_image_loaded_callback (handle, image_loaded);
+ mono_profiler_set_image_unloading_callback (handle, image_unloaded);
}
- if (config.effective_mask & PROFLOG_CLASS_EVENTS) {
- events |= MONO_PROFILE_CLASS_EVENTS;
- mono_profiler_install_class (NULL, class_loaded, class_unloaded, NULL);
- }
+ if (config.effective_mask & PROFLOG_CLASS_EVENTS)
+ mono_profiler_set_class_loaded_callback (handle, class_loaded);
if (config.effective_mask & PROFLOG_JIT_COMPILATION_EVENTS) {
- events |= MONO_PROFILE_JIT_COMPILATION;
- mono_profiler_install_jit_end (method_jitted);
- mono_profiler_install_code_buffer_new (code_buffer_new);
+ mono_profiler_set_jit_done_callback (handle, method_jitted);
+ mono_profiler_set_jit_code_buffer_callback (handle, code_buffer_new);
}
if (config.effective_mask & PROFLOG_EXCEPTION_EVENTS) {
- events |= MONO_PROFILE_EXCEPTIONS;
- mono_profiler_install_exception (throw_exc, method_exc_leave, clause_exc);
+ mono_profiler_set_exception_throw_callback (handle, throw_exc);
+ mono_profiler_set_exception_clause_callback (handle, clause_exc);
}
if (config.effective_mask & PROFLOG_ALLOCATION_EVENTS) {
- events |= MONO_PROFILE_ALLOCATIONS;
- mono_profiler_install_allocation (gc_alloc);
+ mono_profiler_enable_allocations ();
+ mono_profiler_set_gc_allocation_callback (handle, gc_alloc);
}
//PROFLOG_GC_EVENTS is mandatory
//PROFLOG_THREAD_EVENTS is mandatory
if (config.effective_mask & PROFLOG_CALL_EVENTS) {
- events |= MONO_PROFILE_ENTER_LEAVE;
- mono_profiler_install_enter_leave (method_enter, method_leave);
+ mono_profiler_set_call_instrumentation_filter_callback (handle, method_filter);
+ mono_profiler_set_method_enter_callback (handle, method_enter);
+ mono_profiler_set_method_leave_callback (handle, method_leave);
+ mono_profiler_set_method_exception_leave_callback (handle, method_exc_leave);
}
- if (config.effective_mask & PROFLOG_INS_COVERAGE_EVENTS) {
- events |= MONO_PROFILE_INS_COVERAGE;
- mono_profiler_install_coverage_filter (coverage_filter);
- }
+ if (config.effective_mask & PROFLOG_INS_COVERAGE_EVENTS)
+ mono_profiler_set_coverage_filter_callback (handle, coverage_filter);
- //XXX should we check for PROFLOG_SAMPLING_FEATURE instead??
if (config.effective_mask & PROFLOG_SAMPLING_EVENTS) {
- events |= MONO_PROFILE_STATISTICAL;
- mono_profiler_set_statistical_mode (config.sampling_mode, config.sample_freq);
- mono_profiler_install_statistical (mono_sample_hit);
+ mono_profiler_enable_sampling (handle);
+
+ if (!mono_profiler_set_sample_mode (handle, config.sampling_mode, config.sample_freq))
+ g_warning ("Another profiler controls sampling parameters; the log profiler will not be able to modify them");
+
+ mono_profiler_set_sample_hit_callback (handle, mono_sample_hit);
}
if (config.effective_mask & PROFLOG_MONITOR_EVENTS) {
- events |= MONO_PROFILE_MONITOR_EVENTS;
- mono_profiler_install_monitor (monitor_event);
+ mono_profiler_set_monitor_contention_callback (handle, monitor_contention);
+ mono_profiler_set_monitor_acquired_callback (handle, monitor_acquired);
+ mono_profiler_set_monitor_failed_callback (handle, monitor_failed);
}
- if (config.effective_mask & PROFLOG_GC_MOVES_EVENTS) {
- events |= MONO_PROFILE_GC_MOVES;
- mono_profiler_install_gc_moves (gc_moves);
- }
+ if (config.effective_mask & PROFLOG_GC_MOVES_EVENTS)
+ mono_profiler_set_gc_moves_callback (handle, gc_moves);
- // TODO split those in two profiler events
- if (config.effective_mask & (PROFLOG_GC_ROOT_EVENTS | PROFLOG_GC_HANDLE_EVENTS)) {
- events |= MONO_PROFILE_GC_ROOTS;
- mono_profiler_install_gc_roots (
- config.effective_mask & (PROFLOG_GC_HANDLE_EVENTS) ? gc_handle : NULL,
- (config.effective_mask & PROFLOG_GC_ROOT_EVENTS) ? gc_roots : NULL);
- }
+ if (config.effective_mask & PROFLOG_GC_ROOT_EVENTS)
+ mono_profiler_set_gc_roots_callback (handle, gc_roots);
if (config.effective_mask & PROFLOG_CONTEXT_EVENTS) {
- events |= MONO_PROFILE_CONTEXT_EVENTS;
- mono_profiler_install_context (context_loaded, context_unloaded);
+ mono_profiler_set_context_loaded_callback (handle, context_loaded);
+ mono_profiler_set_context_unloaded_callback (handle, context_unloaded);
}
if (config.effective_mask & PROFLOG_FINALIZATION_EVENTS) {
- events |= MONO_PROFILE_GC_FINALIZATION;
- mono_profiler_install_gc_finalize (finalize_begin, finalize_object_begin, finalize_object_end, finalize_end);
+ mono_profiler_set_gc_finalizing_callback (handle, finalize_begin);
+ mono_profiler_set_gc_finalized_callback (handle, finalize_end);
+ mono_profiler_set_gc_finalizing_object_callback (handle, finalize_object_begin);
+ mono_profiler_set_gc_finalized_object_callback (handle, finalize_object_end);
+ } else if (ENABLED (PROFLOG_HEAPSHOT_FEATURE) && config.hs_mode_ondemand) {
+ //On Demand heapshot uses the finalizer thread to force a collection and thus a heapshot
+ mono_profiler_set_gc_finalized_callback (handle, finalize_end);
}
//PROFLOG_COUNTER_EVENTS is a pseudo event controled by the no_counters global var
- //PROFLOG_GC_HANDLE_EVENTS is handled together with PROFLOG_GC_ROOT_EVENTS
- mono_profiler_set_events ((MonoProfileFlags)events);
+ if (config.effective_mask & PROFLOG_GC_HANDLE_EVENTS) {
+ mono_profiler_set_gc_handle_created_callback (handle, gc_handle_created);
+ mono_profiler_set_gc_handle_deleted_callback (handle, gc_handle_deleted);
+ }
}
projects / mono.git / blobdiff