Skip to content
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.

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

Fix GC free list accounting #1483

Merged
merged 2 commits into from Mar 2, 2018

Conversation

Projects
None yet
3 participants
@dra27
Copy link
Contributor

dra27 commented Nov 15, 2017

Split off from #1311 (see #1311 (comment))

@dra27 dra27 force-pushed the dra27:freelist-fix branch from 58d9e67 to 4ade4c1 Nov 15, 2017

@alainfrisch alainfrisch added the bug label Feb 28, 2018

@damiendoligez
Copy link
Member

damiendoligez left a comment

LGTM

@damiendoligez

This comment has been minimized.

Copy link
Member

damiendoligez commented Mar 1, 2018

@dra27 could you rebase?

dra27 added some commits Sep 30, 2017

Fix caml_fl_cur_wsz accounting
In caml_fl_add_blocks, caml_fl_cur_wsz was only updated with the size of
the first block, which causes problems on real 32-bit systems and some
hypothetical 64-bit systems with a lot of RAM...

caml_fl_add_blocks now walks the list and so fully updates caml_fl_cur_wsz.

@dra27 dra27 force-pushed the dra27:freelist-fix branch from 4ade4c1 to 5fc3b23 Mar 2, 2018

@dra27

This comment has been minimized.

Copy link
Contributor Author

dra27 commented Mar 2, 2018

Done - definitely worth letting Travis complete as it re-enables the x86 tests.

@damiendoligez damiendoligez merged commit 713eb09 into ocaml:trunk Mar 2, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@damiendoligez

This comment has been minimized.

Copy link
Member

damiendoligez commented Mar 2, 2018

Travis is happy so I merged. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.