build: Probe MSG_DONTWAIT in the same way as MSG_NOSIGNAL #9921
Conversation
This file contains hidden or 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
Instead of the WIN32-specific workaround, detect lack of `MSG_DONTWAIT` in the build system. This allows other platforms without `MSG_DONTWAIT` to work too.
Define MSG_DONTWAIT and MSG_NO_SIGNAL in the implementation files that use them (`net.cpp` and `netbase.cpp`), instead of compat.h which is included all over the place. This avoids putting them in the global namespace, as defining them as 0 is a hack that works for our specific usage, but it is not a general solution. Also makes sure they are defined only once so the `!defined(MSG_x)` guard can go.
`u_int` is not available on some platforms (not sure what standard it's supposed to be part of), we don't use it anywhere else, and it doesn't hurt to simply write `unsigned int` out here.
Member
|
Whoops, missed the assignment here (saw your IRC ping though, thanks!). utACK a4d1c9f. Yes, Much of this stuff goes away with libevent. I like the move out of compat as well. For anything that libevent doesn't end up absorbing, it'd be nice to make everything else local the same way. |
laanwj
added a commit
that referenced
this pull request
Mar 16, 2017
a4d1c9f compat: use `unsigned int` instead of `u_int` (Wladimir J. van der Laan) 25da1ee build: cleanup: define MSG_DONTWAIT/MSG_NO_SIGNAL locally (Wladimir J. van der Laan) c459d50 build: Probe MSG_DONTWAIT in the same way as MSG_NOSIGNAL (Wladimir J. van der Laan) Tree-SHA512: 60d79d69439bb181465e4244aa5ddc28bbd84f69c0ca0c753956b3798c9022394e29d791bc085fe7ffb1268c64c789a57e24797daad63525bb776088188ff9ae
laanwj
added a commit
to laanwj/bitcoin
that referenced
this pull request
Mar 16, 2017
Introduced in bitcoin#9921. Thanks to Pavol Rusnak for spotting this one.
Closed
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
May 6, 2019
…NOSIGNAL a4d1c9f compat: use `unsigned int` instead of `u_int` (Wladimir J. van der Laan) 25da1ee build: cleanup: define MSG_DONTWAIT/MSG_NO_SIGNAL locally (Wladimir J. van der Laan) c459d50 build: Probe MSG_DONTWAIT in the same way as MSG_NOSIGNAL (Wladimir J. van der Laan) Tree-SHA512: 60d79d69439bb181465e4244aa5ddc28bbd84f69c0ca0c753956b3798c9022394e29d791bc085fe7ffb1268c64c789a57e24797daad63525bb776088188ff9ae fix merge error in configure.ac Signed-off-by: Pasta <Pasta@dash.org>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
build: Probe MSG_DONTWAIT in the same way as MSG_NOSIGNAL
Instead of the WIN32-specific workaround, detect lack of
MSG_DONTWAITin the build system. This allows other platforms withoutMSG_DONTWAITto work too.build: cleanup: define MSG_DONTWAIT/MSG_NO_SIGNAL locall
Define MSG_DONTWAIT and MSG_NO_SIGNAL in the implementation files that use them (
net.cppandnetbase.cpp), instead of compat.h which is included all over the place.This avoids putting them in the global namespace, as defining them as 0 is a hack that works for our specific usage, but it is not a general solution.
Also makes sure they are defined only once so the
!defined(MSG_x)guard can go.compat: use
unsigned intinstead ofu_intu_int(without size specifier) is not available on some platforms (not sure what standard it's supposed to be part of), we don't use it anywhere else, and it doesn't hurt to simply writeunsigned intout here.