Remove major/mark_weak1 and major/mark_weak2 from mark_slice_name#9004
Closed
abbysmal wants to merge 1 commit intoocaml:trunkfrom
Closed
Remove major/mark_weak1 and major/mark_weak2 from mark_slice_name#9004abbysmal wants to merge 1 commit intoocaml:trunkfrom
abbysmal wants to merge 1 commit intoocaml:trunkfrom
Conversation
Contributor
Author
|
This was addressed by merging #9082 (as counters were rewritten and inconsistencies were fixed), I will close this issue. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The value
mark_slice_nameused by the instrumented runtime to name the various substeps reflected by thecaml_gc_subphasevariable seems to be off.mark_slice_nameis defined here andmajor/mark_finalequals14https://github.com/ocaml/ocaml/blob/trunk/runtime/major_gc.c#L609
This array is used by the instrumented runtime for logging purpose, accessing the array through the value of
caml_gc_subphase:https://github.com/ocaml/ocaml/blob/trunk/runtime/major_gc.c#L795
caml_gc_subphasehowever is only mutated to any of the following values:https://github.com/ocaml/ocaml/blob/trunk/runtime/caml/major_gc.h#L49
So it seems that two names (
major/mark_weak2andmajor/mark_final) are not being used. Alsomajor/mark_weak1is logged whenmajor/mark_finalis expected.It seems the defines were shuffled around when ephemerons were first introduced but this array was not kept up to date:
d5fffdd#diff-64b8b0eb170037392ede80351a5b5779
This PR removes
major/mark_weak1andmajor/mark_weak2frommark_slice_name.