v5.0.x: Clean up OFI common code and delay patcher initialization until needed #9449
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
Remove cruft from common_ofi, including unnecessary includes, declarations, and OPAL_DECLSPEC annotations on function definitions (they are only needed on declarations). Also move one function back into the C_DECLS block and properly OPAL_DECLSPEC the function. Signed-off-by: Brian Barrett <[email protected]> (cherry picked from commit 00a5108)
Test for the features needed to support injecting a memory monitor in Libfabric, rather than testing for a Libfabric version. Signed-off-by: Brian Barrett <[email protected]> (cherry picked from commit 947b3fe)
The documentation in the header file for the ofi common code had been neglected, so show some love. Also add some helpful comments in understanding the memory monitor injection code. Signed-off-by: Brian Barrett <[email protected]> (cherry picked from commit 348152a)
Rename initialization calls to match the MCA terminology and restructure code to match the calling pattern of normal components (so during component_register, OFI components should call common_ofi_mca_register). Signed-off-by: Brian Barrett <[email protected]> (cherry picked from commit bf36d24)
Delay initializing the import memory monitor from component open to a function which should be called immediately before the Libfabric domain is initialized. Registering the import memory monitor requires initializing the patcher memory hooks, which is not necessary if the OFI fabrics were not selected. Signed-off-by: Brian Barrett <[email protected]> (cherry picked from commit 2349f6b)
Member
|
@bwbarrett Would it be ok if I cherry picked 1797341 to this PR (it's the OFI warning fix from #9450)? The cherry pick doesn't apply cleanly to v5.0.x, but does apply cleanly to this branch. |
Member
Author
|
I'll add it; I left this WIP because there's another fix that needs to go in w.r.t the output stream. |
Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit 1797341)
The ofi common refactoring patches broke handling of the verbose flag because I forgot that the input variable has to live longer than the function (sigh). Move the output level variable to be a global variable. Add error checking to the entire mca registration path, since it was notably lacking. Even before the refactor, we didn't handle re-setting verbosity after registering synonyms properly. This patch probably isn't perfect in that regards, but at least is *consistent* in what we do. Signed-off-by: Brian Barrett <[email protected]> (cherry picked from commit 5432c32)
bwbarrett
deleted the
backports/v5.0.x-common-ofi-delay-initializing-patcher
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Backport of #9441. References #8822.