-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
refactor: move {epoll
, kqueue
} (de)init logic and wakeup pipes logic out of CConnman
and into EdgeTriggeredEvents
and WakeupPipes
#6007
Conversation
I can do FreeBSD testing. I know that there are a couple hundred masternodes running on FreeBSD. I don't think it's unimportant. |
a30ab1a
to
907a351
Compare
@MrDefacto Messaged you on Keybase! |
With regards to e0deb9e , I was originally planning to move As for 4e7f80e, I'm leaning in the opposite direction and attempting to limit Also, a condition inversion in |
This pull request has conflicts, please rebase. |
d204699
to
2c978cc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, light ACK (on mac)
return; | ||
#endif /* USE_KQUEUE */ | ||
} else { | ||
assert(false); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not use something like __builtin_unreachable
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
__builtin_unreachable
is a compiler hint to optimize it out but is within the realm of possibility that the path might be taken due to erroneous code. As it is not an assertion that the code path isn't taken, assert
seemed more suitable for the job.
#if defined(USE_KQUEUE) || defined(USE_EPOLL) | ||
close(m_fd); | ||
#else | ||
assert(false); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not use something like __builtin_unreachable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK bd8b5d4
3b0323a
Additionally, log errors if removal from interest list fails (which is possible if it was already removed or socket is invalid).
- File descriptor creation and destruction are handled within ETE, no reason to expose read-write access to it. - (Un)registerPipe should only be used within WakeupPipe, remove from public view.
113b3fe fix: actually use `-socketevents` (UdjinM6) Pull request description: ## Issue being fixed or feature implemented #6007 follow-up ## What was done? ## How Has This Been Tested? check `socketevents` in `getnetworkinfo` response ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: ACK 113b3fe PastaPastaPasta: utACK 113b3fe Tree-SHA512: 50dcbdfe1f34e42e71078b585cfed2cd6b07f5f08c8296c7205367043e42e676c2eca47fa5193fdb9071eef202b01ba6e44ae2e3affb59a4e94196ecb6eb4350
Motivation
CConnman
is an entity that contains a lot of platform-specific implementation logic, both inherited from upstream and added upon by Dash (support for edge-triggered socket events modes likeepoll
on Linux andkqueue
on FreeBSD/Darwin).Bitcoin has since moved to strip down
CConnman
by moving peer-related logic to thePeer
struct innet_processing
(portions of which are backported in #5982 and friends, tracking efforts from bitcoin#19398) and moving socket-related logic toSock
(portions of which are aimed to be backported in #6004, tracking efforts from bitcoin#21878).Due to the direction being taken and the difference in how edge-triggered events modes operate (utilizing interest lists and events instead of iterating over each socket) in comparison to level-triggered modes (which are inherited from upstream), it would be reasonable to therefore, isolate Dash-specific code into its own entities and minimize the information
CConnman
has about its internal workings.One of the visible benefits of this approach is comparing
develop
(as of this writing, d44b0d5) and this pull request for interactions between wakeup pipes logic and {epoll
,kqueue
} logic.This is what construction looks like:
dash/src/net.cpp
Lines 3358 to 3397 in d44b0d5
But, if we segment wakeup pipes logic (that work on any platform with POSIX APIs and excludes Windows) and {
epoll
,kqueue
} logic (calling themEdgeTriggeredEvents
instead), construction looks different:dash/src/util/wpipe.cpp
Lines 12 to 38 in 907a351
Now wakeup pipes logic doesn't need to know what socket events mode is being used nor are the implementation aspects of (de)registering it its concern, that is now
EdgeTriggeredEvents
problem.Additional Information
kqueue
-specific logic.Breaking Changes
Dependency for refactor: backport bitcoin#24356, extend
-socketevents
toSock
, implementSock::WaitMany
{Epoll
,KQueue
} #6018More logging has been introduced and existing log messages have been made more exhaustive. If there is parsing that relies on a particular template, they will have to be updated.
If
EdgeTriggeredEvents
orWakeupPipes
fail to initialize or are incorrectly initialized and not destroyed immediately, any further attempts at calling any of its functions will result in anassert
-induced crash. Earlier behavior may have allowed for silent failure but segmentation of logic fromCConnman
means the newly created instances must only exist if the circumstances needed for it to initialize correctly are present.This is to ensure that
CConnman
doesn't have to concern itself with internal workings of either entities.Checklist: