From b2acf7a7179f08f7e4099799180017825154567d Mon Sep 17 00:00:00 2001 From: "andy@galois.com" Date: Mon, 17 Sep 2007 23:06:41 +0000 Subject: [PATCH] Writing out .tix file only if you are the original process, not a child. This lets us gain coverage on programs that use fork, like xmonad. * To be merged to STABLE * --- rts/Hpc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rts/Hpc.c b/rts/Hpc.c index bc9ba0e..0b327f1 100644 --- a/rts/Hpc.c +++ b/rts/Hpc.c @@ -23,6 +23,8 @@ */ static int hpc_inited = 0; // Have you started this component? +static pid_t hpc_pid = 0; // pid of this process at hpc-boot time. + // Only this pid will read or write .tix file(s). static FILE *tixFile; // file being read/written static int tix_ch; // current char @@ -167,6 +169,7 @@ static void hpc_init(void) { return; } hpc_inited = 1; + hpc_pid = getpid(); tixFilename = (char *) malloc(strlen(prog_name) + 6); sprintf(tixFilename, "%s.tix", prog_name); @@ -321,8 +324,14 @@ exitHpc(void) { return; } - FILE *f = fopen(tixFilename,"w"); - writeTix(f); + // Only write the tix file if you are the original process. + // Any sub-process from use of fork from inside Haskell will + // not clober the .tix file. + + if (hpc_pid == getpid()) { + FILE *f = fopen(tixFilename,"w"); + writeTix(f); + } } ////////////////////////////////////////////////////////////////////////////// -- 1.7.10.4