From: Pierre-Marie de Rodat <derodat@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Dmitriy Anisimkov <anisimko@adacore.com>
Subject: [Ada] Fix __gnat_kill on Windows
Date: Fri, 7 Jan 2022 16:27:16 +0000 [thread overview]
Message-ID: <20220107162716.GA948658@adacore.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
Terminate process only on terminating signals.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* adaint.c (__gnat_kill): Terminate process only in case of
SIGKILL, SIGINT, SIGBREAK, SIGTERM, SIGABRT. Do not call
OpenProcess if not going to terminate process.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 737 bytes --]
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -3559,13 +3559,21 @@ void
__gnat_kill (int pid, int sig, int close ATTRIBUTE_UNUSED)
{
#if defined(_WIN32)
- HANDLE h = OpenProcess (PROCESS_ALL_ACCESS, FALSE, pid);
- if (h == NULL)
- return;
+ HANDLE h;
- TerminateProcess (h, sig);
+ switch (sig) {
+ case 9: // SIGKILL is not declared in Windows headers
+ case SIGINT:
+ case SIGBREAK:
+ case SIGTERM:
+ case SIGABRT:
+ h = OpenProcess (PROCESS_ALL_ACCESS, FALSE, pid);
+ if (h != NULL) {
+ TerminateProcess (h, sig);
+ CloseHandle (h);
+ }
+ }
- CloseHandle (h);
#elif defined (__vxworks)
/* Not implemented */
#else
reply other threads:[~2022-01-07 16:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220107162716.GA948658@adacore.com \
--to=derodat@adacore.com \
--cc=anisimko@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).