Begone realloc #966
Merged
Begone realloc #966
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
lmoureaux
reviewed
Mar 25, 2022
| @@ -33,8 +33,7 @@ void ai_traits_init(struct player *pplayer) | |||
| { | |||
| enum trait tr; | |||
|
|
|||
| pplayer->ai_common.traits = static_cast<ai_trait *>(fc_realloc( | |||
| pplayer->ai_common.traits, sizeof(struct ai_trait) * TRAIT_COUNT)); | |||
| pplayer->ai_common.traits = std::vector<ai_trait>(TRAIT_COUNT); | |||
There was a problem hiding this comment.
This doesn't seem to be ever resized. TRAIT_COUNT is 3 and ai_trait is just two ints. Would this make more sense as a std::array<ai_trait, TRAIT_COUNT>?
There was a problem hiding this comment.
I was considering the same, also we have waay too much ram these days to have a lot more traits still in stack, Ended up doing the same in heap because I thought the difference would be negligible, and array didnt have clear.
client/gui-qt/cityrep.cpp
Outdated
| @@ -219,24 +219,23 @@ bool city_model::setData(const QModelIndex &index, const QVariant &value, | |||
| QVariant city_model::headerData(int section, Qt::Orientation orientation, | |||
| int role) const | |||
| { | |||
| struct city_report_spec *spec = city_report_specs + section; | |||
| struct city_report_spec spec = city_report_specs[section]; | |||
There was a problem hiding this comment.
Suggestion: const auto &
|
I did run for 200 turns with ASAN and checked the cityreport with the client to see. Seemed to work for me. |
We are only reading from spec and not modifying it.
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.
Changed a few easy reallocs to vectors