Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP #1626 > support/v5.12] [core] expmap performance improvement #1630

Merged
merged 1 commit into from
Jun 14, 2024

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #1626 to branch support/v5.12.
The cherry-pick has failed.

The following files have caused conflicts:

ecal/core/src/ecal_expmap.h
samples/cpp/monitoring/monitoring_get_topics/src/monitoring_get_topics.cpp

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/ff6b4dd/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/ff6b4dd/support/v5.12
git cherry-pick cd756d5c13dabf23a0ddaa4b04a24f64ab34ca76..ff6b4ddcecacb5a91dbb313a94f16b7dabda9ec9

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/ff6b4dd/support/v5.12

After resolving all conflicts, rebase-merge this PR.

* performance improvement of update_timestamp for large maps (tested with > 25 k entries)
* monitoring_get_topics sample slightly improved to allow time updates of internal (large) expmaps in case of subsequent readings
@rex-schilasky rex-schilasky force-pushed the cherry-pick/ff6b4dd/support/v5.12 branch from b2581ad to ebf659a Compare June 13, 2024 14:48
@rex-schilasky rex-schilasky marked this pull request as ready for review June 13, 2024 14:51
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions


int main(int argc, char **argv)
{
int run(0), runs(1000);
int run(0), runs(10);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: multiple declarations in a single statement reduces readability [readability-isolate-declaration]

Suggested change
int run(0), runs(10);
int run(0);
int runs(10);

Copy link
Contributor

@hannemn hannemn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm as discussed!

@rex-schilasky rex-schilasky merged commit 73fbc24 into support/v5.12 Jun 14, 2024
16 checks passed
@rex-schilasky rex-schilasky deleted the cherry-pick/ff6b4dd/support/v5.12 branch June 14, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants