StreamSocket::checkRemoval: Signal shutdown only if appropriate #10326
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
5 tasks
mmeeks
reviewed
Oct 25, 2024
…wing to drain bytes instead of hard disconnect Signal shutdown only if appropriate, allowing to drain bytes instead of hard disconnect. Only in case of SigUtil::getTerminationFlag(), we force disconnection. SocketPoll::poll() hence checks isClosed() after checkRemoval() for forced Socket removal. A pending signaled shutdown may occure via handlePoll() after processing more I/O data. Further, remove useless setClosed() in checkRemoval() after asserting !isOpen(). Signed-off-by: Sven Göthel <[email protected]> Change-Id: I4e3ba962880b77017443236bc33b03ed20dcdd34
sgothel
force-pushed
the
private/sgothel/socket_removal_signalshutdown_only
branch
from
f81ec5c
to
46aab7f
Compare
Ashod
reviewed
Oct 26, 2024
| shutdown(); // signal | ||
| closeConnection(); // real -> setClosed() | ||
| _socketHandler->onDisconnect(); // Note: Ensure proper semantics of onDisconnect() | ||
| if( isOpen() ) |
There was a problem hiding this comment.
Spacing could also benefit from fixing up: if (isOpen()).
The reason this is more readable (I think) is because language statements are (emphatically) not function calls. Making them stand out helps the eye scan faster and more accurately. I suspect the preference to make them look like function calls is to homogenize the code, but in this case it can be misleading to the reader. Ditto for while, for, do, return, etc.
sgothel
deleted the
private/sgothel/socket_removal_signalshutdown_only
branch
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.
Change-Id: I4e3ba962880b77017443236bc33b03ed20dcdd34
Summary
Signal shutdown only if appropriate, allowing to drain bytes instead of hard disconnect. Only in case of SigUtil::getTerminationFlag(), we force disconnection.
SocketPoll::poll() hence checks isClosed() after checkRemoval() for forced Socket removal. A pending signaled shutdown may occure via handlePoll() after processing more I/O data.
Further, remove useless setClosed() in checkRemoval() after asserting !isOpen().
Checklist
make prettier-writeand formatted the code.make checkmake runand manually verified that everything looks okay