diff options
author | Alexis Christoforides <alexis@thenull.net> | 2019-08-09 10:31:57 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-09 10:31:57 +0300 |
commit | 2c4b60fe24bfbccb3fa1553aed1065ce072343e1 (patch) | |
tree | 4bb49c6a8dc60edb3cb2ee8ac1b01ca774e2df7f /configure.ac | |
parent | 6a459c25d771dec436bb6a8785c683f6b15fe6f7 (diff) |
[merp] Use a separate program as the hang supervisor. (#15715)
* [merp] Use a separate program as the hang supervisor.
Fixes https://github.com/mono/mono/issues/15646
macOS does not like signals being sent from the forked supervisor process, possibly towards anywhere but definitely when sent to the parent process. The following message is currently spewed after the supervisor process attempting to send a SIGSEGV to a hanged Mono process:
"The process has forked and you cannot use this CoreFoundation functionality safely. You MUST exec()."
We follow that direction and introduce a new binary that, when available in the mono executable's binary directory, is used to abort the parent process for us.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b41dbb5f31d..99380f0ead1 100644 --- a/configure.ac +++ b/configure.ac @@ -6075,6 +6075,7 @@ AC_CONFIG_FILES([po/mcs/Makefile.in]) AC_CONFIG_FILES([acceptance-tests/microbench-perf.sh],[chmod +x acceptance-tests/microbench-perf.sh]) AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper]) AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper]) +AC_CONFIG_FILES([runtime/bin/mono-hang-watchdog],[chmod +x runtime/bin/mono-hang-watchdog]) AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config], [ depth=../../../.. @@ -6746,6 +6747,7 @@ tools/Makefile tools/locale-builder/Makefile tools/sgen/Makefile tools/pedump/Makefile +tools/mono-hang-watchdog/Makefile runtime/Makefile msvc/Makefile po/Makefile |