Skip to content

Add test suite with two basic tests for solver space leaks. #4122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebright merged 6 commits into from
Nov 22, 2016
Merged

Add test suite with two basic tests for solver space leaks. #4122

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
153ea8c
Add test suite with two basic tests for solver space leaks.
sebright Nov 19, 2016
41cd786
Fix space leak in conflict counting.
sebright Nov 19, 2016
42ae270
Run memory usage tests in CI.
sebright Nov 19, 2016
4b1a31c
Fix space leak caused by a bug in DeriveFunctor in GHC 7.6.3.
sebright Nov 20, 2016
22480db
Simplify conflict counting.
sebright Nov 20, 2016
1129ad3
Limit stack size in memory usage tests.
sebright Nov 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cabal-install/Distribution/Solver/Modular/Explore.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ backjump (EnableBackjumping enableBj) var initial xs =
| otherwise = f (csAcc `CS.union` cs) cm'

logBackjump :: ConflictSet QPN -> ConflictMap -> ConflictSetLog a
logBackjump cs cm = failWith (Failure cs Backjump) (cs, updateCM initial cm)
logBackjump cs cm = cm `seq` failWith (Failure cs Backjump) (cs, updateCM initial cm)
Copy link
Collaborator

@fmthoma fmthoma Nov 20, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd consider a bang pattern instead of seq for readability.

Also, in exploreLog below the cm is only updated when conflict counting is enabled, while it is always updated here. As you suggested in #3960, I think the if countConflicts… would make sense here as well. (Or, if you think that seqing cm is already sufficient, remove the if countConflicts in exploreLog as well, which would IMHO improve readability).

Copy link
Collaborator Author

@sebright sebright Nov 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd consider a bang pattern instead of seq for readability.

fixed

Also, in exploreLog below the cm is only updated when conflict counting is enabled, while it is always updated here. As you suggested in #3960, I think the if countConflicts… would make sense here as well. (Or, if you think that seqing cm is already sufficient, remove the if countConflicts in exploreLog as well, which would IMHO improve readability).

I just made a minimal change to avoid conflicts with your PR, but you're right: it's simpler to always update the map.

-- 'intial' instead of 'cs' here ---^
-- since we do not want to double-count the
-- additionally accumulated conflicts.
Expand Down Expand Up @@ -118,10 +118,10 @@ exploreLog enableBj (CountConflicts countConflicts) t = cata go t M.empty

go :: TreeF Assignment QGoalReason (ConflictMap -> ConflictSetLog (Assignment, RevDepMap))
-> (ConflictMap -> ConflictSetLog (Assignment, RevDepMap))
go (FailF c fr) = \ cm -> let failure = failWith (Failure c fr)
in if countConflicts
then failure (c, updateCM c cm)
else failure (c, cm)
go (FailF c fr) = \ cm -> let cm' = if countConflicts
then updateCM c cm
else cm
in cm' `seq` failWith (Failure c fr) (c, cm')
go (DoneF rdm a) = \ _ -> succeedWith Success (a, rdm)
go (PChoiceF qpn gr ts) =
backjump enableBj (P qpn) (avoidSet (P qpn) gr) $ -- try children in order,
Expand Down