Skip to content

libcrun: prefer waitpid_ignore_stopped NULL argument #1771

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

Merged
merged 1 commit into from
Jun 3, 2025

Conversation

eriksjolund
Copy link
Contributor

@eriksjolund eriksjolund commented Jun 2, 2025

If the status value is not needed, pass the argument NULL.

Summary by Sourcery

Enhancements:

  • Prefer passing NULL to waitpid_ignore_stopped for unused status values, removing redundant pid_status and status variables in linux.c and container.c

If the status value is not needed, pass the argument
NULL.

Signed-off-by: Erik Sjölund <[email protected]>
Copy link

sourcery-ai bot commented Jun 2, 2025

Reviewer's Guide

This PR streamlines process reaping by removing unused status variables and passing NULL to waitpid_ignore_stopped when the exit status isn’t required.

Sequence Diagram: Update to waitpid_ignore_stopped Call for Unneeded Status

sequenceDiagram
    participant C as "Caller Function (e.g., join_process_parent_helper, libcrun_container_run)"
    participant W as "waitpid_ignore_stopped()"

    alt "Before PR: local status variable declared and passed, but its value unused by caller"
        C->>W: waitpid_ignore_stopped(child_pid, &local_status_var, 0)
        W-->>C: Returns (exit status potentially written to local_status_var)
    else "After PR: local status variable removed, NULL passed as status argument"
        C->>W: waitpid_ignore_stopped(child_pid, NULL, 0)
        W-->>C: Returns (exit status not captured by caller)
    end
Loading

File-Level Changes

Change Details Files
Simplify waitpid_ignore_stopped usage in linux helper
  • Remove unused pid_status variable
  • Pass NULL instead of &pid_status to waitpid_ignore_stopped
  • Retain error check on waitpid return
src/libcrun/linux.c
Simplify waitpid_ignore_stopped usage in container runner
  • Remove unused status variable
  • Pass NULL instead of &status to waitpid_ignore_stopped
  • Keep subsequent read of status separate
src/libcrun/container.c

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @eriksjolund - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link

TMT tests failed. @containers/packit-build please check.

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@giuseppe giuseppe merged commit 2c67616 into containers:main Jun 3, 2025
39 of 43 checks passed
@eriksjolund eriksjolund deleted the prefer-NULL-arg branch June 4, 2025 06:15
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.

2 participants