X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FHpc.c;h=014319cf233f0cbd43fa48a1294d6369daeba039;hp=bc9ba0e29a6dc36c184ea6f9a959dcdab44b393a;hb=ff073cf32346caaa00f2c15161c88de6a3c5f8db;hpb=0578dfbc6a7eefd85ba4e6a4ad23d101060d86c3

diff --git a/rts/Hpc.c b/rts/Hpc.c
index bc9ba0e..014319c 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
 
@@ -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,14 +186,14 @@ static void hpc_init(void) {
 
 int
 hs_hpc_module(char *modName,
-	      int modCount,
-	      int modHashNo,
+	      StgWord32 modCount,
+	      StgWord32 modHashNo,
 	      StgWord64 *tixArr) {
   HpcModuleInfo *tmpModule, *lastModule;
-  int i;
+  unsigned int i;
   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();
 
@@ -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;
 
@@ -281,13 +284,13 @@ writeTix(FILE *f) {
     }
     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,
-	       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++) {
@@ -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);
+  }
 }
 
 //////////////////////////////////////////////////////////////////////////////