X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=a6e854ba830f0ec02c6759eb93abe5b1ebd4556d;hb=66579ff945831c5fc9a17c58c722ff01f2268d76;hp=0b327f1e5ea5f656adaac7f75497e9b46b56015c;hpb=b2acf7a7179f08f7e4099799180017825154567d;p=ghc-hetmet.git

diff --git a/rts/Hpc.c b/rts/Hpc.c
index 0b327f1..a6e854b 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
@@ -101,7 +109,7 @@ static StgWord64 expectWord64(void) {
 
 static void
 readTix(void) {
-  int i;
+  unsigned int i;
   HpcModuleInfo *tmpModule;
 
   totalTixes = 0;
@@ -165,14 +173,37 @@ readTix(void) {
 }
 
 static void hpc_init(void) {
+  char *hpc_tixdir;
+  char *hpc_tixfile;
   if (hpc_inited != 0) {
     return;
   }
   hpc_inited = 1;
   hpc_pid    = getpid();
-
-  tixFilename = (char *) malloc(strlen(prog_name) + 6);
-  sprintf(tixFilename, "%s.tix", prog_name);
+  hpc_tixdir = getenv("HPCTIXDIR");
+  hpc_tixfile = getenv("HPCTIXFILE");
+
+  /* XXX Check results of mallocs/strdups, and check we are requesting
+         enough bytes */
+  if (hpc_tixfile != NULL) {
+    tixFilename = strdup(hpc_tixfile);
+  } else 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 +217,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 +297,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 +315,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++) {