X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=aa7ffe924476792e91bb751d9de940be6c6b8586;hb=2fc88e736892981b8b2b46661ac11f14dc351bc8;hp=7ad2666228a9fd64080282bdd13ead2f42b49210;hpb=5598dbc2d946f94ec4253450987d7a56336ef54a;p=ghc-hetmet.git

diff --git a/rts/Hpc.c b/rts/Hpc.c
index 7ad2666..aa7ffe9 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -22,21 +22,12 @@
  *
  */
 
-#define WOP_SIZE 1024	
-
 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
 
-typedef struct _HpcModuleInfo {
-  char *modName;		// name of module
-  int tickCount;		// number of ticks
-  int tickOffset;		// offset into a single large .tix Array
-  int hashNo;			// Hash number for this module's mix info
-  StgWord64 *tixArr;		// tix Array from the program execution (local for this module)
-  struct _HpcModuleInfo *next;
-} HpcModuleInfo;
-
 // This is a cruel hack, we should completely redesign the format specifier handling in the RTS.
 #if SIZEOF_LONG == 8
 #define PRIuWORD64 "lu"
@@ -110,7 +101,7 @@ static StgWord64 expectWord64(void) {
 
 static void
 readTix(void) {
-  int i;
+  unsigned int i;
   HpcModuleInfo *tmpModule;
 
   totalTixes = 0;
@@ -178,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);
@@ -194,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);
@@ -274,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;
 
@@ -332,44 +324,20 @@ 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.
 
+HpcModuleInfo *hs_hpc_rootModule(void) {
+  return modules;
+}