hddtemp: Support more than 32 drives #631
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
|
Hi @tokkee! Your thoughts on this ? |
| while ((name = strtok_r (ptr, "|", &saveptr)) != NULL && | ||
| (model = strtok_r (NULL, "|", &saveptr)) != NULL && | ||
| (temperature = strtok_r (NULL, "|", &saveptr)) != NULL && | ||
| (mode = strtok_r (NULL, "|", &saveptr)) != NULL) |
There was a problem hiding this comment.
Since you're touching this anyway, it should use strsplit() from common.h instead.
There was a problem hiding this comment.
strsplit() has a hard-coded set of field separators and won't split on |.
|
The general approach sounds fine to me. I've added two comments on the code but otherwise didn't look at all details yet. |
|
Thanks for the patch @bgilbert. Could you please rebase on master so I can merge this? Thanks! |
Instead of building an array of fields and then walking it, split into fields as we go.
Dynamically scale the response buffer, up to a maximum of 1 MB.
Don't rely on signedness of buffer_size.
|
Done. |
|
Thank you so much @bgilbert! |
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 hddtemp plugin imposes a 32-drive and 1024-byte limit on the response from the hddtemp daemon. On my system, the 1024-byte limit truncates the response after 29 drives.
Drop the drive limit and increase the buffer limit to 1 MB. (This is hopefully larger than anyone will need, and prevents collectd from being DoSed by the hddtemp daemon.)