Extend Blocking SIGINT Fix to JSON and Presentation Inputs #170
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
shw700
reviewed
Jan 13, 2025
nmsg/input_json.c
Outdated
| @@ -57,6 +57,15 @@ _input_json_read(nmsg_input_t input, nmsg_message_t *msg) { | |||
| struct nmsg_strbuf_storage sbs; | |||
| struct nmsg_strbuf *sb = _nmsg_strbuf_init(&sbs); | |||
|
|
|||
| /* make sure our input is valid and that we have nothing to read */ | |||
There was a problem hiding this comment.
I think that given that we will now have this exact code stanza in exactly 3 different places, it might be time to make a common function like nmsg_res input_can_read(int fd) ... maybe in nmsg/input.c ?
There was a problem hiding this comment.
Good idea; done.
kadealicious
force-pushed
the
sigint-json-pres-inputs
branch
from
e9294bb to
fd58770
Compare
shw700
approved these changes
Jan 17, 2025
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.
In MR #156, a bugfix was added to prevent NMSG inputs from blocking on SIGINT; this fix did not extend to JSON and Presentation inputs. That has been fixed here, and the same reviewers of that MR have also been added here.
I have also verified that this bug does not occur with PCAP, ZMQ, and socket inputs.
Note: The original unit test
test-io/test_dummy()would fail if the value returned fromnmsg_input_read()(and by extension_input_read_json()) was notnmsg_res_successornmsg_res_eof. The ideal solution to this, as discussed by Stephen and I, is to adjust the unit test to callnmsg_input_read()again whennmsg_res_againis returned. The intention is that this is a backwards-compatible change that conveys more information to the caller ofnmsg_input_read().