Work around a strange space leak in PBFT.ChainState #1357
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrBliss
added
consensus
mrBliss
force-pushed
the
mrBliss/work-around-leak
branch
from
56f0cc4 to
2b369b5
Compare
nfrisby
approved these changes
Dec 16, 2019
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Impl/Iterator.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Impl/Iterator.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Impl/Iterator.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Impl/Iterator.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Impl/Iterator.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/Ouroboros/Storage/ImmutableDB/Impl/Iterator.hs
Outdated
Show resolved
Hide resolved
Stop-gap solution for #1356.
mrBliss
force-pushed
the
mrBliss/work-around-leak
branch
from
2b369b5 to
dc99794
Compare
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Dec 16, 2019
1357: Work around a strange space leak in PBFT.ChainState r=mrBliss a=mrBliss Includes a workaround for #1356. Additionally, squash all thunks introduced in the last month(s), so that the tests pass again when the `checktvarinvariant` flag is enabled for the `io-sim-classes` package. This boils down to replacing tuples with records with strict fields and forcing the elements of non-empty list to WHNF. Co-authored-by: Thomas Winant <[email protected]>
dcoutts
reviewed
Dec 16, 2019
|
|
Haha. That flag should sound an alarm if not used with a reasonable
combination of `-dsuppress-*`.
…On Mon, Dec 16, 2019 at 7:27 AM mrBliss ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In ouroboros-consensus/src/Ouroboros/Consensus/Protocol/PBFT/ChainState.hs
<#1357 (comment)>
:
> PBftChainState {
preAnchor = preAnchor'
, postAnchor = postAnchor'
, preWindow = preWindow'
, inWindow = inWindow'
, counts = updateCounts counts
- , ebbs = ebbs -- NB this needs to be pruned
+ -- NOTE: 'pruneEBBsLT' is inlined here to avoid a strange space leak
+ -- that also goes away with @-O0@, see IntersectMBO/ouroboros-consensus#741.
+ , ebbs = EbbMap $ Map.filter (>= anchorSlot') (unEbbMap ebbs)
Noted! I had a look this morning, but the GHC Core (-ddump-simpl) version
of append was ~1400 lines, so I quickly gave up 😅
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#1357>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAIOBU6MYOFFSD4SQIHHHWLQY6M65ANCNFSM4J3KHRJA>
.
|
|
Great work! |
After #1360 😁 |
This was referenced Dec 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes a workaround for IntersectMBO/ouroboros-consensus#741.
Additionally, squash all thunks introduced in the last month(s), so that the tests pass again when the
checktvarinvariantflag is enabled for theio-sim-classespackage. This boils down to replacing tuples with records with strict fields and forcing the elements of non-empty list to WHNF.