From patchwork Fri Jan 7 16:27:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1576717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=V8KNexef; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JVpzb3w5yz9t25 for ; Sat, 8 Jan 2022 03:47:23 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6046F3857C66 for ; Fri, 7 Jan 2022 16:47:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6046F3857C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641574041; bh=aLnxfPL+B/o4U7Oi7GSzeLEmhdx0bYAxzHJiFgUeBxo=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=V8KNexefMXkImklHErE4u5aZBbztI4i5nZmRPT0VurQ4x6VLRhFqIr2RUTp72DT+i 9yAoQeZW6e/5EUl6r0Z9kfb7TLvAScn/eWx9glns9ZddX93ddFLNKtw2Fsa07Z+q3n 9yYzxvETDNi+COfGVAZweseJbqmDg3/jGWcKvDyU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id E146F3857C59 for ; Fri, 7 Jan 2022 16:27:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E146F3857C59 Received: by mail-wm1-x32e.google.com with SMTP id c66so4260681wma.5 for ; Fri, 07 Jan 2022 08:27:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=aLnxfPL+B/o4U7Oi7GSzeLEmhdx0bYAxzHJiFgUeBxo=; b=6lms5nWssFvxICx1P/BJaMbg7nDuPdI3fb3XJzLTvejTWcnVqEJfu9eeVp1SjBnxNH rPj5UAKzIpNU1NHMxk3kU74ck6Wj1dv6aGabfIbdMLxOS+87CPEJV6voKXw4txNYPe6k qIgB8ftE92Pfq1zKAoYnqxQmX/ARb3JQiZV9xEKiY8iHPwDA3h/XXmgJf4B5pHqqB0TC VPHFFHNiIcEZX1UNu6XrM9CJCNTtInetkGeRh8h/6v4rRVsH6u35IlnPkA38FMDuqpU7 MM+AUDVBD0qT8AxSGCA6cLmPFYtAMpZ2Ibmk5aBEoHFWzu7QAzZaQwFdF9NZH7BxeNgj fIuQ== X-Gm-Message-State: AOAM53242vLFR9zoQWhTO58RpFgPeemLlcK7zGNJfLVMM7qsvhA4svqe fLVo/7l1kFHDpHncvUn24QAe0Q4MixlUEA== X-Google-Smtp-Source: ABdhPJzlAHQboLEL596bBmHO00p+8EUMomndeBs2mY8vFaSlHwwS35+9cvJ72us3FPqzFxBsoSYQsw== X-Received: by 2002:a1c:790c:: with SMTP id l12mr1278169wme.109.1641572837949; Fri, 07 Jan 2022 08:27:17 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id l26sm4624988wme.36.2022.01.07.08.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 08:27:17 -0800 (PST) Date: Fri, 7 Jan 2022 16:27:16 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix __gnat_kill on Windows Message-ID: <20220107162716.GA948658@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Dmitriy Anisimkov Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. 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