Fix sigint handling when running in helper mode #869
Merged
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
craigds
reviewed
Jun 14, 2023
rcoup
requested changes
Jun 14, 2023
craigds
approved these changes
Jun 19, 2023
kart/helper.py
Outdated
| # Join the process group of the calling process - so that if they get killed, we get killed to. | ||
| os.setpgid(0, calling_environment["pid"]) | ||
| os.environ["_KART_PGID_SET"] = "1" | ||
| except Exception as e: |
There was a problem hiding this comment.
I suspect this could catch a more specific exception class (OSError? or one of the subclasses: https://docs.python.org/3/library/exceptions.html#os-exceptions)
There was a problem hiding this comment.
Yes, the possible error codes from setpgid() are all mapped to subclasses of OSError.
rcoup
reviewed
Jun 19, 2023
rcoup
reviewed
Jun 19, 2023
cli_helper/kart.c
Outdated
Comment on lines
285
to
286
| char *socket_filename = malloc(strlen(getenv("HOME")) + strlen(".kart.1234567890.socket") + 2); | ||
| sprintf(socket_filename, "%s/.kart.%d.socket", getenv("HOME"), getsid(0)); |
There was a problem hiding this comment.
sprintf is evil 👿
Suggested change
| char *socket_filename = malloc(strlen(getenv("HOME")) + strlen(".kart.1234567890.socket") + 2); | |
| sprintf(socket_filename, "%s/.kart.%d.socket", getenv("HOME"), getsid(0)); | |
| size_t socket_filename_sz = strlen(getenv("HOME")) + strlen("/.kart..socket") + sizeof(pid_t) * 3 + 1; | |
| char *socket_filename = malloc(socket_filename_sz); | |
| int r = snprintf(socket_filename, socket_filename_sz, "%s/.kart.%d.socket", getenv("HOME"), getsid(0)); | |
| if (r < 0 || (size_t) r >= socket_filename_sz) | |
| { | |
| fprintf(stderr, "Error allocating socket filename\n"); | |
| exit(1); | |
| } | |
rcoup
reviewed
Jun 19, 2023
rcoup
approved these changes
Jun 19, 2023
tests/test_cli.py
Outdated
Comment on lines
117
to
120
| @pytest.mark.parametrize("use_helper", [False, True]) | ||
| def test_sigint_handling_unix(use_helper, tmp_path): | ||
| if is_windows: | ||
| return |
There was a problem hiding this comment.
Suggested change
| @pytest.mark.parametrize("use_helper", [False, True]) | |
| def test_sigint_handling_unix(use_helper, tmp_path): | |
| if is_windows: | |
| return | |
| @pytest.mark.skipif(os.name == "nt") | |
| @pytest.mark.parametrize("use_helper", [False, True]) | |
| def test_sigint_handling_unix(use_helper, tmp_path): |
kart/helper.py
Outdated
| # Join the process group of the calling process - so that if they get killed, we get killed to. | ||
| os.setpgid(0, calling_environment["pid"]) | ||
| os.environ["_KART_PGID_SET"] = "1" | ||
| except Exception as e: |
There was a problem hiding this comment.
Suggested change
| except Exception as e: | |
| except OSError as e: |
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.
Description
If kart.c receives a SIGINT while its waiting for python kart_cli, we need to SIGINT python kart_cli too.