[cpu][mac] change not return error even if cpu.frequency errors #1192
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shirou
changed the title
KSerrania
added a commit
to DataDog/gopsutil
that referenced
this pull request
Aug 13, 2022
Backport of shirou#1192. sysctl hw.cpufrequency does not return anything on macOS M1. This causes cpu.Info() to return an error every time it is called on macOS M1. A partial fix of this issue is to ignore errors, and leave the frequency field with its default value.
KSerrania
added a commit
to DataDog/gopsutil
that referenced
this pull request
Sep 1, 2022
[macOS M1] Backports from upstream to fix cpu.Info() crashes Since #40, we can build projects containing this gopsutil fork on macOS M1. However, using cpu.Info() causes a crash: sysctl hw.cpufrequency doesn't return anything on M1, which makes the following snippet crash: out, err = invoke.Command(sysctl, "hw.cpufrequency") if err != nil { return ret, err } values := strings.Fields(string(out)) hz, err := strconv.ParseFloat(values[1], 64) with an index out-of-range error. This PR: - backports Lomanic/gopsutil@2ec3560, which uses golang.org/x/sys/unix.Sysctl instead of manual calls to the sysctl binary, preventing the crash - backports shirou#1192 to not make cpu.Info() return an error when the CPU frequency cannot be found, to prevent the method from erroring on M1.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR partially fixes #1000
Still we can not get concrete cpu frequency on m1 mac. This PR changes does not return error even we can not get a value from
hw.cpufrequency.