[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 09/15: Install 'mingw_take_signal' on MinGW.
From: |
Jan Nieuwenhuizen |
Subject: |
[Guile-commits] 09/15: Install 'mingw_take_signal' on MinGW. |
Date: |
Mon, 12 Apr 2021 05:55:44 -0400 (EDT) |
janneke pushed a commit to branch wip-mingw
in repository guile.
commit c71d5de5c55557099318b8c278b6cef2b1115b85
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Oct 30 13:32:00 2020 +0100
Install 'mingw_take_signal' on MinGW.
After installing a signal handler, these are handled
* C-c
* kill -SIGINT <guile.exe-pid> (the wine process) works
these result in a direct terminate (or kill even?)
- kill <guile.exe-pid>
- wine cmd /c guile -c '(kill <guile-exe.pid> SIGINT)'
- wine cmd /c guile -c '(kill <guile-exe.pid> SIGTERM)'
* libguile/scmsigs.c (mingw_take_signal)[__MINGW32__]: New function.
install_mingw_take_signal)[__MINGW32__]: New function.
(scm_init_scmsigs)[__MINGW32__]: Use it.
---
libguile/scmsigs.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 0a33ed6..c234c01 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -41,6 +41,11 @@
#include <full-write.h>
+#ifdef __MINGW32__
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
#include "async.h"
#include "boolean.h"
#include "dynwind.h"
@@ -264,6 +269,34 @@ scm_i_ensure_signal_delivery_thread ()
#endif /* !SCM_USE_PTHREAD_THREADS */
+#ifdef __MINGW32__
+int _mingw_debug_p ();
+
+static BOOL
+mingw_take_signal (DWORD ctrl_signal)
+{
+ if (_mingw_debug_p ())
+ fprintf (stderr, "mingw_take_signal: %lu\n", ctrl_signal);
+
+ switch (ctrl_signal)
+ {
+ case CTRL_C_EVENT:
+ take_signal (SIGINT);
+ break;
+ case CTRL_BREAK_EVENT:
+ take_signal (SIGTERM);
+ break;
+ }
+ return TRUE;
+}
+
+static void
+install_mingw_take_signal ()
+{
+ SetConsoleCtrlHandler ((PHANDLER_ROUTINE) mingw_take_signal, TRUE);
+}
+#endif /* __MINGW32__ */
+
static void
install_handler (int signum, SCM thread, SCM handler)
{
@@ -765,6 +798,10 @@ scm_init_scmsigs ()
#endif
}
+#ifdef __MINGW32__
+ install_mingw_take_signal ();
+#endif
+
scm_c_define ("NSIG", scm_from_long (NSIG));
scm_c_define ("SIG_IGN", scm_from_long ((long) SIG_IGN));
scm_c_define ("SIG_DFL", scm_from_long ((long) SIG_DFL));
- [Guile-commits] 15/15: DEBUG guile.cmd: Some Wine help., (continued)
- [Guile-commits] 15/15: DEBUG guile.cmd: Some Wine help., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 05/15: Compile fix for x86_64-MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 06/15: Add 'set-mode' procedure for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 11/15: DRAFT Add partial `scm_fcntl' support for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 08/15: Make `read-bytes' suspendable for socket reads on MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 12/15: Define 'SIGHUP' for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 01/15: Document write-line., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 03/15: Fix 'gethostname' prototype for x86_64-MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 04/15: Clear errno before CreateProcess for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 07/15: Add `scm_sigaction_for_thread' stub for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 09/15: Install 'mingw_take_signal' on MinGW.,
Jan Nieuwenhuizen <=
- [Guile-commits] 13/15: Fix 'absolute-file-name?' and others for cross-build to MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 14/15: guix: Add guile-patched, guile-mingw., Jan Nieuwenhuizen, 2021/04/12