linux: optimize parseKeyValue #186
Merged
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
|
💚 CLA has been signed |
💔 Tests Failed
Expand to view the summary
Build stats
Test stats 🧪
Test errors
Expand to view the tests failures
|
|
The CLA check is failing because the author email in the commit does not match the email used to sign the CLA. |
|
A changelog entry will also be required. See https://github.com/elastic/go-sysinfo/blob/main/CONTRIBUTING.md. |
|
@andrewkroh signed the CLA with the correct email, also provided a changelog file. lmk if the description of the change is ok :) |
andrewkroh
reviewed
Jul 27, 2023
|
/test |
andrewkroh
requested changes
Jul 28, 2023
|
You're right ! I fixed the panic and included your fuzz test |
|
CI is failing on a missing license header. If you run |
|
Tests are still failing: |
|
fixed |
andrewkroh
added
the
Team:Security-External Integrations
efd6
reviewed
Aug 9, 2023
providers/linux/util_test.go
Outdated
Comment on lines
123
to
143
| parseKeyValue(testProcStatus, ':', func(key, value []byte) error { | ||
| return nil | ||
| }) |
There was a problem hiding this comment.
This can potentially be optimised away.
There was a problem hiding this comment.
added an _ assignment to ensure evaluation
There was a problem hiding this comment.
I'm afraid I do not believe that that is necessarily safe. To avoid the potential issue, there needs to be a side effect.
providers/linux/util.go
Outdated
| if len(parts) != 2 { | ||
| func parseKeyValue(content []byte, separator byte, callback func(key, value []byte) error) error { | ||
| for len(content) > 0 { | ||
| sepIdx := bytes.IndexByte(content, separator) |
There was a problem hiding this comment.
Should we tolerate empty lines? The previous code did.
There was a problem hiding this comment.
added a test specifically for empty lines
|
You're right, I updated my change to use This new version seems slightly slower than the one using |
|
I compared the benchmark results from e4ac65c to f3a5024. Looks good. |
andrewkroh
approved these changes
Aug 15, 2023
|
@efd6 Can you please take another look. |
efd6
approved these changes
Aug 15, 2023
Co-authored-by: Dan Kortschak <[email protected]>
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.
As seen in this
alloc_objectsprofile from auditbeatlinux.parseKeyValue()accounts for a significant amount of the program allocations:This PR adds tests on the current implem to validate the expected behavior and proposes a new implementation for this function that removes all allocs. As a nice side effect, it also cuts down cpu time by ~90%: