Fix bugs during program shutdown #2552
Open
+3
−2
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.
This PR fixes two issues that may occur during program shutdown.
Phy::whack()is intended to be called from another thread to abortpoll(). However, I found that_whackReceiveSocketis not added to_readfdsviaFD_SET. As a result,Phy::whack()has no actual effect, and the program may block in theselect()call during shutdown.In
OneServiceImpl,_serverThreadRunning/_serverThreadRunningV6are used to decide whether to join the HTTPControlPlane threads (_serverThread/_serverThreadV6). However, these flags are not thread-safe. When the program is about to exit, after calling_controlPlane.stop()/_controlPlaneV6.stop(),_serverThreadRunning/_serverThreadRunningV6may immediately becomefalse, causing_serverThread/_serverThreadV6not to be joined. This can lead to the log messageterminate called without an active exceptionand the program exiting with code 134.The two commits in this PR fix the issues described above respectively.