X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FHpc.c;h=1624079dec78b6e5ed57a44ed05f0f90ea012dcf;hp=ebd5af15d18c307f05c3b8051212082183e7473d;hb=89eac8928317774fdc3f283d78d3ff3cb315db5e;hpb=5487e2226dac7574d951dce900176fc01efa4582

diff --git a/rts/Hpc.c b/rts/Hpc.c
index ebd5af1..1624079 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -12,6 +12,14 @@
 #include "Hpc.h"
 #include "Trace.h"
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -23,6 +31,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
 
@@ -39,9 +49,6 @@ int totalTixes = 0;		// total number of tix boxes.
 
 static char *tixFilename;
 
-void hs_hpc_read(char *filename);
-void hs_hpc_write(char *filename);
-
 static void failure(char *msg) {
   debugTrace(DEBUG_hpc,"hpc failure: %s\n",msg);
   fprintf(stderr,"Hpc failure: %s\n",msg);
@@ -102,7 +109,7 @@ static StgWord64 expectWord64(void) {
 
 static void
 readTix(void) {
-  int i;
+  unsigned int i;
   HpcModuleInfo *tmpModule;
 
   totalTixes = 0;
@@ -166,13 +173,31 @@ readTix(void) {
 }
 
 static void hpc_init(void) {
+  char *hpc_tixdir;
   if (hpc_inited != 0) {
     return;
   }
   hpc_inited = 1;
-
-  tixFilename = (char *) malloc(strlen(prog_name) + 6);
-  sprintf(tixFilename, "%s.tix", prog_name);
+  hpc_pid    = getpid();
+  hpc_tixdir = getenv("HPCTIXDIR");
+
+  if (hpc_tixdir != NULL) {
+    /* Make sure the directory is present;
+     * conditional code for mkdir lifted from lndir.c
+     */
+#ifdef WIN32
+    mkdir(hpc_tixdir);
+#else
+    mkdir(hpc_tixdir,0777);
+#endif
+    /* Then, try open the file
+     */
+    tixFilename = (char *) malloc(strlen(hpc_tixdir) + strlen(prog_name) + 12);
+    sprintf(tixFilename,"%s/%s-%d.tix",hpc_tixdir,prog_name,hpc_pid);
+  } else {
+    tixFilename = (char *) malloc(strlen(prog_name) + 6);
+    sprintf(tixFilename, "%s.tix", prog_name);
+  }
 
   if (init_open(fopen(tixFilename,"r"))) {
     readTix();
@@ -186,14 +211,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();
 
@@ -266,7 +291,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;
 
@@ -284,13 +309,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++) {
@@ -324,45 +349,16 @@ exitHpc(void) {
     return;
   }
 
-  FILE *f = fopen(tixFilename,"w");
-  writeTix(f);
-}
-
-void hs_hpc_read(char *filename) {
-  HpcModuleInfo *orig_modules = 0, *tmpModule, *tmpOrigModule;
-  int i;
+  // 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.
 
-  orig_modules = modules;
-  modules = 0;
-  if (init_open(fopen(filename,"r"))) {
-    readTix();
-    // Now we copy across the arrays. O(n^2), but works
-    for(tmpModule = modules;
-	tmpModule != 0;
-	tmpModule = tmpModule->next) {
-
-      for(tmpOrigModule = orig_modules;
-	  tmpOrigModule != 0;
-	  tmpOrigModule = tmpOrigModule->next) {
-	if (!strcmp(tmpModule->modName,tmpOrigModule->modName)) {    
-	  assert(tmpModule->tixArr != 0);		
-	  assert(tmpOrigModule->tixArr != 0);		
-	  assert(tmpModule->tickCount == tmpOrigModule->tickCount);
-	  for(i=0;i < tmpModule->tickCount;i++) {
-	    tmpOrigModule->tixArr[i] = tmpModule->tixArr[i];
-	  }
-	  tmpModule->tixArr = tmpOrigModule->tixArr;
-	  break;
-	}
-      }
-    }
+  if (hpc_pid == getpid()) {
+    FILE *f = fopen(tixFilename,"w");
+    writeTix(f);
   }
 }
 
-void hs_hpc_write(char *filename) {
-  writeTix(fopen(filename,"w"));
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // This is the API into Hpc RTS from Haskell, allowing the tixs boxes
 // to be first class.