add PIC relocations for x86_64, and use a simpler hack in place of x86_64_high_symbol()

[ghc-hetmet.git] / rts / Hpc.c

diff --git a/rts/Hpc.c b/rts/Hpc.c
index bc9ba0e..aa7ffe9 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 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
 
@@ -99,7 +101,7 @@ static StgWord64 expectWord64(void) {
 
 static void
 readTix(void) {
-  int i;
+  unsigned int i;
   HpcModuleInfo *tmpModule;
 
   totalTixes = 0;
@@ -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);
@@ -183,11 +186,11 @@ static void hpc_init(void) {
 
 int
 hs_hpc_module(char *modName,
-             int modCount,
-             int modHashNo,
+             unsigned int modCount,
+             unsigned int modHashNo,
              StgWord64 *tixArr) {
   HpcModuleInfo *tmpModule, *lastModule;
-  int i;
+  unsigned int i;
   int offset = 0;
   
   debugTrace(DEBUG_hpc,"hs_hpc_module(%s,%d)",modName,modCount);
@@ -263,7 +266,7 @@ startupHpc(void) {
 static void
 writeTix(FILE *f) {
   HpcModuleInfo *tmpModule;  
-  int i, inner_comma, outer_comma;
+  unsigned int i, inner_comma, outer_comma;
 
   outer_comma = 0;
 
@@ -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);
+  }
 }
 
 //////////////////////////////////////////////////////////////////////////////