rfkill code refactoring #1015
Merged
rfkill code refactoring #1015
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
Kernel 5.11 added one more field to the `struct rfkill_event` and broke unnecessarily strict check in `rfkill.cpp`. According to `linux/rfkill.h`, we must accept events at least as large as v1 event size and should be prepared to get additional fields at the end of a v1 event structure.
Open rfkill device only once per module. Remove rfkill threads and use `Glib::signal_io` as a more efficient way to poll the rfkill device. Handle runtime errors from rfkill and stop polling of the device instead of crashing waybar.
The string was always overwritten in `update()`; don't need to store temporary value in the class.
The timer thread was always reading the same value from Rfkill state.
Moving rfkill to the main event loop had unexpected side-effects. Notably, the network module mutex can block all the main thread events for several seconds while the network worker thread is sleeping. Instead of waiting for the mutex let's hope that the worker thread succeeds and schedule timer thread wakeup just in case.
alebastr
force-pushed
the
rfkill-events
branch
from
a383238 to
6d5afda
Compare
|
I haven't found time for a better look at the @rxguy, @pvalena, do you mind trying this PR? Only the first commit is required to resolve #994 and that's the only commit I'm planning to cherry-pick for Fedora package, but it'll be nice to test the rest of the changes here on another system. |
|
@alebastr Sure I'd try... can you build the package in COPR for rawhide? |
Alexays
reviewed
Feb 10, 2021
|
Just a small comment, otherwise LGTM, no suggestion for the network part, relying on the timer thread is a good idea. |
|
LGTM thanks Aleksei! |
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.
I only wanted to fix that one event size check in
rfkill.cpp. Should have more willpower to stop and ignore the rest 😭Summary:
Bluetooth::interval_thread_was not doing anything useful because it had no way to get changed status value. Now we have 3 less threads 😄network.cppwas beyond an evening coding exercise. Although I'm quite curious why we have to sleep for 5 seconds while holding the mutex and will check that on another evening.Fixes #994