Skip to content
Snippets Groups Projects
Commit b0d2c7ff authored by Austin Seipp's avatar Austin Seipp
Browse files

rts: Fix #9003 with an annoying hack


The TL;DR is that by adding this, we can distinguish GHC 7.8.3 from
7.8.2, which had a buggy implementation. See the ticket for details.

Signed-off-by: default avatarAustin Seipp <austin@well-typed.com>
(cherry picked from commit bd5f3ef6)
parent e7d041be
No related merge requests found
...@@ -162,6 +162,8 @@ ...@@ -162,6 +162,8 @@
#define EVENT_TASK_MIGRATE 56 /* (taskID, cap, new_cap) */ #define EVENT_TASK_MIGRATE 56 /* (taskID, cap, new_cap) */
#define EVENT_TASK_DELETE 57 /* (taskID) */ #define EVENT_TASK_DELETE 57 /* (taskID) */
#define EVENT_USER_MARKER 58 /* (marker_name) */ #define EVENT_USER_MARKER 58 /* (marker_name) */
#define EVENT_HACK_BUG_T9003 59 /* Hack: see trac #9003 */
/* Range 59 - 59 is available for new GHC and common events. */ /* Range 59 - 59 is available for new GHC and common events. */
/* Range 60 - 80 is used by eden for parallel tracing /* Range 60 - 80 is used by eden for parallel tracing
...@@ -177,7 +179,7 @@ ...@@ -177,7 +179,7 @@
* ranges higher than this are reserved but not currently emitted by ghc. * ranges higher than this are reserved but not currently emitted by ghc.
* This must match the size of the EventDesc[] array in EventLog.c * This must match the size of the EventDesc[] array in EventLog.c
*/ */
#define NUM_GHC_EVENT_TAGS 59 #define NUM_GHC_EVENT_TAGS 60
#if 0 /* DEPRECATED EVENTS: */ #if 0 /* DEPRECATED EVENTS: */
/* we don't actually need to record the thread, it's implicit */ /* we don't actually need to record the thread, it's implicit */
......
...@@ -106,6 +106,7 @@ char *EventDesc[] = { ...@@ -106,6 +106,7 @@ char *EventDesc[] = {
[EVENT_TASK_CREATE] = "Task create", [EVENT_TASK_CREATE] = "Task create",
[EVENT_TASK_MIGRATE] = "Task migrate", [EVENT_TASK_MIGRATE] = "Task migrate",
[EVENT_TASK_DELETE] = "Task delete", [EVENT_TASK_DELETE] = "Task delete",
[EVENT_HACK_BUG_T9003] = "Empty event for bug #9003",
}; };
// Event type. // Event type.
...@@ -420,6 +421,10 @@ initEventLogging(void) ...@@ -420,6 +421,10 @@ initEventLogging(void)
sizeof(EventCapNo); sizeof(EventCapNo);
break; break;
case EVENT_HACK_BUG_T9003:
eventTypes[t].size = 0;
break;
default: default:
continue; /* ignore deprecated events */ continue; /* ignore deprecated events */
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment