X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=ebd5af15d18c307f05c3b8051212082183e7473d;hb=0981e24e9980b8b26e6f20fc56bebc1c7416cc4f;hp=6d79f260d90487a1e6747c90a29119ff3d0b324f;hpb=d50e93cf95b68bf858be82025b56c9977335ed76;p=ghc-hetmet.git

diff --git a/rts/Hpc.c b/rts/Hpc.c
index 6d79f26..ebd5af1 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -7,33 +7,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "HsFFI.h"
 
 #include "Rts.h"
 #include "Hpc.h"
+#include "Trace.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 
 /* This is the runtime support for the Haskell Program Coverage (hpc) toolkit,
  * inside GHC.
  *
  */
 
-#define DEBUG_HPC 0
-
 static int hpc_inited = 0;		// Have you started this component?
 static FILE *tixFile;			// file being read/written
 static int tix_ch;			// current char
-static StgWord64 magicTixNumber;	// Magic/Hash number to mark .tix files
-
-static int hpc_ticks_inited = 0;	// Have you started the dynamic external ticking?
-static FILE *rixFile;			// The tracer file/pipe
-
-typedef struct _Info {
-  char *modName;		// name of module
-  int tickCount;		// number of ticks
-  int tickOffset;		// offset into a single large .tix Array
-  StgWord64 *tixArr;		// tix Array from the program execution (local for this module)
-  struct _Info *next;
-} Info;
 
 // This is a cruel hack, we should completely redesign the format specifier handling in the RTS.
 #if SIZEOF_LONG == 8
@@ -42,25 +33,28 @@ typedef struct _Info {
 #define PRIuWORD64 "llu"
 #endif
 
-Info *modules = 0;
-Info *nextModule = 0;
-StgWord64 *tixBoxes = 0;	// local copy of tixBoxes array, from file.
+HpcModuleInfo *modules = 0;
+HpcModuleInfo *nextModule = 0;
 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) {
-  printf("Hpc failure: %s\n",msg);
-  printf("(perhaps remove .tix file?)\n");
+  debugTrace(DEBUG_hpc,"hpc failure: %s\n",msg);
+  fprintf(stderr,"Hpc failure: %s\n",msg);
+  if (tixFilename) {
+    fprintf(stderr,"(perhaps remove %s file?)\n",tixFilename);
+  } else {
+    fprintf(stderr,"(perhaps remove .tix file?)\n");
+  }
   exit(-1);
 }
 
-
-static int init_open(char *filename) 
-{
-  tixFile = fopen(filename,"r");
+static int init_open(FILE *file) {
+  tixFile = file;
  if (tixFile == 0) {
     return 0;
   }
@@ -70,8 +64,8 @@ static int init_open(char *filename)
 
 static void expect(char c) {
   if (tix_ch != c) {
-    printf("Hpc: parse failed (%c,%c)\n",tix_ch,c);
-    exit(-1);
+    fprintf(stderr,"('%c' '%c')\n",tix_ch,c);
+    failure("parse error when reading .tix file");
   }
   tix_ch = getc(tixFile);
 }
@@ -106,56 +100,47 @@ static StgWord64 expectWord64(void) {
   return tmp;
 }
 
-static void hpc_init(void) {
+static void
+readTix(void) {
   int i;
-  Info *tmpModule;  
+  HpcModuleInfo *tmpModule;
 
-  if (hpc_inited != 0) {
-    return;
-  }
-  hpc_inited = 1;
+  totalTixes = 0;
+    
+  ws();
+  expect('T');
+  expect('i');
+  expect('x');
+  ws();
+  expect('[');
+  ws();
   
-
-  tixFilename = (char *) malloc(strlen(prog_name) + 6);
-  sprintf(tixFilename, "%s.tix", prog_name);
-
-  if (init_open(tixFilename)) { 
-    totalTixes = 0;
-
-    ws();
+  while(tix_ch != ']') {
+    tmpModule = (HpcModuleInfo *)calloc(1,sizeof(HpcModuleInfo));
     expect('T');
     expect('i');
     expect('x');
+    expect('M');
+    expect('o');
+    expect('d');
+    expect('u');
+    expect('l');
+    expect('e');
     ws();
-    magicTixNumber = expectWord64();
+    tmpModule -> modName = expectString();
+    ws();
+    tmpModule -> hashNo = (unsigned int)expectWord64();
+    ws();
+    tmpModule -> tickCount = (int)expectWord64();
+    tmpModule -> tixArr = (StgWord64 *)calloc(tmpModule->tickCount,sizeof(StgWord64));
+    tmpModule -> tickOffset = totalTixes;
+    totalTixes += tmpModule -> tickCount;
     ws();
     expect('[');
     ws();
-    while(tix_ch != ']') {
-      tmpModule = (Info *)calloc(1,sizeof(Info));
-      expect('(');
-      ws();
-      tmpModule -> modName = expectString();
-      ws();
-      expect(',');
-      ws();
-      tmpModule -> tickCount = (int)expectWord64();
-      ws();
-      expect(')');
+    for(i = 0;i < tmpModule->tickCount;i++) {
+      tmpModule->tixArr[i] = expectWord64();
       ws();
-      
-      tmpModule -> tickOffset = totalTixes;
-      totalTixes += tmpModule -> tickCount;
-      
-      tmpModule -> tixArr = 0;
-      
-      if (!modules) {
-	modules = tmpModule;
-      } else {
-	nextModule->next=tmpModule;
-      }
-      nextModule=tmpModule;
-      
       if (tix_ch == ',') {
 	expect(',');
 	ws();
@@ -163,23 +148,34 @@ static void hpc_init(void) {
     }
     expect(']');
     ws();
-    tixBoxes = (StgWord64 *)calloc(totalTixes,sizeof(StgWord64));
-
-    expect('[');
-    for(i = 0;i < totalTixes;i++) {
-      if (i != 0) {
-	expect(',');
-	ws();
-      }
-    tixBoxes[i] = expectWord64();
-    ws();
+    
+    if (!modules) {
+      modules = tmpModule;
+    } else {
+      nextModule->next=tmpModule;
     }
-    expect(']');
+    nextModule=tmpModule;
+    
+    if (tix_ch == ',') {
+      expect(',');
+      ws();
+    }
+  }
+  expect(']');
+  fclose(tixFile);
+}
 
-    fclose(tixFile);
-  } else {
-    // later, we will find a binary specific 
-    magicTixNumber = (StgWord64)0;
+static void hpc_init(void) {
+  if (hpc_inited != 0) {
+    return;
+  }
+  hpc_inited = 1;
+
+  tixFilename = (char *) malloc(strlen(prog_name) + 6);
+  sprintf(tixFilename, "%s.tix", prog_name);
+
+  if (init_open(fopen(tixFilename,"r"))) {
+    readTix();
   }
 }
 
@@ -189,14 +185,15 @@ static void hpc_init(void) {
  */
 
 int
-hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr) {
-  Info *tmpModule, *lastModule;
+hs_hpc_module(char *modName,
+	      int modCount,
+	      int modHashNo,
+	      StgWord64 *tixArr) {
+  HpcModuleInfo *tmpModule, *lastModule;
   int i;
   int offset = 0;
   
-#if DEBUG_HPC
-  printf("hs_hpc_module(%s,%d)\n",modName,modCount);
-#endif
+  debugTrace(DEBUG_hpc,"hs_hpc_module(%s,%d)",modName,modCount);
 
   hpc_init();
 
@@ -208,20 +205,27 @@ hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr) {
       if (tmpModule->tickCount != modCount) {
 	failure("inconsistent number of tick boxes");
       }
-      assert(tmpModule->tixArr == 0);	
-      assert(tixBoxes != 0);
-      tmpModule->tixArr = tixArr;
+      assert(tmpModule->tixArr != 0);	
+      if (tmpModule->hashNo != modHashNo) {
+	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);
+
+      }
       for(i=0;i < modCount;i++) {
-	tixArr[i] = tixBoxes[i + tmpModule->tickOffset];
+	tixArr[i] = tmpModule->tixArr[i];
       }
+      tmpModule->tixArr = tixArr;
       return tmpModule->tickOffset;
     }
     lastModule = tmpModule;
   }
   // Did not find entry so add one on.
-  tmpModule = (Info *)calloc(1,sizeof(Info));
+  tmpModule = (HpcModuleInfo *)calloc(1,sizeof(HpcModuleInfo));
   tmpModule->modName = modName;
   tmpModule->tickCount = modCount;
+  tmpModule->hashNo = modHashNo;
   if (lastModule) {
     tmpModule->tickOffset = lastModule->tickOffset + lastModule->tickCount;
   } else {
@@ -239,84 +243,11 @@ hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr) {
     lastModule->next=tmpModule;
   }
 
-#if DEBUG_HPC
-  printf("end: hs_hpc_module\n");
-#endif
-  return offset;
-}
+  debugTrace(DEBUG_hpc,"end: hs_hpc_module");
 
-
-/*
- * Called on *every* exception thrown
- */
-void
-hs_hpc_throw() {
-  // Assumes that we have had at least *one* tick first.
-  // All exceptions before the first tick are not reported.
-  // The only time this might be an issue is in bootstrapping code,
-  // so this is a feature.
-  if (hpc_inited != 0 && hpc_ticks_inited != 0) {
-    fprintf(rixFile,"Throw\n");
-  }
+  return offset;
 }
 
-/* Called on every tick
- */
-
-void
-hs_hpc_tick(int globIx) {
-  int threadId = 0;	 // for now, assume single thread
-			 // TODO: work out how to get the thread Id to here.
-
-  
-#if DEBUG_HPC && DEBUG
-  printf("hs_hpc_tick(%d)\n",globIx);
-#endif
-  if (!hpc_ticks_inited) {
-    char* trace_filename;
-    int comma;
-    Info *tmpModule;  
-
-    assert(hpc_inited);
-    hpc_ticks_inited = 1;
-
-    trace_filename = (char *) malloc(strlen(prog_name) + 6);
-    sprintf(trace_filename, "%s.rix", prog_name);
-    rixFile = fopen(trace_filename,"w+");
-
-    comma = 0;
-    
-    fprintf(rixFile,"START %s\n",prog_name);
-    fprintf(rixFile,"[");
-    tmpModule = modules;
-    for(;tmpModule != 0;tmpModule = tmpModule->next) {
-      if (comma) {
-	fprintf(rixFile,",");
-      } else {
-	comma = 1;
-      }
-      fprintf(rixFile,"(\"%s\",%u)",
-	      tmpModule->modName,
-	      tmpModule->tickCount);
-#if DEBUG_HPC
-      fprintf(stderr,"(tracer)%s: %u (offset=%u)\n",
-	      tmpModule->modName,
-	      tmpModule->tickCount,
-	      tmpModule->tickOffset);
-#endif
-    }
-    fprintf(rixFile,"]\n");
-    fflush(rixFile);
-  }
-  assert(rixFile != 0);
-
-  fprintf(rixFile,"%d\n",globIx);
-
-#if DEBUG_HPC
-  printf("end: hs_hpc_tick\n");
-#endif
-  
-}
 
 /* This is called after all the modules have registered their local tixboxes,
  * and does a sanity check: are we good to go?
@@ -324,83 +255,49 @@ hs_hpc_tick(int globIx) {
 
 void
 startupHpc(void) {
-  Info *tmpModule;
-#if DEBUG_HPC
-  printf("startupHpc\n");
-#endif
+  debugTrace(DEBUG_hpc,"startupHpc");
  
  if (hpc_inited == 0) {
     return;
   }
-
-  tmpModule = modules;
-
-  if (tixBoxes) {
-    for(;tmpModule != 0;tmpModule = tmpModule->next) {
-      if (!tmpModule->tixArr) {
-	fprintf(stderr,"error: module %s did not register any hpc tick data\n",
-		tmpModule->modName);
-	fprintf(stderr,"(perhaps remove %s ?)\n",tixFilename);
-	exit(-1);
-      }
-    }
-  }
 }
 
 
-/* Called at the end of execution, to write out the Hpc *.tix file  
- * for this exection. Safe to call, even if coverage is not used.
- */
-void
-exitHpc(void) {
-  Info *tmpModule;  
-  int i, comma;
+static void
+writeTix(FILE *f) {
+  HpcModuleInfo *tmpModule;  
+  int i, inner_comma, outer_comma;
 
-#if DEBUG_HPC
-  printf("exitHpc\n");
-#endif
+  outer_comma = 0;
 
-  if (hpc_inited == 0) {
+  if (f == 0) {
     return;
   }
 
-  FILE *f = fopen(tixFilename,"w");
-  
-  comma = 0;
-
-  fprintf(f,"Tix %" PRIuWORD64 " [", magicTixNumber);
+  fprintf(f,"Tix [");
   tmpModule = modules;
   for(;tmpModule != 0;tmpModule = tmpModule->next) {
-    if (comma) {
+    if (outer_comma) {
       fprintf(f,",");
     } else {
-      comma = 1;
+      outer_comma = 1;
     }
-    fprintf(f,"(\"%s\",%u)",
+    fprintf(f," TixModule \"%s\" %u %u [",
 	   tmpModule->modName,
+	    tmpModule->hashNo,
 	    tmpModule->tickCount);
-#if DEBUG_HPC
-    fprintf(stderr,"%s: %u (offset=%u)\n",
-	   tmpModule->modName,
-	   tmpModule->tickCount,
-	   tmpModule->tickOffset);
-#endif
-  }
-  fprintf(f,"] [");
-  
-  comma = 0;
-  tmpModule = modules;
-  for(;tmpModule != 0;tmpModule = tmpModule->next) {
-      if (!tmpModule->tixArr) {
-	fprintf(stderr,"warning: module %s did not register any hpc tick data\n",
-		tmpModule->modName);
-      }
+    debugTrace(DEBUG_hpc,"%s: %u (offset=%u) (hash=%u)\n",
+	       tmpModule->modName,
+	       tmpModule->tickCount,
+	       tmpModule->hashNo,
+	       tmpModule->tickOffset);
 
+    inner_comma = 0;
     for(i = 0;i < tmpModule->tickCount;i++) {
-      if (comma) {
+      if (inner_comma) {
 	fprintf(f,",");
       } else {
-	comma = 1;
+	inner_comma = 1;
       }
 
       if (tmpModule->tixArr) {
@@ -408,16 +305,68 @@ exitHpc(void) {
       } else {
 	fprintf(f,"0");
       }
-
     }
+    fprintf(f,"]");
   }
-      
   fprintf(f,"]\n");
+  
   fclose(f);
+}
+
+/* Called at the end of execution, to write out the Hpc *.tix file  
+ * for this exection. Safe to call, even if coverage is not used.
+ */
+void
+exitHpc(void) {
+  debugTrace(DEBUG_hpc,"exitHpc");
 
-  if (hpc_ticks_inited && rixFile != 0) {
-    fclose(rixFile);
+  if (hpc_inited == 0) {
+    return;
+  }
+
+  FILE *f = fopen(tixFilename,"w");
+  writeTix(f);
+}
+
+void hs_hpc_read(char *filename) {
+  HpcModuleInfo *orig_modules = 0, *tmpModule, *tmpOrigModule;
+  int i;
+
+  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;
+	}
+      }
+    }
   }
-  
 }
 
+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;
+}