X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FPrinter.c;h=fcc483dce6e934d815b1756c92cde4be7ca230e2;hp=d46283cbb35a38e48eecbccdb6d22c0b050bed06;hb=cf5905ea24904cf73a041fd7535e8723a668cb9a;hpb=e724120ffcc8fe28c59ecef2fbbc94d7c67b92d0 diff --git a/rts/Printer.c b/rts/Printer.c index d46283c..fcc483d 100644 --- a/rts/Printer.c +++ b/rts/Printer.c @@ -8,26 +8,18 @@ #include "PosixSource.h" #include "Rts.h" +#include "rts/Bytecodes.h" /* for InstrPtr */ + #include "Printer.h" #include "RtsUtils.h" +#include + #ifdef DEBUG -#include "RtsFlags.h" -#include "MBlock.h" -#include "Bytecodes.h" /* for InstrPtr */ #include "Disassembler.h" #include "Apply.h" -#include -#include - -#if defined(GRAN) || defined(PAR) -// HWL: explicit fixed header size to make debugging easier -int fixed_hs = sizeof(StgHeader), itbl_sz = sizeofW(StgInfoTable), - uf_sz=sizeofW(StgUpdateFrame); -#endif - /* -------------------------------------------------------------------------- * local function decls * ------------------------------------------------------------------------*/ @@ -43,7 +35,6 @@ static rtsBool lookup_name ( char *name, StgWord *result ); static void enZcode ( char *in, char *out ); #endif static char unZcode ( char ch ); -const char * lookupGHCName ( void *addr ); static void printZcoded ( const char *raw ); /* -------------------------------------------------------------------------- @@ -121,8 +112,9 @@ printThunkObject( StgThunk *obj, char* tag ) void printClosure( StgClosure *obj ) { + obj = UNTAG_CLOSURE(obj); + StgInfoTable *info; - info = get_itbl(obj); switch ( info->type ) { @@ -136,21 +128,16 @@ printClosure( StgClosure *obj ) case CONSTR_NOCAF_STATIC: { StgWord i, j; + StgConInfoTable *con_info = get_con_itbl (obj); -#ifdef PROFILING - debugBelch("%s(", GET_PROF_DESC(info)); - debugBelch("%s", obj->header.prof.ccs->cc->label); -#else - debugBelch("CONSTR("); - printPtr((StgPtr)obj->header.info); - debugBelch("(tag=%d)",info->srt_bitmap); -#endif + debugBelch("%s(", GET_CON_DESC(con_info)); for (i = 0; i < info->layout.payload.ptrs; ++i) { - debugBelch(", "); + if (i != 0) debugBelch(", "); printPtr((StgPtr)obj->payload[i]); } for (j = 0; j < info->layout.payload.nptrs; ++j) { - debugBelch(", %p#", obj->payload[i+j]); + if (i != 0 || j != 0) debugBelch(", "); + debugBelch("%p#", obj->payload[i+j]); } debugBelch(")\n"); break; @@ -168,6 +155,12 @@ printClosure( StgClosure *obj ) printStdObjPayload(obj); break; + case PRIM: + debugBelch("PRIM("); + printPtr((StgPtr)obj->header.info); + printStdObjPayload(obj); + break; + case THUNK: case THUNK_1_0: case THUNK_0_1: case THUNK_1_1: case THUNK_0_2: case THUNK_2_0: @@ -191,7 +184,7 @@ printClosure( StgClosure *obj ) case AP: { - StgAP* ap = stgCast(StgAP*,obj); + StgAP* ap = (StgAP*)obj; StgWord i; debugBelch("AP("); printPtr((StgPtr)ap->fun); for (i = 0; i < ap->n_args; ++i) { @@ -204,7 +197,7 @@ printClosure( StgClosure *obj ) case PAP: { - StgPAP* pap = stgCast(StgPAP*,obj); + StgPAP* pap = (StgPAP*)obj; StgWord i; debugBelch("PAP/%d(",pap->arity); printPtr((StgPtr)pap->fun); @@ -218,7 +211,7 @@ printClosure( StgClosure *obj ) case AP_STACK: { - StgAP_STACK* ap = stgCast(StgAP_STACK*,obj); + StgAP_STACK* ap = (StgAP_STACK*)obj; StgWord i; debugBelch("AP_STACK("); printPtr((StgPtr)ap->fun); for (i = 0; i < ap->size; ++i) { @@ -231,31 +224,25 @@ printClosure( StgClosure *obj ) case IND: debugBelch("IND("); - printPtr((StgPtr)stgCast(StgInd*,obj)->indirectee); - debugBelch(")\n"); - break; - - case IND_OLDGEN: - debugBelch("IND_OLDGEN("); - printPtr((StgPtr)stgCast(StgInd*,obj)->indirectee); + printPtr((StgPtr)((StgInd*)obj)->indirectee); debugBelch(")\n"); break; case IND_PERM: debugBelch("IND("); - printPtr((StgPtr)stgCast(StgInd*,obj)->indirectee); + printPtr((StgPtr)((StgInd*)obj)->indirectee); debugBelch(")\n"); break; - case IND_OLDGEN_PERM: - debugBelch("IND_OLDGEN_PERM("); - printPtr((StgPtr)stgCast(StgInd*,obj)->indirectee); + case IND_STATIC: + debugBelch("IND_STATIC("); + printPtr((StgPtr)((StgInd*)obj)->indirectee); debugBelch(")\n"); break; - case IND_STATIC: - debugBelch("IND_STATIC("); - printPtr((StgPtr)stgCast(StgInd*,obj)->indirectee); + case BLACKHOLE: + debugBelch("BLACKHOLE("); + printPtr((StgPtr)((StgInd*)obj)->indirectee); debugBelch(")\n"); break; @@ -269,7 +256,7 @@ printClosure( StgClosure *obj ) case UPDATE_FRAME: { - StgUpdateFrame* u = stgCast(StgUpdateFrame*,obj); + StgUpdateFrame* u = (StgUpdateFrame*)obj; debugBelch("UPDATE_FRAME("); printPtr((StgPtr)GET_INFO(u)); debugBelch(","); @@ -280,7 +267,7 @@ printClosure( StgClosure *obj ) case CATCH_FRAME: { - StgCatchFrame* u = stgCast(StgCatchFrame*,obj); + StgCatchFrame* u = (StgCatchFrame*)obj; debugBelch("CATCH_FRAME("); printPtr((StgPtr)GET_INFO(u)); debugBelch(","); @@ -289,40 +276,29 @@ printClosure( StgClosure *obj ) break; } + case UNDERFLOW_FRAME: + { + StgUnderflowFrame* u = (StgUnderflowFrame*)obj; + debugBelch("UNDERFLOW_FRAME("); + printPtr((StgPtr)u->next_chunk); + debugBelch(")\n"); + break; + } + case STOP_FRAME: { - StgStopFrame* u = stgCast(StgStopFrame*,obj); + StgStopFrame* u = (StgStopFrame*)obj; debugBelch("STOP_FRAME("); printPtr((StgPtr)GET_INFO(u)); debugBelch(")\n"); break; } - case CAF_BLACKHOLE: - debugBelch("CAF_BH"); - break; - - case BLACKHOLE: - debugBelch("BH\n"); - break; - - case SE_BLACKHOLE: - debugBelch("SE_BH\n"); - break; - - case SE_CAF_BLACKHOLE: - debugBelch("SE_CAF_BH\n"); - break; - case ARR_WORDS: { StgWord i; debugBelch("ARR_WORDS(\""); - /* ToDo: we can't safely assume that this is a string! - for (i = 0; arrWordsGetChar(obj,i); ++i) { - putchar(arrWordsGetChar(obj,i)); - } */ - for (i=0; i<((StgArrWords *)obj)->words; i++) + for (i=0; ipayload[i]); debugBelch("\")\n"); break; @@ -340,7 +316,8 @@ printClosure( StgClosure *obj ) debugBelch("MUT_ARR_PTRS_FROZEN(size=%lu)\n", (lnat)((StgMutArrPtrs *)obj)->ptrs); break; - case MVAR: + case MVAR_CLEAN: + case MVAR_DIRTY: { StgMVar* mv = (StgMVar*)obj; debugBelch("MVAR(head=%p, tail=%p, value=%p)\n", mv->head, mv->tail, mv->value); @@ -371,47 +348,12 @@ printClosure( StgClosure *obj ) /* ToDo: chase 'link' ? */ break; - case STABLE_NAME: - debugBelch("STABLE_NAME(%lu)\n", (lnat)((StgStableName*)obj)->sn); - break; - case TSO: debugBelch("TSO("); debugBelch("%lu (%p)",(unsigned long)(((StgTSO*)obj)->id), (StgTSO*)obj); debugBelch(")\n"); break; -#if defined(PAR) - case BLOCKED_FETCH: - debugBelch("BLOCKED_FETCH("); - printGA(&(stgCast(StgBlockedFetch*,obj)->ga)); - printPtr((StgPtr)(stgCast(StgBlockedFetch*,obj)->node)); - debugBelch(")\n"); - break; - - case FETCH_ME: - debugBelch("FETCH_ME("); - printGA((globalAddr *)stgCast(StgFetchMe*,obj)->ga); - debugBelch(")\n"); - break; - - case FETCH_ME_BQ: - debugBelch("FETCH_ME_BQ("); - // printGA((globalAddr *)stgCast(StgFetchMe*,obj)->ga); - printPtr((StgPtr)stgCast(StgFetchMeBlockingQueue*,obj)->blocking_queue); - debugBelch(")\n"); - break; -#endif - -#if defined(GRAN) || defined(PAR) - case RBH: - debugBelch("RBH("); - printPtr((StgPtr)stgCast(StgRBH*,obj)->blocking_queue); - debugBelch(")\n"); - break; - -#endif - #if 0 /* Symptomatic of a problem elsewhere, have it fall-through & fail */ case EVACUATED: @@ -421,14 +363,6 @@ printClosure( StgClosure *obj ) break; #endif -#if defined(PAR) && defined(DIST) - case REMOTE_REF: - debugBelch("REMOTE_REF("); - printGA((globalAddr *)stgCast(StgFetchMe*,obj)->ga); - debugBelch(")\n"); - break; -#endif - default: //barf("printClosure %d",get_itbl(obj)->type); debugBelch("*** printClosure: unknown type %d ****\n", @@ -536,13 +470,11 @@ printStackChunk( StgPtr sp, StgPtr spBottom ) case UPDATE_FRAME: case CATCH_FRAME: - printObj((StgClosure*)sp); + case UNDERFLOW_FRAME: + case STOP_FRAME: + printObj((StgClosure*)sp); continue; - case STOP_FRAME: - printObj((StgClosure*)sp); - return; - case RET_DYN: { StgRetDyn* r; @@ -634,104 +566,8 @@ printStackChunk( StgPtr sp, StgPtr spBottom ) void printTSO( StgTSO *tso ) { - printStackChunk( tso->sp, tso->stack+tso->stack_size); -} - -/* ----------------------------------------------------------------------------- - Closure types - - NOTE: must be kept in sync with the closure types in includes/ClosureTypes.h - -------------------------------------------------------------------------- */ - -static char *closure_type_names[] = { - "INVALID_OBJECT", - "CONSTR", - "CONSTR_1", - "CONSTR_0", - "CONSTR_2", - "CONSTR_1", - "CONSTR_0", - "CONSTR_STATIC", - "CONSTR_NOCAF_STATIC", - "FUN", - "FUN_1_0", - "FUN_0_1", - "FUN_2_0", - "FUN_1_1", - "FUN_0", - "FUN_STATIC", - "THUNK", - "THUNK_1_0", - "THUNK_0_1", - "THUNK_2_0", - "THUNK_1_1", - "THUNK_0", - "THUNK_STATIC", - "THUNK_SELECTOR", - "BCO", - "AP_UPD", - "PAP", - "AP_STACK", - "IND", - "IND_OLDGEN", - "IND_PERM", - "IND_OLDGEN_PERM", - "IND_STATIC", - "RET_BCO", - "RET_SMALL", - "RET_BIG", - "RET_DYN", - "RET_FUN", - "UPDATE_FRAME", - "CATCH_FRAME", - "STOP_FRAME", - "CAF_BLACKHOLE", - "BLACKHOLE", - "BLACKHOLE_BQ", - "SE_BLACKHOLE", - "SE_CAF_BLACKHOLE", - "MVAR", - "ARR_WORDS", - "MUT_ARR_PTRS_CLEAN", - "MUT_ARR_PTRS_DIRTY", - "MUT_ARR_PTRS_FROZEN", - "MUT_VAR_CLEAN", - "MUT_VAR_DIRTY", - "MUT_CONS", - "WEAK", - "FOREIGN", - "STABLE_NAME", - "TSO", - "BLOCKED_FETCH", - "FETCH_ME", - "FETCH_ME_BQ", - "RBH", - "EVACUATED", - "REMOTE_REF", - "TVAR_WATCH_QUEUE", - "INVARIANT_CHECK_QUEUE", - "ATOMIC_INVARIANT", - "TVAR", - "TREC_CHUNK", - "TREC_HEADER", - "ATOMICALLY_FRAME", - "CATCH_RETRY_FRAME" -}; - - -char * -info_type(StgClosure *closure){ - return closure_type_names[get_itbl(closure)->type]; -} - -char * -info_type_by_ip(StgInfoTable *ip){ - return closure_type_names[ip->type]; -} - -void -info_hdr_type(StgClosure *closure, char *res){ - strcpy(res,closure_type_names[get_itbl(closure)->type]); + printStackChunk( tso->stackobj->sp, + tso->stackobj->stack+tso->stackobj->stack_size); } /* -------------------------------------------------------------------------- @@ -1069,19 +905,31 @@ int searched = 0; static int findPtrBlocks (StgPtr p, bdescr *bd, StgPtr arr[], int arr_size, int i) { - StgPtr q, r; + StgPtr q, r, end; for (; bd; bd = bd->link) { searched++; for (q = bd->start; q < bd->free; q++) { if (UNTAG_CLOSURE((StgClosure*)*q) == (StgClosure *)p) { if (i < arr_size) { - r = q; - while (HEAP_ALLOCED((StgPtr)*r) || !LOOKS_LIKE_INFO_PTR(*r) || (P_)*r == NULL) { - r--; + for (r = bd->start; r < bd->free; r = end) { + // skip over zeroed-out slop + while (*r == 0) r++; + if (!LOOKS_LIKE_CLOSURE_PTR(r)) { + debugBelch("%p found at %p, no closure at %p\n", + p, q, r); + break; + } + end = r + closure_sizeW((StgClosure*)r); + if (q < end) { + debugBelch("%p = ", r); + printClosure((StgClosure *)r); + arr[i++] = r; + break; + } + } + if (r >= bd->free) { + debugBelch("%p found at %p, closure?", p, q); } - debugBelch("%p = ", r); - printClosure((StgClosure *)r); - arr[i++] = r; } else { return i; } @@ -1094,25 +942,19 @@ findPtrBlocks (StgPtr p, bdescr *bd, StgPtr arr[], int arr_size, int i) void findPtr(P_ p, int follow) { - nat s, g; + nat g; bdescr *bd; -#if defined(__GNUC__) const int arr_size = 1024; -#else -#define arr_size 1024 -#endif StgPtr arr[arr_size]; int i = 0; searched = 0; for (g = 0; g < RtsFlags.GcFlags.generations; g++) { - for (s = 0; s < generations[g].n_steps; s++) { - bd = generations[g].steps[s].blocks; - i = findPtrBlocks(p,bd,arr,arr_size,i); - bd = generations[g].steps[s].large_objects; - i = findPtrBlocks(p,bd,arr,arr_size,i); - if (i >= arr_size) return; - } + bd = generations[g].blocks; + i = findPtrBlocks(p,bd,arr,arr_size,i); + bd = generations[g].large_objects; + i = findPtrBlocks(p,bd,arr,arr_size,i); + if (i >= arr_size) return; } if (follow && i == 1) { debugBelch("-->\n"); @@ -1147,9 +989,7 @@ void prettyPrintClosure_ (StgClosure *obj) while (type == IND || type == IND_STATIC || - type == IND_OLDGEN || - type == IND_PERM || - type == IND_OLDGEN_PERM) + type == IND_PERM) { obj = ((StgInd *)obj)->indirectee; type = get_itbl(obj)->type; @@ -1202,6 +1042,14 @@ void prettyPrintClosure_ (StgClosure *obj) } } +char *what_next_strs[] = { + [0] = "(unknown)", + [ThreadRunGHC] = "ThreadRunGHC", + [ThreadInterpret] = "ThreadInterpret", + [ThreadKilled] = "ThreadKilled", + [ThreadComplete] = "ThreadComplete" +}; + #else /* DEBUG */ void printPtr( StgPtr p ) { @@ -1215,3 +1063,89 @@ void printObj( StgClosure *obj ) #endif /* DEBUG */ + +/* ----------------------------------------------------------------------------- + Closure types + + NOTE: must be kept in sync with the closure types in includes/ClosureTypes.h + -------------------------------------------------------------------------- */ + +char *closure_type_names[] = { + [INVALID_OBJECT] = "INVALID_OBJECT", + [CONSTR] = "CONSTR", + [CONSTR_1_0] = "CONSTR_1_0", + [CONSTR_0_1] = "CONSTR_0_1", + [CONSTR_2_0] = "CONSTR_2_0", + [CONSTR_1_1] = "CONSTR_1_1", + [CONSTR_0_2] = "CONSTR_0_2", + [CONSTR_STATIC] = "CONSTR_STATIC", + [CONSTR_NOCAF_STATIC] = "CONSTR_NOCAF_STATIC", + [FUN] = "FUN", + [FUN_1_0] = "FUN_1_0", + [FUN_0_1] = "FUN_0_1", + [FUN_2_0] = "FUN_2_0", + [FUN_1_1] = "FUN_1_1", + [FUN_0_2] = "FUN_0_2", + [FUN_STATIC] = "FUN_STATIC", + [THUNK] = "THUNK", + [THUNK_1_0] = "THUNK_1_0", + [THUNK_0_1] = "THUNK_0_1", + [THUNK_2_0] = "THUNK_2_0", + [THUNK_1_1] = "THUNK_1_1", + [THUNK_0_2] = "THUNK_0_2", + [THUNK_STATIC] = "THUNK_STATIC", + [THUNK_SELECTOR] = "THUNK_SELECTOR", + [BCO] = "BCO", + [AP] = "AP", + [PAP] = "PAP", + [AP_STACK] = "AP_STACK", + [IND] = "IND", + [IND_PERM] = "IND_PERM", + [IND_STATIC] = "IND_STATIC", + [RET_BCO] = "RET_BCO", + [RET_SMALL] = "RET_SMALL", + [RET_BIG] = "RET_BIG", + [RET_DYN] = "RET_DYN", + [RET_FUN] = "RET_FUN", + [UPDATE_FRAME] = "UPDATE_FRAME", + [CATCH_FRAME] = "CATCH_FRAME", + [UNDERFLOW_FRAME] = "UNDERFLOW_FRAME", + [STOP_FRAME] = "STOP_FRAME", + [BLACKHOLE] = "BLACKHOLE", + [BLOCKING_QUEUE] = "BLOCKING_QUEUE", + [MVAR_CLEAN] = "MVAR_CLEAN", + [MVAR_DIRTY] = "MVAR_DIRTY", + [ARR_WORDS] = "ARR_WORDS", + [MUT_ARR_PTRS_CLEAN] = "MUT_ARR_PTRS_CLEAN", + [MUT_ARR_PTRS_DIRTY] = "MUT_ARR_PTRS_DIRTY", + [MUT_ARR_PTRS_FROZEN0] = "MUT_ARR_PTRS_FROZEN0", + [MUT_ARR_PTRS_FROZEN] = "MUT_ARR_PTRS_FROZEN", + [MUT_VAR_CLEAN] = "MUT_VAR_CLEAN", + [MUT_VAR_DIRTY] = "MUT_VAR_DIRTY", + [WEAK] = "WEAK", + [PRIM] = "PRIM", + [MUT_PRIM] = "MUT_PRIM", + [TSO] = "TSO", + [STACK] = "STACK", + [TREC_CHUNK] = "TREC_CHUNK", + [ATOMICALLY_FRAME] = "ATOMICALLY_FRAME", + [CATCH_RETRY_FRAME] = "CATCH_RETRY_FRAME", + [CATCH_STM_FRAME] = "CATCH_STM_FRAME", + [WHITEHOLE] = "WHITEHOLE" +}; + +char * +info_type(StgClosure *closure){ + return closure_type_names[get_itbl(closure)->type]; +} + +char * +info_type_by_ip(StgInfoTable *ip){ + return closure_type_names[ip->type]; +} + +void +info_hdr_type(StgClosure *closure, char *res){ + strcpy(res,closure_type_names[get_itbl(closure)->type]); +} +