diff options
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/ProfHeap.c | 22 | ||||
| -rw-r--r-- | rts/RtsFlags.c | 9 |
2 files changed, 3 insertions, 28 deletions
diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c index 0bd8423b4c..f880f5f406 100644 --- a/rts/ProfHeap.c +++ b/rts/ProfHeap.c @@ -1179,35 +1179,13 @@ heapCensusBlock(Census *census, bdescr *bd) case TSO: prim = true; -#if defined(PROFILING) - if (RtsFlags.ProfFlags.includeTSOs) { - size = sizeofW(StgTSO); - break; - } else { - // Skip this TSO and move on to the next object - p += sizeofW(StgTSO); - continue; - } -#else size = sizeofW(StgTSO); break; -#endif case STACK: prim = true; -#if defined(PROFILING) - if (RtsFlags.ProfFlags.includeTSOs) { - size = stack_sizeW((StgStack*)p); - break; - } else { - // Skip this TSO and move on to the next object - p += stack_sizeW((StgStack*)p); - continue; - } -#else size = stack_sizeW((StgStack*)p); break; -#endif case TREC_CHUNK: prim = true; diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index 380ccc3afc..f592f246db 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -214,7 +214,6 @@ void initRtsFlagsDefaults(void) RtsFlags.ProfFlags.heapProfileInterval = USToTime(100000); // 100ms #if defined(PROFILING) - RtsFlags.ProfFlags.includeTSOs = false; RtsFlags.ProfFlags.showCCSOnException = false; RtsFlags.ProfFlags.maxRetainerSetSize = 8; RtsFlags.ProfFlags.ccsLength = 25; @@ -1686,11 +1685,9 @@ error = true; case 't': /* Include memory used by TSOs in a heap profile */ OPTION_SAFE; - PROFILING_BUILD_ONLY( - RtsFlags.ProfFlags.includeTSOs = true; - ); - unchecked_arg_start++; - goto check_rest; + errorBelch("The -xt option has been removed (#16795)"); + error = true; + break; /* * The option prefix '-xx' is reserved for future |