X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=8411e614483f8097ac399e600bf78f8f23342cae;hb=61af839f961ea85dc80bed03313ee318fc02fa00;hp=456c8819203d3c087a1d85a1c6aaff17731ce210;hpb=75580f64702def71bc1e53f3e2c8cc5d09e0fa6e;p=ghc-hetmet.git

diff --git a/rts/Hpc.c b/rts/Hpc.c
index 456c881..8411e61 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -10,6 +10,7 @@
 
 #include "Rts.h"
 #include "Hpc.h"
+#include "Trace.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -21,14 +22,11 @@
  *
  */
 
-#define DEBUG_HPC 0
 #define WOP_SIZE 1024	
 
 static int hpc_inited = 0;		// Have you started this component?
-static int totalTickCount = 0;		// How many ticks have we got to work with
 static FILE *tixFile;			// file being read/written
 static int tix_ch;			// current char
-static StgWord64 magicTixNumber;	// Magic/Hash number to mark .tix files
 
 static FILE *rixFile = NULL;		// The tracer file/pipe (to debugger)
 static FILE *rixCmdFile = NULL;		// The tracer file/pipe (from debugger)
@@ -46,6 +44,7 @@ typedef struct _Info {
   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 _Info *next;
 } Info;
@@ -59,22 +58,23 @@ typedef struct _Info {
 
 Info *modules = 0;
 Info *nextModule = 0;
-StgWord64 *tixBoxes = 0;	// local copy of tixBoxes array, from file.
 int totalTixes = 0;		// total number of tix boxes.
 
 static char *tixFilename;
 
-
 static void failure(char *msg) {
+  debugTrace(DEBUG_hpc,"hpc failure: %s\n",msg);
   fprintf(stderr,"Hpc failure: %s\n",msg);
-  fprintf(stderr,"(perhaps remove .tix file?)\n");
+  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;
   }
@@ -84,8 +84,8 @@ static int init_open(char *filename)
 
 static void expect(char c) {
   if (tix_ch != c) {
-    fprintf(stderr,"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);
 }
@@ -120,56 +120,47 @@ static StgWord64 expectWord64(void) {
   return tmp;
 }
 
-static void hpc_init(void) {
+static void
+readTix(void) {
   int i;
-  Info *tmpModule;  
+  Info *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 = (Info *)calloc(1,sizeof(Info));
     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();
@@ -177,23 +168,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();
   }
 }
 
@@ -203,14 +205,15 @@ static void hpc_init(void) {
  */
 
 int
-hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr) {
+hs_hpc_module(char *modName,
+	      int modCount,
+	      int modHashNo,
+	      StgWord64 *tixArr) {
   Info *tmpModule, *lastModule;
   int i;
   int offset = 0;
   
-#if DEBUG_HPC
-  fprintf(stderr,"hs_hpc_module(%s,%d)\n",modName,modCount);
-#endif
+  debugTrace(DEBUG_hpc,"hs_hpc_module(%s,%d)",modName,modCount);
 
   hpc_init();
 
@@ -222,12 +225,18 @@ 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;
@@ -236,6 +245,7 @@ hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr) {
   tmpModule = (Info *)calloc(1,sizeof(Info));
   tmpModule->modName = modName;
   tmpModule->tickCount = modCount;
+  tmpModule->hashNo = modHashNo;
   if (lastModule) {
     tmpModule->tickOffset = lastModule->tickOffset + lastModule->tickCount;
   } else {
@@ -253,9 +263,8 @@ hs_hpc_module(char *modName,int modCount,StgWord64 *tixArr) {
     lastModule->next=tmpModule;
   }
 
-#if DEBUG_HPC
-  fprintf(stderr,"end: hs_hpc_module\n");
-#endif
+  debugTrace(DEBUG_hpc,"end: hs_hpc_module");
+
   return offset;
 }
 
@@ -284,9 +293,9 @@ hs_hpc_thread_finished_event(StgTSO *current_tso) {
 
 void
 hs_hpc_tick(int rixOp, StgTSO *current_tso) {
-#if DEBUG_HPC
-  fprintf(stderr,"hs_hpc_tick(%x)\n",rixOp);
-#endif
+
+  debugTrace(DEBUG_hpc,"hs_hpc_tick(%x)",rixOp);
+
   if (rixFile == NULL) {
     return;
   }
@@ -314,32 +323,35 @@ hs_hpc_tick(int rixOp, StgTSO *current_tso) {
   rixTidBack[rixCounter % WOP_SIZE] = tid;
   rixCounter++;
 
-#if DEBUG_HPC
-  fprintf(stderr,"end: hs_hpc_tick\n");
-#endif
+  debugTrace(DEBUG_hpc, "end: hs_hpc_tick");
 }
 
 static void 
 printEvent(FILE *out,StgWord64 rixCounter,StgThreadID rixTid,HpcRixOp rixOp) {
-#if DEBUG_HPC
-  if (out != stderr) {
-    printEvent(stderr,rixCounter,rixTid,rixOp);
-  }
-#endif
-  fprintf(out,"Event %" PRIuWORD64 " %u ",rixCounter,(unsigned int)rixTid);
+  char prefixMsg[128];
+  char suffixMsg[128];
+
+  sprintf(prefixMsg,
+	  "Event %" PRIuWORD64 " %u ",
+	  rixCounter,
+	  (unsigned int)rixTid);
+
   switch(rixOp) {
   case RixThreadFinishedOp:
-    fprintf(out,"ThreadFinished\n");
+    sprintf(suffixMsg,"ThreadFinished");
     break;
   case RixRaiseOp:
-    fprintf(out,"Raise\n");
+    sprintf(suffixMsg,"Raise");
     break;
   case RixFinishedOp:
-    fprintf(out,"Finished\n");
+    sprintf(suffixMsg,"Finished");
     break;
   default:
-    fprintf(out,"%u\n",rixOp);
+    sprintf(suffixMsg,"%u",rixOp);
   }
+
+  fprintf(out,"%s%s\n",prefixMsg,suffixMsg);
+  debugTrace(DEBUG_hpc,"sending %s%s",prefixMsg,suffixMsg);
 }
 
 static void
@@ -353,8 +365,11 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
     return;
   }
 
+  debugTrace(DEBUG_hpc,"breakPointCommand %d %x",rixOp,(unsigned int)rixTid);
+
   printEvent(rixFile,rixCounter,rixTid,rixOp);
   fflush(rixFile);
+
   /* From here, you can ask some basic questions.
    * 
    *  c<nat>		set the (one) counter breakpoint
@@ -375,9 +390,8 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
 	tmp64 = tmp64 * 10 + (c - '0');
 	c = getc(rixCmdFile);
       }
-#if DEBUG_HPC
-      fprintf(stderr,"setting countBP = %" PRIuWORD64 "\n",tmp64);
-#endif
+      debugTrace(DEBUG_hpc,"setting countBP = %" PRIuWORD64,tmp64);
+
       rixBPCounter = tmp64;
       break;
     case 's': // s2323  -- set tick box breakpoint at 2323
@@ -387,9 +401,9 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
 	tmp = tmp * 10 + (c - '0');
 	c = getc(rixCmdFile);
       }
-#if DEBUG_HPC
-      fprintf(stderr,"seting bp for tix %d\n",tmp);
-#endif
+
+      debugTrace(DEBUG_hpc,"seting bp for tix %d",tmp);
+
       tixBoxBP[tmp] = 1;
       break;
     case 'u': // u2323  -- unset tick box breakpoint at 2323
@@ -399,9 +413,9 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
 	tmp = tmp * 10 + (c - '0');
 	c = getc(rixCmdFile);
       }
-#if DEBUG_HPC
-      fprintf(stderr,"unseting bp for tix %d\n",tmp);
-#endif
+
+      debugTrace(DEBUG_hpc,"unseting bp for tix %d",tmp);
+
       tixBoxBP[tmp] = 0;
       break;
     case 'h': // h -- history of the last few (WOP_SIZE) steps 
@@ -411,15 +425,18 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
 	tmp64 = 0;
       }
       for(;tmp64 < rixCounter;tmp64++) {
-	printEvent(rixFile,tmp64,rixTidBack[tmp64 % WOP_SIZE],rixOpBack[tmp64 % WOP_SIZE]);
+	printEvent(rixFile,
+		   tmp64,
+		   rixTidBack[tmp64 % WOP_SIZE],
+		   rixOpBack[tmp64 % WOP_SIZE]);
       }
       fflush(rixFile);
       c = getc(rixCmdFile);
       break;
     default:
-#if DEBUG_HPC
-      fprintf(stderr,"strange command from HPCRIX (%d)\n",c);
-#endif
+
+      debugTrace(DEBUG_hpc,"strange command from HPCRIX (%d)",c);
+
       c = getc(rixCmdFile);
     }
     while (c != 10) {          // the end of the line
@@ -427,9 +444,9 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
     }
     c = getc(rixCmdFile); // the first char on the next command
   }
-#if DEBUG_HPC
-  fprintf(stderr,"re entering program\n");
-#endif
+
+  debugTrace(DEBUG_hpc,"leaving breakPointCommand");
+
 }
 
 /* This is called after all the modules have registered their local tixboxes,
@@ -438,31 +455,13 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) {
 
 void
 startupHpc(void) {
-  Info *tmpModule;
   char *hpcRix;
 
-#if DEBUG_HPC
-  fprintf(stderr,"startupHpc\n");
-#endif
+  debugTrace(DEBUG_hpc,"startupHpc");
  
  if (hpc_inited == 0) {
     return;
   }
-
-  tmpModule = modules;
-
-  if (tixBoxes) {
-    for(;tmpModule != 0;tmpModule = tmpModule->next) {
-      totalTickCount += tmpModule->tickCount;
-      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);
-      }
-    }
-  }
-
   // HPCRIX contains the name of the file to send our dynamic runtime output to (a named pipe).
 
   hpcRix = getenv("HPCRIX");
@@ -470,19 +469,18 @@ startupHpc(void) {
     int comma;
     Info *tmpModule;  
     int rixFD, rixCmdFD;
+    int tixCount = 0;
 
     assert(hpc_inited);
 
     if (sscanf(hpcRix,"%d:%d",&rixFD,&rixCmdFD) != 2) {
       /* Bad format for HPCRIX.
        */
-      fprintf(stderr,"Bad HPCRIX (%s)\n",hpcRix);
+      debugTrace(DEBUG_hpc,"Bad HPCRIX (%s)",hpcRix);
       exit(0);
     }
 
-#if DEBUG_HPC    
-    fprintf(stderr,"found HPCRIX pipes: %d:%d\n",rixFD,rixCmdFD);
-#endif
+    debugTrace(DEBUG_hpc,"found HPCRIX pipes: %d:%d",rixFD,rixCmdFD);
 
     rixFile = fdopen(rixFD,"w");
     assert(rixFile != NULL);
@@ -511,12 +509,15 @@ startupHpc(void) {
       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
+
+      tixCount += tmpModule->tickCount;
+
+      debugTrace(DEBUG_hpc,"(tracer)%s: %u (offset=%u) (hash=%u)\n",
+		 tmpModule->modName,
+		 tmpModule->tickCount,
+		 tmpModule->hashNo,
+		 tmpModule->tickOffset);
+
     }
     fprintf(rixFile,"]\n");
     fflush(rixFile);
@@ -524,65 +525,47 @@ startupHpc(void) {
     // Allocate the tixBox breakpoint array
     // These are set to 1 if you want to 
     // stop at a specific breakpoint
-    tixBoxBP = (int *)calloc(1,sizeof(int));
+    tixBoxBP = (int *)calloc(tixCount,sizeof(int));
   }
 
 }
 
 
-/* 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) {
+static void
+writeTix(FILE *f) {
   Info *tmpModule;  
-  int i, comma;
+  int i, inner_comma, outer_comma;
 
-#if DEBUG_HPC
-  fprintf(stderr,"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) {
@@ -590,12 +573,27 @@ 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_inited == 0) {
+    return;
+  }
+
+  FILE *f = fopen(tixFilename,"w");
+  writeTix(f);
 
   if (rixFile != NULL) {
     hs_hpc_tick(RixFinishedOp,(StgThreadID)0);
@@ -607,3 +605,40 @@ exitHpc(void) {
   
 }
 
+void hs_hpc_read(char *filename) {
+  Info *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"));
+}
+
+
+