Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ written on the kernel's own calls.
openkal = "0.17.0"

[target.'cfg(os = "macos")'.dependencies]
openkal-macos = "0.15.0"
openkal-macos = "0.15.1"
```

Its purpose is as much to test the specification as to be used. A specification
Expand Down
2 changes: 1 addition & 1 deletion mcpp.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
namespace = "mcpplibs"
name = "openkal-macos"
version = "0.15.0"
version = "0.15.1"
description = "An implementation of openkal for macOS, written on the kernel's own calls. Its purpose is as much to test the specification as to be used."
license = "Apache-2.0"

Expand Down
5 changes: 3 additions & 2 deletions src/process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -865,9 +865,10 @@ const kal_u32* kal_process_stop_requested(void) {
int state = __atomic_load_n(&g_stop_armed, __ATOMIC_ACQUIRE);
if (state == 0) {
// SIGTERM is the one `kal_process_terminate' sends here; SIGINT is what
// an interactive stream delivers. Both are requests to end, which is the
// an interactive stream delivers; SIGHUP is the terminal that started
// the program closing (0.15.1). All are requests to end, which is the
// whole of what this word reports.
const bool ok = arm_one(15) && arm_one(2);
const bool ok = arm_one(15) && arm_one(2) && arm_one(1);
state = ok ? 1 : -1;
__atomic_store_n(&g_stop_armed, state, __ATOMIC_RELEASE);
}
Expand Down
18 changes: 18 additions & 0 deletions tests/stop_word_and_sigpipe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ void check(bool held, const char* what) {
}

int main(int argc, char** argv) {
if (argc > 1 && std::strcmp(argv[1], "--hang-up") == 0) {
const kal_u32* word = kal_process_stop_requested();
if (word == nullptr) return 90;
::kill(::getpid(), SIGHUP);
for (int i = 0; i < 1000 && *word == 0; ++i) ::usleep(1000);
if (*word == 0) return 91;
kal_process_end_as_requested();
return 92;
}
if (argc > 1 && std::strcmp(argv[1], "--end-as-requested") == 0) {
const kal_u32* word = kal_process_stop_requested();
if (word == nullptr) return 90;
Expand Down Expand Up @@ -57,6 +66,15 @@ int main(int argc, char** argv) {
::waitpid(child, &st, 0);
check(WIFSIGNALED(st) && WTERMSIG(st) == SIGTERM,
"a program that ends as requested is reported to its starter as ended by the request");
const pid_t hung = ::fork();
if (hung == 0) {
::execl(self, argv[0], "--hang-up", nullptr);
::_exit(93);
}
st = 0;
::waitpid(hung, &st, 0);
check(WIFSIGNALED(st) && WTERMSIG(st) == SIGHUP,
"a hang-up is taken over as a request, and the program ends as it would have (0.15.1)");
#else
(void)word; (void)argv;
#endif
Expand Down
Loading