depmod: Use shared/ more often #193
Closed
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
|
Btw if you want to de-duplicate depmod, here's another similar task #62 |
evelikov
requested changes
Oct 19, 2024
tools/depmod.c
Outdated
| continue; | ||
| } else if (err < 0) |
There was a problem hiding this comment.
Nit: there is no need for an else after continue/return/break
There was a problem hiding this comment.
Merged into one, since an error here is the unlikely code path.
tools/depmod.c
Outdated
| @@ -2071,39 +2037,42 @@ static inline const char *mod_get_compressed_path(const struct mod *mod) | |||
| static int output_deps(struct depmod *depmod, FILE *out) | |||
| { | |||
| size_t i; | |||
| struct array array; | |||
|
|
|||
| array_init(&array, 8); | |||
There was a problem hiding this comment.
Quick grep on a couple kernels shows we peak at 30, so let's bump this to 32 or even 64 if we want to splash out :-P
There was a problem hiding this comment.
Adjusted with 64
tools/depmod.c
Outdated
| @@ -2112,28 +2081,28 @@ static int output_deps_bin(struct depmod *depmod, FILE *out) | |||
| if (idx == NULL) | |||
| return -ENOMEM; | |||
|
|
|||
| array_init(&array, 8); | |||
There was a problem hiding this comment.
Adjusted with 64
tools/depmod.c
Outdated
| } | ||
| line[linepos] = '\0'; | ||
| line = sbuf.used > 0 ? strbuf_str(&sbuf) : ""; |
There was a problem hiding this comment.
Nit: Let's drop the strbuf.used check here
There was a problem hiding this comment.
Adjusted, forgot that it's safe now.
tools/depmod.c
Outdated
| for (idx = 0; idx < depmod->modules.count; idx++) { | ||
| struct mod *m = depmod->modules.array[idx]; | ||
| m->idx = idx; | ||
| if (depmod->modules.count > 0) { |
stoeckmann
force-pushed
the
depmod_shared
branch
from
2261971 to
75741c5
Compare
evelikov
approved these changes
Oct 19, 2024
lucasdemarchi
approved these changes
Oct 22, 2024
The shared/array implementation is already used within depmod, but not for dependency output. Adding it here reduces the amount of custom code in depmod, simplifies auditing, reduces binary size, and has the nice benefit of slightly faster runtime due to memory reusage. Signed-off-by: Tobias Stoeckmann <[email protected]>
Use shared/strbuf instead of manually re-implementing its features. Reduces the amount of custom code in depmod, simplifies auditing, reduces binary size, and has the nice benefit of slightly faster runtime due to memory reusage. Signed-off-by: Tobias Stoeckmann <[email protected]>
Calling qsort with NULL argument is invalid, although size 0 would prevent anything bad from happening. Make sure that UBSAN is not triggered. Signed-off-by: Tobias Stoeckmann <[email protected]>
stoeckmann
force-pushed
the
depmod_shared
branch
from
75741c5 to
5483e98
Compare
lucasdemarchi
pushed a commit
that referenced
this pull request
Oct 22, 2024
The shared/array implementation is already used within depmod, but not for dependency output. Adding it here reduces the amount of custom code in depmod, simplifies auditing, reduces binary size, and has the nice benefit of slightly faster runtime due to memory reusage. Signed-off-by: Tobias Stoeckmann <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Link: #193 Signed-off-by: Lucas De Marchi <[email protected]>
lucasdemarchi
pushed a commit
that referenced
this pull request
Oct 22, 2024
Use shared/strbuf instead of manually re-implementing its features. Reduces the amount of custom code in depmod, simplifies auditing, reduces binary size, and has the nice benefit of slightly faster runtime due to memory reusage. Signed-off-by: Tobias Stoeckmann <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Link: #193 Signed-off-by: Lucas De Marchi <[email protected]>
lucasdemarchi
pushed a commit
that referenced
this pull request
Oct 22, 2024
Calling qsort with NULL argument is invalid, although size 0 would prevent anything bad from happening. Make sure that UBSAN is not triggered. Signed-off-by: Tobias Stoeckmann <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Link: #193 Signed-off-by: Lucas De Marchi <[email protected]>
|
Applied, thanks. |
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.
The dependency output code basically contained its own version of shared/array and shared/strbuf.
Use these implementations for easier code, smaller binary size and slightly faster runtime due to reusage of memory.