diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-06-22 09:49:22 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-06-22 09:49:22 +0100 |
| commit | 1a4ce4b27623b3bcde8a02f0bd43402fbd78ff8a (patch) | |
| tree | b1351e5a6bf669560b62018c817b63e9c09cef4b /rts | |
| parent | da5ff10503e683e2148c62e36f8fe2f819328862 (diff) | |
| download | haskell-1a4ce4b27623b3bcde8a02f0bd43402fbd78ff8a.tar.gz | |
Revert "Ticky:Make json info a separate field."
This reverts commit da5ff10503e683e2148c62e36f8fe2f819328862.
This was pushed directly without review.
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/eventlog/EventLog.c | 3 | ||||
| -rw-r--r-- | rts/include/rts/Ticky.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c index d2e99a4b3e..ba05f31591 100644 --- a/rts/eventlog/EventLog.c +++ b/rts/eventlog/EventLog.c @@ -1355,7 +1355,7 @@ void postProfBegin(void) #if defined(TICKY_TICKY) static void postTickyCounterDef(EventsBuf *eb, StgEntCounter *p) { - StgWord len = 8 + 2 + strlen(p->arg_kinds)+1 + strlen(p->ticky_json)+1 + strlen(p->str)+1 + 8; + StgWord len = 8 + 2 + strlen(p->arg_kinds)+1 + strlen(p->str)+1 + 8; ensureRoomForVariableEvent(eb, len); postEventHeader(eb, EVENT_TICKY_COUNTER_DEF); postPayloadSize(eb, len); @@ -1363,7 +1363,6 @@ static void postTickyCounterDef(EventsBuf *eb, StgEntCounter *p) postWord64(eb, (uint64_t)((uintptr_t) p)); postWord16(eb, (uint16_t) p->arity); postString(eb, p->arg_kinds); - postString(eb, p->ticky_json); postString(eb, p->str); postWord64(eb, (W_) (INFO_PTR_TO_STRUCT(p->info))); } diff --git a/rts/include/rts/Ticky.h b/rts/include/rts/Ticky.h index 4d58c8e63a..7658e3c08a 100644 --- a/rts/include/rts/Ticky.h +++ b/rts/include/rts/Ticky.h @@ -26,7 +26,6 @@ typedef struct _StgEntCounter { /* (rest of args are in registers) */ char *str; /* name of the thing */ char *arg_kinds; /* info about the args types */ - char *ticky_json; /* json_info for eventlog mostly describing the tick */ StgInfoTable *info; /* Info table corresponding to this closure */ StgInt entry_count; /* Trips to fast entry code */ StgInt allocs; /* number of allocations by this fun */ |