projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Leftovers from the 1st GHCi debugger prototype
[ghc-hetmet.git]
/
rts
/
Hpc.c
diff --git
a/rts/Hpc.c
b/rts/Hpc.c
index
bc9ba0e
..
014319c
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
@@
-99,7
+101,7
@@
static StgWord64 expectWord64(void) {
static void
readTix(void) {
static void
readTix(void) {
- int i;
+ unsigned int i;
HpcModuleInfo *tmpModule;
totalTixes = 0;
HpcModuleInfo *tmpModule;
totalTixes = 0;
@@
-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);
@@
-183,14
+186,14
@@
static void hpc_init(void) {
int
hs_hpc_module(char *modName,
int
hs_hpc_module(char *modName,
- int modCount,
- int modHashNo,
+ StgWord32 modCount,
+ StgWord32 modHashNo,
StgWord64 *tixArr) {
HpcModuleInfo *tmpModule, *lastModule;
StgWord64 *tixArr) {
HpcModuleInfo *tmpModule, *lastModule;
- int i;
+ unsigned int i;
int offset = 0;
int offset = 0;
- debugTrace(DEBUG_hpc,"hs_hpc_module(%s,%d)",modName,modCount);
+ debugTrace(DEBUG_hpc,"hs_hpc_module(%s,%d)",modName,(nat)modCount);
hpc_init();
hpc_init();
@@
-263,7
+266,7
@@
startupHpc(void) {
static void
writeTix(FILE *f) {
HpcModuleInfo *tmpModule;
static void
writeTix(FILE *f) {
HpcModuleInfo *tmpModule;
- int i, inner_comma, outer_comma;
+ unsigned int i, inner_comma, outer_comma;
outer_comma = 0;
outer_comma = 0;
@@
-281,13
+284,13
@@
writeTix(FILE *f) {
}
fprintf(f," TixModule \"%s\" %u %u [",
tmpModule->modName,
}
fprintf(f," TixModule \"%s\" %u %u [",
tmpModule->modName,
- tmpModule->hashNo,
- tmpModule->tickCount);
+ (nat)tmpModule->hashNo,
+ (nat)tmpModule->tickCount);
debugTrace(DEBUG_hpc,"%s: %u (offset=%u) (hash=%u)\n",
tmpModule->modName,
debugTrace(DEBUG_hpc,"%s: %u (offset=%u) (hash=%u)\n",
tmpModule->modName,
- tmpModule->tickCount,
- tmpModule->hashNo,
- tmpModule->tickOffset);
+ (nat)tmpModule->tickCount,
+ (nat)tmpModule->hashNo,
+ (nat)tmpModule->tickOffset);
inner_comma = 0;
for(i = 0;i < tmpModule->tickCount;i++) {
inner_comma = 0;
for(i = 0;i < tmpModule->tickCount;i++) {
@@
-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);
+ }
}
//////////////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////////////