From 5598dbc2d946f94ec4253450987d7a56336ef54a Mon Sep 17 00:00:00 2001 From: "andy@galois.com" Date: Tue, 26 Jun 2007 04:19:58 +0000 Subject: [PATCH] Cleanup Hpc sub-system, remove hpc-tracer implementation. --- rts/Exception.cmm | 3 - rts/Hpc.c | 291 ++--------------------------------------------------- rts/Schedule.c | 3 - 3 files changed, 11 insertions(+), 286 deletions(-) diff --git a/rts/Exception.cmm b/rts/Exception.cmm index 5f6bd07..346c949 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -375,9 +375,6 @@ raisezh_fast } #endif - /* Inform the Hpc that an exception has been thrown */ - foreign "C" hs_hpc_raise_event(CurrentTSO "ptr") []; - retry_pop_stack: StgTSO_sp(CurrentTSO) = Sp; frame_type = foreign "C" raiseExceptionHelper(BaseReg "ptr", CurrentTSO "ptr", exception "ptr") []; diff --git a/rts/Hpc.c b/rts/Hpc.c index 8411e61..7ad2666 100644 --- a/rts/Hpc.c +++ b/rts/Hpc.c @@ -28,26 +28,14 @@ static int hpc_inited = 0; // Have you started this component? static FILE *tixFile; // file being read/written static int tix_ch; // current char -static FILE *rixFile = NULL; // The tracer file/pipe (to debugger) -static FILE *rixCmdFile = NULL; // The tracer file/pipe (from debugger) -static StgWord64 rixCounter = 0; // The global event counter -static int debuggee_pid; - -typedef enum { - RixThreadFinishedOp = -1, - RixRaiseOp = -2, - RixFinishedOp = -3 -} HpcRixOp; - - -typedef struct _Info { +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 _Info *next; -} Info; + struct _HpcModuleInfo *next; +} HpcModuleInfo; // This is a cruel hack, we should completely redesign the format specifier handling in the RTS. #if SIZEOF_LONG == 8 @@ -56,8 +44,8 @@ typedef struct _Info { #define PRIuWORD64 "llu" #endif -Info *modules = 0; -Info *nextModule = 0; +HpcModuleInfo *modules = 0; +HpcModuleInfo *nextModule = 0; int totalTixes = 0; // total number of tix boxes. static char *tixFilename; @@ -123,7 +111,7 @@ static StgWord64 expectWord64(void) { static void readTix(void) { int i; - Info *tmpModule; + HpcModuleInfo *tmpModule; totalTixes = 0; @@ -136,7 +124,7 @@ readTix(void) { ws(); while(tix_ch != ']') { - tmpModule = (Info *)calloc(1,sizeof(Info)); + tmpModule = (HpcModuleInfo *)calloc(1,sizeof(HpcModuleInfo)); expect('T'); expect('i'); expect('x'); @@ -209,7 +197,7 @@ hs_hpc_module(char *modName, int modCount, int modHashNo, StgWord64 *tixArr) { - Info *tmpModule, *lastModule; + HpcModuleInfo *tmpModule, *lastModule; int i; int offset = 0; @@ -242,7 +230,7 @@ hs_hpc_module(char *modName, 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; @@ -268,186 +256,6 @@ hs_hpc_module(char *modName, return offset; } -static void breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid); - -// Breakpointing -static StgThreadID previousTid = 0; -static StgWord64 rixBPCounter = 0; // The global event breakpoint counter -static int *tixBoxBP; -static HpcRixOp rixOpBack[WOP_SIZE]; // The actual op -static HpcRixOp rixTidBack[WOP_SIZE]; // Tid's before the op - -void -hs_hpc_raise_event(StgTSO *current_tso) { - hs_hpc_tick(RixRaiseOp,current_tso); -} - -void -hs_hpc_thread_finished_event(StgTSO *current_tso) { - hs_hpc_tick(RixThreadFinishedOp,current_tso); -} - -/* Called on every tick, dynamically, sending to our - * external record of program execution. - */ - -void -hs_hpc_tick(int rixOp, StgTSO *current_tso) { - - debugTrace(DEBUG_hpc,"hs_hpc_tick(%x)",rixOp); - - if (rixFile == NULL) { - return; - } - assert(rixCmdFile != NULL); - StgThreadID tid = (current_tso == 0) ? 0 : current_tso->id; - - // now check to see if we have met a breakpoint condition - if (rixCounter == rixBPCounter - || tid != previousTid) { - breakPointCommand(rixOp,tid); - } else { - if (rixOp >= 0) { - // Tix op - if (tixBoxBP[rixOp] == 1) { // reached a bp tixbox - breakPointCommand(rixOp,tid); - } - } else { - // record the special operation - breakPointCommand(rixOp,tid); - } - } - // update the history information. - previousTid = tid; - rixOpBack[rixCounter % WOP_SIZE] = rixOp; - rixTidBack[rixCounter % WOP_SIZE] = tid; - rixCounter++; - - debugTrace(DEBUG_hpc, "end: hs_hpc_tick"); -} - -static void -printEvent(FILE *out,StgWord64 rixCounter,StgThreadID rixTid,HpcRixOp rixOp) { - char prefixMsg[128]; - char suffixMsg[128]; - - sprintf(prefixMsg, - "Event %" PRIuWORD64 " %u ", - rixCounter, - (unsigned int)rixTid); - - switch(rixOp) { - case RixThreadFinishedOp: - sprintf(suffixMsg,"ThreadFinished"); - break; - case RixRaiseOp: - sprintf(suffixMsg,"Raise"); - break; - case RixFinishedOp: - sprintf(suffixMsg,"Finished"); - break; - default: - sprintf(suffixMsg,"%u",rixOp); - } - - fprintf(out,"%s%s\n",prefixMsg,suffixMsg); - debugTrace(DEBUG_hpc,"sending %s%s",prefixMsg,suffixMsg); -} - -static void -breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) { - StgWord64 tmp64 = 0; - unsigned int tmp = 0; - - if (getpid() != debuggee_pid) { - // We are not the original process, to do not issue - // any events, and do not try to talk to the debugger. - 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 set the (one) counter breakpoint - * s set the (many) tickbox breakpoint - * u unset the (many) tickbox breakpoint - * h history - - * Note that you aways end up here on the first tick - * because the rixBPCounter starts equal to 0. - */ - int c = getc(rixCmdFile); - while(c != 10 && c != -1) { - switch(c) { - case 'c': // c1234 -- set counter breakpoint at 1234 - c = getc(rixCmdFile); - tmp64 = 0; - while(isdigit(c)) { - tmp64 = tmp64 * 10 + (c - '0'); - c = getc(rixCmdFile); - } - debugTrace(DEBUG_hpc,"setting countBP = %" PRIuWORD64,tmp64); - - rixBPCounter = tmp64; - break; - case 's': // s2323 -- set tick box breakpoint at 2323 - c = getc(rixCmdFile); - tmp = 0; - while(isdigit(c)) { - tmp = tmp * 10 + (c - '0'); - c = getc(rixCmdFile); - } - - debugTrace(DEBUG_hpc,"seting bp for tix %d",tmp); - - tixBoxBP[tmp] = 1; - break; - case 'u': // u2323 -- unset tick box breakpoint at 2323 - c = getc(rixCmdFile); - tmp = 0; - while(isdigit(c)) { - tmp = tmp * 10 + (c - '0'); - c = getc(rixCmdFile); - } - - debugTrace(DEBUG_hpc,"unseting bp for tix %d",tmp); - - tixBoxBP[tmp] = 0; - break; - case 'h': // h -- history of the last few (WOP_SIZE) steps - if (rixCounter > WOP_SIZE) { - tmp64 = rixCounter - WOP_SIZE; - } else { - tmp64 = 0; - } - for(;tmp64 < rixCounter;tmp64++) { - printEvent(rixFile, - tmp64, - rixTidBack[tmp64 % WOP_SIZE], - rixOpBack[tmp64 % WOP_SIZE]); - } - fflush(rixFile); - c = getc(rixCmdFile); - break; - default: - - debugTrace(DEBUG_hpc,"strange command from HPCRIX (%d)",c); - - c = getc(rixCmdFile); - } - while (c != 10) { // the end of the line - c = getc(rixCmdFile); // to the end of the line - } - c = getc(rixCmdFile); // the first char on the next command - } - - debugTrace(DEBUG_hpc,"leaving breakPointCommand"); - -} /* This is called after all the modules have registered their local tixboxes, * and does a sanity check: are we good to go? @@ -455,85 +263,17 @@ breakPointCommand(HpcRixOp rixOp, StgThreadID rixTid) { void startupHpc(void) { - char *hpcRix; - debugTrace(DEBUG_hpc,"startupHpc"); if (hpc_inited == 0) { return; } - // HPCRIX contains the name of the file to send our dynamic runtime output to (a named pipe). - - hpcRix = getenv("HPCRIX"); - if (hpcRix) { - 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. - */ - debugTrace(DEBUG_hpc,"Bad HPCRIX (%s)",hpcRix); - exit(0); - } - - debugTrace(DEBUG_hpc,"found HPCRIX pipes: %d:%d",rixFD,rixCmdFD); - - rixFile = fdopen(rixFD,"w"); - assert(rixFile != NULL); - - rixCmdFile = fdopen(rixCmdFD,"r"); - assert(rixCmdFile != NULL); - - // If we fork a process, then we do not want ticks inside - // the sub-process to talk to the debugger. So we remember - // our pid at startup time, so we can check if we are still - // the original process. - - debuggee_pid = getpid(); - - comma = 0; - - fprintf(rixFile,"Starting %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); - - 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); - - // Allocate the tixBox breakpoint array - // These are set to 1 if you want to - // stop at a specific breakpoint - tixBoxBP = (int *)calloc(tixCount,sizeof(int)); - } - } static void writeTix(FILE *f) { - Info *tmpModule; + HpcModuleInfo *tmpModule; int i, inner_comma, outer_comma; outer_comma = 0; @@ -594,19 +334,10 @@ exitHpc(void) { FILE *f = fopen(tixFilename,"w"); writeTix(f); - - if (rixFile != NULL) { - hs_hpc_tick(RixFinishedOp,(StgThreadID)0); - fclose(rixFile); - } - if (rixCmdFile != NULL) { - fclose(rixCmdFile); - } - } void hs_hpc_read(char *filename) { - Info *orig_modules = 0, *tmpModule, *tmpOrigModule; + HpcModuleInfo *orig_modules = 0, *tmpModule, *tmpOrigModule; int i; orig_modules = modules; diff --git a/rts/Schedule.c b/rts/Schedule.c index f3d956a..c61287f 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -1813,9 +1813,6 @@ scheduleHandleThreadFinished (Capability *cap STG_UNUSED, Task *task, StgTSO *t) debugTrace(DEBUG_sched, "--++ thread %lu (%s) finished", (unsigned long)t->id, whatNext_strs[t->what_next]); - /* Inform the Hpc that a thread has finished */ - hs_hpc_thread_finished_event(t); - #if defined(GRAN) endThread(t, CurrentProc); // clean-up the thread #elif defined(PARALLEL_HASKELL) -- 1.7.10.4