Use lazy initialization and avoid static objects #2213
Merged
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
…he order of initialization when linking statically.
ibell
reviewed
Feb 8, 2023
src/DataStructures.cpp
Outdated
| @@ -153,9 +154,16 @@ class ParameterInformation | |||
| } | |||
| }; | |||
|
|
|||
| static ParameterInformation parameter_information; | |||
| std::unique_ptr<ParameterInformation> parameter_information_p; | |||
| ParameterInformation& get_parameter_information() { | |||
There was a problem hiding this comment.
Can this be a const ref here?
src/DataStructures.cpp
Outdated
| static PhaseInformation phase_information; | ||
|
|
||
| std::unique_ptr<PhaseInformation> phase_information_p; | ||
| PhaseInformation& get_phase_information() { |
src/DataStructures.cpp
Outdated
| static SchemeInformation scheme_information; | ||
|
|
||
| std::unique_ptr<SchemeInformation> scheme_information_p; | ||
| SchemeInformation& get_scheme_information() { |
src/DataStructures.cpp
Outdated
| @@ -541,9 +569,16 @@ class InputPairInformation | |||
| } | |||
| }; | |||
|
|
|||
| static InputPairInformation input_pair_information; | |||
| std::unique_ptr<InputPairInformation> input_pair_information_p; | |||
| InputPairInformation& get_input_pair_information() { | |||
src/DataStructures.cpp
Outdated
| @@ -763,10 +800,17 @@ class BackendInformation | |||
| } | |||
| }; | |||
|
|
|||
| static BackendInformation backend_information; | |||
| std::unique_ptr<BackendInformation> backend_information_p; | |||
| BackendInformation& get_backend_information() { | |||
|
I see the point; a similar approach was used to manage auto-registration of backends. Once we deal with the question about const ref, I think we can merge. |
|
The performance hit should only be a single check of the pointer, right? |
|
Thanks for reviewing the changes! |
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.
Use lazy initialization and getter functions to avoid problems with the order of initialization when linking statically.
I have had some trouble with the functions that use global maps (get_param_information and friends) since they are not guaranteed to be initialised at runtime. In my case, some constants should be initialised early using these functions and I had mysterious crashes caused by empty maps.
This PR fixes that problem with almost no overhead.