Assorted minor nits in libcontainer #2263
Merged
Conversation
This file contains hidden or 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
fmt.Sprintf is slow and is not needed here, string concatenation would be sufficient. It is also redundant to convert []byte from string and back, since `bytes` package now provides the same functions as `strings`. Use Fields() instead of TrimSpace() and Split(), mainly for readability (note Fields() is somewhat slower than Split() but here it doesn't matter much). Use Join() to prepend the plus signs. Signed-off-by: Kir Kolyshkin <[email protected]>
1. Return earlier if there is an error. 2. Do not use filepath.Split on every entry, use info.Name() instead. 3. Make readProcsFile() accept file name as an argument, to avoid unnecessary file name and directory splitting and merging. 4. Skip on info.IsDir() -- this avoids an error when cgroup name is set to "cgroup.procs". This is still not very good since filepath.Walk() performs an unnecessary stat(2) on every entry, but better than before. Signed-off-by: Kir Kolyshkin <[email protected]>
It it not needed as it does nothing here. Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
commented
Mar 20, 2020
| } | ||
| resByte := []byte(res) | ||
| ctrs := bytes.Fields(content) | ||
| res := append([]byte("+"), bytes.Join(ctrs, []byte(" +"))...) |
kolyshkin
commented
Mar 20, 2020
| if info.IsDir() || info.Name() != CgroupProcesses { | ||
| return nil | ||
| } | ||
| cPids, err := readProcsFile(p) |
Contributor
Author
There was a problem hiding this comment.
Previous change to this code was in #332
AkihiroSuda
reviewed
Mar 21, 2020
| // GetPids returns all pids, that were added to cgroup at path. | ||
| func GetPids(path string) ([]int, error) { | ||
| return readProcsFile(path) | ||
| func GetPids(dir string) ([]int, error) { |
Member
There was a problem hiding this comment.
breaks compatibility if there is non-runc consumer of this function
Contributor
Author
There was a problem hiding this comment.
Nope (I just changed the name of the parameter to be clear it's a directory, otherwise it's doing the same thing).
Member
|
LGTM |
Contributor
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Please see the individual commits for details.