diff options
| author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-06-05 17:00:22 +0300 |
|---|---|---|
| committer | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-06-05 17:00:34 +0300 |
| commit | 4075656e8bb2338d9857acfa54f8b9c5e0661f44 (patch) | |
| tree | e2aed739e695ff3d12d5f071ff8214c38a07abae /rts/RetainerProfile.c | |
| parent | 8ed8b037fee9611b1c4ef49adb6cf50bbd929a27 (diff) | |
| download | haskell-4075656e8bb2338d9857acfa54f8b9c5e0661f44.tar.gz | |
Rename some mutable closure types for consistency
SMALL_MUT_ARR_PTRS_FROZEN0 -> SMALL_MUT_ARR_PTRS_FROZEN_DIRTY
SMALL_MUT_ARR_PTRS_FROZEN -> SMALL_MUT_ARR_PTRS_FROZEN_CLEAN
MUT_ARR_PTRS_FROZEN0 -> MUT_ARR_PTRS_FROZEN_DIRTY
MUT_ARR_PTRS_FROZEN -> MUT_ARR_PTRS_FROZEN_CLEAN
Naming is now consistent with other CLEAR/DIRTY objects (MVAR, MUT_VAR,
MUT_ARR_PTRS).
(alternatively we could rename MVAR_DIRTY/MVAR_CLEAN etc. to MVAR0/MVAR)
Removed a few comments in Scav.c about FROZEN0 being on the mut_list
because it's now clear from the closure type.
Reviewers: bgamari, simonmar, erikd
Reviewed By: simonmar
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4784
Diffstat (limited to 'rts/RetainerProfile.c')
| -rw-r--r-- | rts/RetainerProfile.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c index 0931d46a6d..b7c85e63cd 100644 --- a/rts/RetainerProfile.c +++ b/rts/RetainerProfile.c @@ -465,8 +465,8 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child ) // StgMutArrPtr.ptrs, no SRT case MUT_ARR_PTRS_CLEAN: case MUT_ARR_PTRS_DIRTY: - case MUT_ARR_PTRS_FROZEN: - case MUT_ARR_PTRS_FROZEN0: + case MUT_ARR_PTRS_FROZEN_CLEAN: + case MUT_ARR_PTRS_FROZEN_DIRTY: init_ptrs(&se.info, ((StgMutArrPtrs *)c)->ptrs, (StgPtr)(((StgMutArrPtrs *)c)->payload)); *first_child = find_ptrs(&se.info); @@ -477,8 +477,8 @@ push( StgClosure *c, retainer c_child_r, StgClosure **first_child ) // StgMutArrPtr.ptrs, no SRT case SMALL_MUT_ARR_PTRS_CLEAN: case SMALL_MUT_ARR_PTRS_DIRTY: - case SMALL_MUT_ARR_PTRS_FROZEN: - case SMALL_MUT_ARR_PTRS_FROZEN0: + case SMALL_MUT_ARR_PTRS_FROZEN_CLEAN: + case SMALL_MUT_ARR_PTRS_FROZEN_DIRTY: init_ptrs(&se.info, ((StgSmallMutArrPtrs *)c)->ptrs, (StgPtr)(((StgSmallMutArrPtrs *)c)->payload)); *first_child = find_ptrs(&se.info); @@ -809,8 +809,8 @@ pop( StgClosure **c, StgClosure **cp, retainer *r ) // StgMutArrPtr.ptrs, no SRT case MUT_ARR_PTRS_CLEAN: case MUT_ARR_PTRS_DIRTY: - case MUT_ARR_PTRS_FROZEN: - case MUT_ARR_PTRS_FROZEN0: + case MUT_ARR_PTRS_FROZEN_CLEAN: + case MUT_ARR_PTRS_FROZEN_DIRTY: *c = find_ptrs(&se->info); if (*c == NULL) { popOff(); @@ -1031,10 +1031,10 @@ isRetainer( StgClosure *c ) // STM case TREC_CHUNK: // immutable arrays - case MUT_ARR_PTRS_FROZEN: - case MUT_ARR_PTRS_FROZEN0: - case SMALL_MUT_ARR_PTRS_FROZEN: - case SMALL_MUT_ARR_PTRS_FROZEN0: + case MUT_ARR_PTRS_FROZEN_CLEAN: + case MUT_ARR_PTRS_FROZEN_DIRTY: + case SMALL_MUT_ARR_PTRS_FROZEN_CLEAN: + case SMALL_MUT_ARR_PTRS_FROZEN_DIRTY: return false; // |