Fix AC/battery detection logic on FreeBSD. #1972
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
The logic for the detection of the battery/AC line was not completely correct for FreeBSD. Launching conky on console shows the following: Cannot read sysctl "hw.acpi.battery.time" Cannot read sysctl "hw.acpi.battery.life" Cannot read sysctl "hw.acpi.battery.state" Cannot read sysctl "hw.acpi.acline" Unknown battery state 8! In a PC, the hw.acpi.battery MIB does not exist. Also, the hw.acpi.acline is only present if supported by the hardware. In addition, some variables were used uninitialized and that causes strange behavior: in a PC it showed it worked on battery and the % of charge was an ridiculous big number. This patch addresses the issue. It fixes the problem in the PC. It has also being tested in a laptop running FreeBSD current plugin and unplugging the AC line and also snatching the battery mercilessly to see if something breaks.
✅ Deploy Preview for conkyweb canceled.
|
brndnmtthws
requested changes
Jun 14, 2024
There was a problem hiding this comment.
Overall it's good, but since you're making changes here we should replace those fprintf() calls with NORM_ERR instead, if you wouldn't mind.
src/freebsd.cc
Outdated
|
|
||
| if (battery_present) { | ||
| if (battime && GETSYSCTL("hw.acpi.battery.time", *battime)) { | ||
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.time\"\n"); |
There was a problem hiding this comment.
Suggested change
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.time\"\n"); | |
| NORM_ERR("Cannot read sysctl \"hw.acpi.battery.time\""); |
src/freebsd.cc
Outdated
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.time\"\n"); | ||
| } | ||
| if (batcapacity && GETSYSCTL("hw.acpi.battery.life", *batcapacity)) { | ||
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.life\"\n"); |
There was a problem hiding this comment.
Suggested change
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.life\"\n"); | |
| NORM_ERR("Cannot read sysctl \"hw.acpi.battery.life\""); |
src/freebsd.cc
Outdated
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.life\"\n"); | ||
| } | ||
| if (batstate && GETSYSCTL("hw.acpi.battery.state", *batstate)) { | ||
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.state\"\n"); |
There was a problem hiding this comment.
Suggested change
| fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.state\"\n"); | |
| NORM_ERR("Cannot read sysctl \"hw.acpi.battery.state\""); |
Thank you for the suggestion. I didn't know about |
brndnmtthws
approved these changes
Jun 15, 2024
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 logic for the detection of the battery/AC line was not completely correct for FreeBSD. Launching conky on console shows the following:
Cannot read sysctl "hw.acpi.battery.time"
Cannot read sysctl "hw.acpi.battery.life"
Cannot read sysctl "hw.acpi.battery.state"
Cannot read sysctl "hw.acpi.acline"
Unknown battery state 8!
In a PC, the hw.acpi.battery MIB does not exist.
Also, the hw.acpi.acline is only present if supported by the hardware. In addition, some variables were used uninitialized and that causes strange behavior: in a PC it showed it worked on battery and the % of charge was an ridiculous big number.
This patch addresses the issue. It fixes the problem in the PC. It has also being tested in a laptop running FreeBSD current plugin and unplugging the AC line and also snatching the battery mercilessly to see if something breaks.
Checklist
doc/has been updatedDescription