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

Switch to using get_system_time_in_ns() function everywhere. (backport #354) #380

Merged
merged 2 commits into from
Jan 2, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 2, 2025

That way we have just a single place where this is defined, and everywhere can be sure they are getting the correct value in nanoseconds.


This is an automatic backport of pull request #354 done by Mergify.

@mergify mergify bot added the conflicts label Jan 2, 2025
Copy link
Author

mergify bot commented Jan 2, 2025

Cherry-pick of e7493d3 has failed:

On branch mergify/bp/jazzy/pr-354
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit e7493d3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
	modified:   rmw_zenoh_cpp/src/detail/rmw_service_data.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rmw_zenoh_cpp/src/detail/rmw_subscription_data.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

clalancette and others added 2 commits January 2, 2025 18:55
That way we have just a single place where this is defined,
and everywhere can be sure they are getting the correct
value in nanoseconds.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Signed-off-by: Yadunund <yadunund@gmail.com>
@Yadunund Yadunund force-pushed the mergify/bp/jazzy/pr-354 branch from 003a9cc to 950ce47 Compare January 2, 2025 19:34
@Yadunund Yadunund merged commit 9ccb7bf into jazzy Jan 2, 2025
4 checks passed
@Yadunund Yadunund deleted the mergify/bp/jazzy/pr-354 branch January 2, 2025 19:48
Yadunund added a commit that referenced this pull request Jan 2, 2025
…#354) (#380)

* Switch to using get_system_time_in_ns() function everywhere. (#354)

That way we have just a single place where this is defined,
and everywhere can be sure they are getting the correct
value in nanoseconds.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>

* Add get_system_time_in_ns()

Signed-off-by: Yadunund <yadunund@gmail.com>

---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Signed-off-by: Yadunund <yadunund@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Yadunund <yadunund@gmail.com>
Yadunund added a commit that referenced this pull request Jan 2, 2025
…#354) (#380) (#379)

* Switch to using get_system_time_in_ns() function everywhere. (#354)

That way we have just a single place where this is defined,
and everywhere can be sure they are getting the correct
value in nanoseconds.



* Add get_system_time_in_ns()



---------

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Signed-off-by: Yadunund <yadunund@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Yadunund <yadunund@gmail.com>
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.

2 participants