X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FHpc.c;h=81c802cea23991855faeaa3a7b42ab5634e1ff1e;hp=a6e854ba830f0ec02c6759eb93abe5b1ebd4556d;hb=890f22ef8eff8dbb5b31fa221dfce65a7b84c202;hpb=073a9255cbe13e4dfb10b6d6090e4696453c4881

diff --git a/rts/Hpc.c b/rts/Hpc.c
index a6e854b..81c802c 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -2,16 +2,16 @@
  * (c)2006 Galois Connections, Inc.
  */ 
 
+#include "PosixSource.h"
+#include "Rts.h"
+
+#include "Trace.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include "Rts.h"
-#include "Hpc.h"
-#include "Trace.h"
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -36,20 +36,14 @@ static pid_t hpc_pid = 0;		// pid of this process at hpc-boot time.
 static FILE *tixFile;			// file being read/written
 static int tix_ch;			// current char
 
-// This is a cruel hack, we should completely redesign the format specifier handling in the RTS.
-#if SIZEOF_LONG == 8
-#define PRIuWORD64 "lu"
-#else
-#define PRIuWORD64 "llu"
-#endif
-
 HpcModuleInfo *modules = 0;
 HpcModuleInfo *nextModule = 0;
 int totalTixes = 0;		// total number of tix boxes.
 
 static char *tixFilename;
 
-static void failure(char *msg) {
+static void GNU_ATTRIBUTE(__noreturn__)
+failure(char *msg) {
   debugTrace(DEBUG_hpc,"hpc failure: %s\n",msg);
   fprintf(stderr,"Hpc failure: %s\n",msg);
   if (tixFilename) {
@@ -57,7 +51,7 @@ static void failure(char *msg) {
   } else {
     fprintf(stderr,"(perhaps remove .tix file?)\n");
   }
-  exit(-1);
+  stg_exit(1);
 }
 
 static int init_open(FILE *file) {
@@ -199,7 +193,7 @@ static void hpc_init(void) {
     /* 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);
+    sprintf(tixFilename,"%s/%s-%d.tix",hpc_tixdir,prog_name,(int)hpc_pid);
   } else {
     tixFilename = (char *) malloc(strlen(prog_name) + 6);
     sprintf(tixFilename, "%s.tix", prog_name);
@@ -241,7 +235,7 @@ hs_hpc_module(char *modName,
 	fprintf(stderr,"in module '%s'\n",tmpModule->modName);
 	failure("module mismatch with .tix/.mix file hash number");
 	fprintf(stderr,"(perhaps remove %s ?)\n",tixFilename);
-	exit(-1);
+	stg_exit(1);
 
       }
       for(i=0;i < modCount;i++) {
@@ -332,7 +326,7 @@ writeTix(FILE *f) {
       }
 
       if (tmpModule->tixArr) {
-	fprintf(f,"%" PRIuWORD64,tmpModule->tixArr[i]);
+	fprintf(f,"%" FMT_Word64,tmpModule->tixArr[i]);
       } else {
 	fprintf(f,"0");
       }