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

Fix the build on RHEL-9. #98

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Fix the build on RHEL-9. #98

merged 2 commits into from
Mar 21, 2024

Conversation

clalancette
Copy link
Contributor

It turns out that in the older version of lttng-ust on RHEL-9, the API to set a marker is spelled _lttng_ust_tracef. Include the correct version header file, and use the correct API called depending on what version we are using.

This is a follow-up to the recently merged #96 , where I forgot to run RHEL CI before merging.

It turns out that in the older version of lttng-ust on RHEL-9,
the API to set a marker is spelled _lttng_ust_tracef.  Include
the correct version header file, and use the correct API called
depending on what version we are using.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
@clalancette
Copy link
Contributor Author

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status
  • RHEL Build Status

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Chris Lalancette <clalancette@gmail.com>
@clalancette
Copy link
Contributor Author

clalancette commented Mar 20, 2024

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status
  • RHEL Build Status

@christophebedard
Copy link
Member

christophebedard commented Mar 20, 2024

Something weird is happening with GitHub when cloning the repositories in both ci.ros2.org and local GitHub CI.

Thanks for fixing this while I'm away from my (real) keyboard, Chris!

Copy link
Member

@christophebedard christophebedard left a comment

Choose a reason for hiding this comment

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

Looks good to me with green CI.

I just noticed that I used lttng_ust__tracef instead of what the documentation mentions, lttng_ust_tracef https://lttng.org/docs/v2.13/#doc-tracef. Not sure why; it wasn't really intentional. The difference is that it bypasses the condition that checks if the tracepoint is enabled, so it's pretty minor, but I'll follow up next week.

@clalancette clalancette merged commit 115034b into rolling Mar 21, 2024
6 of 9 checks passed
@clalancette clalancette deleted the clalancette/fix-rhel-build branch March 21, 2024 01:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants