projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix exponential-time behaviour with type synonyms; rename -XPartiallyAppliedTypeSynon...
[ghc-hetmet.git]
/
rts
/
Hpc.c
diff --git
a/rts/Hpc.c
b/rts/Hpc.c
index
bc9ba0e
..
0b327f1
100644
(file)
--- a/
rts/Hpc.c
+++ b/
rts/Hpc.c
@@
-23,6
+23,8
@@
*/
static int hpc_inited = 0; // Have you started this component?
*/
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
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;
return;
}
hpc_inited = 1;
+ hpc_pid = getpid();
tixFilename = (char *) malloc(strlen(prog_name) + 6);
sprintf(tixFilename, "%s.tix", prog_name);
tixFilename = (char *) malloc(strlen(prog_name) + 6);
sprintf(tixFilename, "%s.tix", prog_name);
@@
-321,8
+324,14
@@
exitHpc(void) {
return;
}
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);
+ }
}
//////////////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////////////