Fix mark restoration #6221
Open
Fix mark restoration #6221
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
yurikhan
force-pushed
the
fix-mark-restoration
branch
2 times, most recently
from
b29ef60
to
baa16f2
Compare
yurikhan
force-pushed
the
fix-mark-restoration
branch
from
baa16f2
to
04c8af4
Compare
orestisfl
requested changes
Oct 6, 2024
src/load_layout.c
Outdated
Comment on lines
55
to
67
| static void apply_pending_marks(void) { | ||
| if (num_marks > 0) { | ||
| LOG("applying %d pending marks\n", num_marks); | ||
| for (int i = 0; i < num_marks; i ) { | ||
| Con *con = marks[i].con_to_be_marked; | ||
| char *mark = marks[i].mark; | ||
| if (con) { | ||
| DLOG("applying pending mark “%s” to con %p\n", mark, con); | ||
| con_mark(con, mark, MM_ADD); | ||
| } | ||
| free(mark); | ||
| } | ||
|
|
||
| FREE(marks); | ||
| num_marks = 0; | ||
| LOG("done applying pending marks\n"); | ||
| } | ||
| } |
There was a problem hiding this comment.
No need for LOG()-level messages, con_mark also prints a log message.
Suggested change
| static void apply_pending_marks(void) { | |
| if (num_marks > 0) { | |
| LOG("applying %d pending marks\n", num_marks); | |
| for (int i = 0; i < num_marks; i ) { | |
| Con *con = marks[i].con_to_be_marked; | |
| char *mark = marks[i].mark; | |
| if (con) { | |
| DLOG("applying pending mark “%s” to con %p\n", mark, con); | |
| con_mark(con, mark, MM_ADD); | |
| } | |
| free(mark); | |
| } | |
| FREE(marks); | |
| num_marks = 0; | |
| LOG("done applying pending marks\n"); | |
| } | |
| } | |
| static void apply_pending_marks(void) { | |
| for (int i = 0; i < num_marks; i ) { | |
| Con *con = marks[i].con_to_be_marked; | |
| char *mark = marks[i].mark; | |
| if (con) { | |
| con_mark(con, mark, MM_ADD); | |
| } | |
| free(mark); | |
| } | |
| FREE(marks); | |
| num_marks = 0; | |
| } |
* json_key: Do not lose existing pending marks * json_end_map: Do not apply pending marks prematurely * apply_pending_marks, tree_append_json: Skip setting marks on incomplete containers * tree_append_json: Apply pending marks after finishing JSON parsing
yurikhan
force-pushed
the
fix-mark-restoration
branch
from
04c8af4
to
3d3c7e8
Compare
Added test. I’m not well versed in Perl; when I tried to cargo-cult the Existing tests using the same check pass for me. What am I missing? |
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.
Closes #4334.