From patchwork Wed Aug 21 08:31:43 2019 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: 1150696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-507425-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="bXqKF920"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46D1BH4rqlz9sBp for ; Wed, 21 Aug 2019 18:32:39 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=de9wcg0rD5RNSVO4uevEN12AZCnk2zjgT3Ekr6Nnr1C4TduYIC gzEkYZTuJrKS/cCOkh1mcKgRZp48jA7IwTLg5pW6WYaNn2MsUzQqiPtSWRn4Q7Nw ms2Qb/YK0EfodZVvL/mlzlXHmpwMNc7DcjaFVBU5PbAIMNf2cHG+HEk+Y= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=0Xa6SZYNo29PlKegV52raAH76bM=; b=bXqKF920DOhlQhCH/ZrF NmxgMC5fPavpqKKSUZ1kEHsvNYSgcfxf2jUr9dlIkpFnicrFb6vklBY4WZ15RkJc YBpTeE1vAd8uhUFyqI79vSNm8IOFyZx8TYFIY0wGEc5Bnmo9Kfi8ngR/Uvn8SB/7 G1x0dI0oRsjlq7Sunwjj5aQ= Received: (qmail 95667 invoked by alias); 21 Aug 2019 08:31:48 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 95614 invoked by uid 89); 21 Aug 2019 08:31:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=retry X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 21 Aug 2019 08:31:46 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 88794116401; Wed, 21 Aug 2019 04:31:43 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fpy+ReDpWjpB; Wed, 21 Aug 2019 04:31:43 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 775641163EA; Wed, 21 Aug 2019 04:31:43 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 732CD646; Wed, 21 Aug 2019 04:31:43 -0400 (EDT) Date: Wed, 21 Aug 2019 04:31:43 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Vadim Godunko Subject: [Ada] Improve detection of end of the process by GNAT.Expect Message-ID: <20190821083143.GA71923@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes 'read' system call may be interrupted by signal with 'errno' is set to EINTER. In this case, re-try a few times. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-08-21 Vadim Godunko gcc/ada/ * libgnat/g-expect.adb (Expect_Internal): Attempt to read several times when 'read' returns non-positive. --- gcc/ada/libgnat/g-expect.adb +++ gcc/ada/libgnat/g-expect.adb @@ -692,15 +692,21 @@ package body GNAT.Expect is Buffer_Size := 4096; end if; - N := Read (Descriptors (D).Output_Fd, Buffer'Address, - Buffer_Size); + -- Read may be interrupted on Linux by a signal and + -- need to be repeated. We don't want to check for + -- errno = EINTER, so just attempt to read a few + -- times. + + for J in 1 .. 3 loop + N := Read (Descriptors (D).Output_Fd, + Buffer'Address, Buffer_Size); + + exit when N > 0; + end loop; -- Error or End of file if N <= 0 then - -- ??? Note that ddd tries again up to three times - -- in that case. See LiterateA.C:174 - Close (Descriptors (D).Input_Fd); Descriptors (D).Input_Fd := Invalid_FD; Result := Expect_Process_Died;