Skip to content

Conversation

@kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Apr 11, 2025

  1. pkg/sysinfo: remove NUMANodeCount
  2. sysinfo: use bits.OnesCount64, drop popcnt

Summary by Sourcery

Remove unused code and simplify CPU counting logic in the sysinfo package

Bug Fixes:

  • Simplify CPU counting logic across different platforms

Enhancements:

  • Replace custom popcnt implementation with standard library bits.OnesCount64 for CPU counting

Chores:

  • Remove unused NUMA-related code and custom population count function

Found a few issues in this code and went ahead to fix them one by one,
only to find out this function is not used anywhere in our codebase
or otherwise (see [1], [2]).

Remove it.

[1]: https://github.com/search?q=org%3Acontainers+NUMANodeCount&type=code
[2]: https://sourcegraph.com/search?q=context%3Aglobal+sysinfo.NUMANodeCount

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Slightly less code to maintain.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@sourcery-ai
Copy link

sourcery-ai bot commented Apr 11, 2025

Reviewer's Guide by Sourcery

This pull request removes unused code and replaces a custom function with a standard library function. Specifically, it removes the NUMANodeCount function and related test files, and replaces the popcnt function with bits.OnesCount64.

Sequence diagram for numCPU function

sequenceDiagram
  participant numCPU
  participant bits.OnesCount64

  numCPU->>bits.OnesCount64: Call with mask
  bits.OnesCount64-->>numCPU: Return the number of set bits
Loading

File-Level Changes

Change Details Files
Removed the NUMANodeCount function and related test, as it was no longer being used.
  • Removed the NUMANodeCount function from pkg/sysinfo/sysinfo.go.
  • Removed the TestNumMems test function from pkg/sysinfo/sysinfo_linux_test.go.
  • Removed the nummem_linux.go file.
  • Removed the nummem_unsupported.go file.
pkg/sysinfo/sysinfo.go
pkg/sysinfo/sysinfo_linux_test.go
pkg/sysinfo/nummem_linux.go
pkg/sysinfo/nummem_unsupported.go
Replaced the custom popcnt function with the standard bits.OnesCount64 function for counting set bits in a 64-bit integer.
  • Removed the popcnt function from pkg/sysinfo/sysinfo.go.
  • Replaced the call to popcnt with bits.OnesCount64 in pkg/sysinfo/numcpu_windows.go.
pkg/sysinfo/sysinfo.go
pkg/sysinfo/numcpu_windows.go

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!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

@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 @kolyshkin - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider adding a comment explaining why NUMANodeCount was removed.
  • It might be worth adding a unit test for the bits.OnesCount64 path in numCPU().
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.

@mheon
Copy link
Member

mheon commented Apr 11, 2025

LGTM

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kolyshkin, Luap99, sourcery-ai[bot]

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 62f5c9f into containers:main Apr 14, 2025
15 checks passed
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