Skip to content

Commit

Permalink
[sgen] Binary protocol records worker thread vs non-worker thread eve…
Browse files Browse the repository at this point in the history 
…nts.
  • Loading branch information
@schani
schani committed Nov 28, 2013
1 parent 3da6eab commit 0c7553a
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 33 deletions.
4 changes: 4 additions & 0 deletions mono/metadata/sgen-protocol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "sgen-protocol.h"
#include "sgen-memory-governor.h"
#include "utils/mono-mmap.h"
#include "utils/mono-threads.h"

#ifdef SGEN_BINARY_PROTOCOL

Expand Down Expand Up @@ -180,6 +181,9 @@ protocol_entry (unsigned char type, gpointer data, int size)
if (!binary_protocol_file)
return;

if (sgen_is_worker_thread (mono_native_thread_id_get ()))
type |= 0x80;

lock_recursive ();

retry:
Expand Down
71 changes: 38 additions & 33 deletions tools/sgen/sgen-grep-binprot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

#define SGEN_PROTOCOL_EOF 255

#define TYPE(t) ((t) & 0x7f)
#define WORKER(t) ((t) & 0x80)

static int
read_entry (FILE *in, void **data)
{
Expand All @@ -18,7 +21,7 @@ read_entry (FILE *in, void **data)

if (fread (&type, 1, 1, in) != 1)
return SGEN_PROTOCOL_EOF;
switch (type) {
switch (TYPE (type)) {
case SGEN_PROTOCOL_COLLECTION_FORCE: size = sizeof (SGenProtocolCollectionForce); break;
case SGEN_PROTOCOL_COLLECTION_BEGIN: size = sizeof (SGenProtocolCollection); break;
case SGEN_PROTOCOL_COLLECTION_END: size = sizeof (SGenProtocolCollection); break;
Expand Down Expand Up @@ -62,134 +65,136 @@ read_entry (FILE *in, void **data)
return (int)type;
}

#define WORKER_PREFIX(t) (WORKER ((t)) ? "w" : " ")

static void
print_entry (int type, void *data)
{
switch (type) {
switch (TYPE (type)) {
case SGEN_PROTOCOL_COLLECTION_FORCE: {
SGenProtocolCollectionForce *entry = data;
printf ("collection force generation %d\n", entry->generation);
printf ("%s collection force generation %d\n", WORKER_PREFIX (type), entry->generation);
break;
}
case SGEN_PROTOCOL_COLLECTION_BEGIN: {
SGenProtocolCollection *entry = data;
printf ("collection begin %d generation %d\n", entry->index, entry->generation);
printf ("%s collection begin %d generation %d\n", WORKER_PREFIX (type), entry->index, entry->generation);
break;
}
case SGEN_PROTOCOL_COLLECTION_END: {
SGenProtocolCollection *entry = data;
printf ("collection end %d generation %d\n", entry->index, entry->generation);
printf ("%s collection end %d generation %d\n", WORKER_PREFIX (type), entry->index, entry->generation);
break;
}
case SGEN_PROTOCOL_ALLOC: {
SGenProtocolAlloc *entry = data;
printf ("alloc obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s alloc obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_ALLOC_PINNED: {
SGenProtocolAlloc *entry = data;
printf ("alloc pinned obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s alloc pinned obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_ALLOC_DEGRADED: {
SGenProtocolAlloc *entry = data;
printf ("alloc degraded obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s alloc degraded obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_COPY: {
SGenProtocolCopy *entry = data;
printf ("copy from %p to %p vtable %p size %d\n", entry->from, entry->to, entry->vtable, entry->size);
printf ("%s copy from %p to %p vtable %p size %d\n", WORKER_PREFIX (type), entry->from, entry->to, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_PIN: {
SGenProtocolPin *entry = data;
printf ("pin obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s pin obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_MARK: {
SGenProtocolMark *entry = data;
printf ("mark obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s mark obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_SCAN_BEGIN: {
SGenProtocolScanBegin *entry = data;
printf ("scan_begin obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s scan_begin obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_SCAN_VTYPE_BEGIN: {
SGenProtocolScanVTypeBegin *entry = data;
printf ("scan_vtype_begin obj %p size %d\n", entry->obj, entry->size);
printf ("%s scan_vtype_begin obj %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->size);
break;
}
case SGEN_PROTOCOL_WBARRIER: {
SGenProtocolWBarrier *entry = data;
printf ("wbarrier ptr %p value %p value_vtable %p\n", entry->ptr, entry->value, entry->value_vtable);
printf ("%s wbarrier ptr %p value %p value_vtable %p\n", WORKER_PREFIX (type), entry->ptr, entry->value, entry->value_vtable);
break;
}
case SGEN_PROTOCOL_GLOBAL_REMSET: {
SGenProtocolGlobalRemset *entry = data;
printf ("global_remset ptr %p value %p value_vtable %p\n", entry->ptr, entry->value, entry->value_vtable);
printf ("%s global_remset ptr %p value %p value_vtable %p\n", WORKER_PREFIX (type), entry->ptr, entry->value, entry->value_vtable);
break;
}
case SGEN_PROTOCOL_PTR_UPDATE: {
SGenProtocolPtrUpdate *entry = data;
printf ("ptr_update ptr %p old_value %p new_value %p vtable %p size %d\n",
printf ("%s ptr_update ptr %p old_value %p new_value %p vtable %p size %d\n", WORKER_PREFIX (type),
entry->ptr, entry->old_value, entry->new_value, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_CLEANUP: {
SGenProtocolCleanup *entry = data;
printf ("cleanup ptr %p vtable %p size %d\n", entry->ptr, entry->vtable, entry->size);
printf ("%s cleanup ptr %p vtable %p size %d\n", WORKER_PREFIX (type), entry->ptr, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_EMPTY: {
SGenProtocolEmpty *entry = data;
printf ("empty start %p size %d\n", entry->start, entry->size);
printf ("%s empty start %p size %d\n", WORKER_PREFIX (type), entry->start, entry->size);
break;
}
case SGEN_PROTOCOL_THREAD_SUSPEND: {
SGenProtocolThreadSuspend *entry = data;
printf ("thread_suspend thread %p ip %p\n", entry->thread, entry->stopped_ip);
printf ("%s thread_suspend thread %p ip %p\n", WORKER_PREFIX (type), entry->thread, entry->stopped_ip);
break;
}
case SGEN_PROTOCOL_THREAD_RESTART: {
SGenProtocolThreadRestart *entry = data;
printf ("thread_restart thread %p\n", entry->thread);
printf ("%s thread_restart thread %p\n", WORKER_PREFIX (type), entry->thread);
break;
}
case SGEN_PROTOCOL_THREAD_REGISTER: {
SGenProtocolThreadRegister *entry = data;
printf ("thread_register thread %p\n", entry->thread);
printf ("%s thread_register thread %p\n", WORKER_PREFIX (type), entry->thread);
break;
}
case SGEN_PROTOCOL_THREAD_UNREGISTER: {
SGenProtocolThreadUnregister *entry = data;
printf ("thread_unregister thread %p\n", entry->thread);
printf ("%s thread_unregister thread %p\n", WORKER_PREFIX (type), entry->thread);
break;
}
case SGEN_PROTOCOL_MISSING_REMSET: {
SGenProtocolMissingRemset *entry = data;
printf ("missing_remset obj %p obj_vtable %p offset %d value %p value_vtable %p value_pinned %d\n",
printf ("%s missing_remset obj %p obj_vtable %p offset %d value %p value_vtable %p value_pinned %d\n", WORKER_PREFIX (type),
entry->obj, entry->obj_vtable, entry->offset, entry->value, entry->value_vtable, entry->value_pinned);
break;
}
case SGEN_PROTOCOL_CARD_SCAN: {
SGenProtocolCardScan *entry = data;
printf ("card_scan start %p size %d\n", entry->start, entry->size);
printf ("%s card_scan start %p size %d\n", WORKER_PREFIX (type), entry->start, entry->size);
break;
}
case SGEN_PROTOCOL_CEMENT: {
SGenProtocolCement *entry = data;
printf ("cement obj %p vtable %p size %d\n", entry->obj, entry->vtable, entry->size);
printf ("%s cement obj %p vtable %p size %d\n", WORKER_PREFIX (type), entry->obj, entry->vtable, entry->size);
break;
}
case SGEN_PROTOCOL_CEMENT_RESET: {
printf ("cement_reset\n");
printf ("%s cement_reset\n", WORKER_PREFIX (type));
break;
}
case SGEN_PROTOCOL_DISLINK_UPDATE: {
SGenProtocolDislinkUpdate *entry = data;
printf ("dislink_update link %p obj %p staged %d", entry->link, entry->obj, entry->staged);
printf ("%s dislink_update link %p obj %p staged %d", WORKER_PREFIX (type), entry->link, entry->obj, entry->staged);
if (entry->obj)
printf (" track %d\n", entry->track);
else
Expand All @@ -198,7 +203,7 @@ print_entry (int type, void *data)
}
case SGEN_PROTOCOL_DISLINK_UPDATE_STAGED: {
SGenProtocolDislinkUpdateStaged *entry = data;
printf ("dislink_update_staged link %p obj %p index %d", entry->link, entry->obj, entry->index);
printf ("%s dislink_update_staged link %p obj %p index %d", WORKER_PREFIX (type), entry->link, entry->obj, entry->index);
if (entry->obj)
printf (" track %d\n", entry->track);
else
Expand All @@ -207,17 +212,17 @@ print_entry (int type, void *data)
}
case SGEN_PROTOCOL_DISLINK_PROCESS_STAGED: {
SGenProtocolDislinkProcessStaged *entry = data;
printf ("dislink_process_staged link %p obj %p index %d\n", entry->link, entry->obj, entry->index);
printf ("%s dislink_process_staged link %p obj %p index %d\n", WORKER_PREFIX (type), entry->link, entry->obj, entry->index);
break;
}
case SGEN_PROTOCOL_DOMAIN_UNLOAD_BEGIN: {
SGenProtocolDomainUnload *entry = data;
printf ("dislink_unload_begin domain %p\n", entry->domain);
printf ("%s dislink_unload_begin domain %p\n", WORKER_PREFIX (type), entry->domain);
break;
}
case SGEN_PROTOCOL_DOMAIN_UNLOAD_END: {
SGenProtocolDomainUnload *entry = data;
printf ("dislink_unload_end domain %p\n", entry->domain);
printf ("%s dislink_unload_end domain %p\n", WORKER_PREFIX (type), entry->domain);
break;
}
default:
Expand All @@ -234,7 +239,7 @@ matches_interval (gpointer ptr, gpointer start, int size)
static gboolean
is_match (gpointer ptr, int type, void *data)
{
switch (type) {
switch (TYPE (type)) {
case SGEN_PROTOCOL_COLLECTION_FORCE:
case SGEN_PROTOCOL_COLLECTION_BEGIN:
case SGEN_PROTOCOL_COLLECTION_END:
Expand Down Expand Up @@ -326,7 +331,7 @@ is_match (gpointer ptr, int type, void *data)
static gboolean
is_vtable_match (gpointer ptr, int type, void *data)
{
switch (type) {
switch (TYPE (type)) {
case SGEN_PROTOCOL_ALLOC:
case SGEN_PROTOCOL_ALLOC_PINNED:
case SGEN_PROTOCOL_ALLOC_DEGRADED: {
Expand Down

0 comments on commit 0c7553a

Please sign in to comment.