Clean up xapi_xenops and more
#6543
Merged
Conversation
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
psafont
approved these changes
Jun 18, 2025
changlei-li
reviewed
Jun 19, 2025
ocaml/xapi-idl/lib/updates.ml
Outdated
| @@ -25,7 +25,7 @@ functor | |||
| struct | |||
| (* Map of thing -> last update counter *) | |||
| module M = Map.Make (struct | |||
| type t = Ord.t | |||
| type t = Interface.Dynamic.id | |||
There was a problem hiding this comment.
I don't understand here. It seems that the functor Ord becomes meaningless. If UpdateRecorder needn't be generic, then we should compress module UpdateRecorder and module U at L136 into one. It's quite odd now.
There was a problem hiding this comment.
You're right and I'm not entirely sure of the original intentions of this change (it's been a few months)... I'll drop this part
Dynamic.t is not used currently, just drop it. Signed-off-by: Andrii Sultanov <[email protected]>
There's already a 'localhost' in scope. Signed-off-by: Andrii Sultanov <[email protected]>
No functional change, this just removes several indentation levels from the 500+ lines of the function, making it easier to refactor in the future. This also clears up the logic of the function, now that two arms of if-else and try-with clauses are not 500+ lines apart, and avoids splitting some expressions and strings over several lines given that they reach the line character limit more often inside of several levels of indentation. Signed-off-by: Andrii Sultanov <[email protected]>
last-genius
force-pushed
the
asv/xenopsd-cleanup
branch
from
ca74cf9 to
fa28105
Compare
changlei-li
approved these changes
Jun 19, 2025
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.
Best reviewed by commit, and also best viewed locally with a git client that distinguishes between moved and new lines, with a config like:
No functional changes intended.
This is split out from a larger series, but I figured these cleanups are easier to review on their own and it would be better to get them in early to avoid annoying rebases of a thousand lines of code ....