From 19716ceb1676e1a947527b3ae1d59dce646dd76c Mon Sep 17 00:00:00 2001 From: Vadim Godunko Date: Tue, 17 Sep 2019 08:01:42 +0000 Subject: [PATCH] [Ada] GNAT.Expect (Expect_Internal): Try to call 'poll' few times 'poll' returns -1 in case of any error (including interruption by a signal), so call need to be repeated few times to avoid false failures. 2019-09-17 Vadim Godunko gcc/ada/ * libgnat/g-expect.adb (Expect_Internal): Try to call 'poll' few times. From-SVN: r275782 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/libgnat/g-expect.adb | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c952898352f..ab8c8a52226 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-09-17 Vadim Godunko + + * libgnat/g-expect.adb (Expect_Internal): Try to call 'poll' few + times. + 2019-09-17 Vadim Godunko * libgnat/g-expect.ads, libgnat/g-expect.adb (Close_Input): New diff --git a/gcc/ada/libgnat/g-expect.adb b/gcc/ada/libgnat/g-expect.adb index b44c7a5f016..0ee010e4cfb 100644 --- a/gcc/ada/libgnat/g-expect.adb +++ b/gcc/ada/libgnat/g-expect.adb @@ -679,8 +679,17 @@ package body GNAT.Expect is -- Loop until we match or we have a timeout loop - Num_Descriptors := - Poll (Fds'Address, Fds_Count, Timeout, D'Access, Is_Set'Address); + -- Poll 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 call Poll a few times. + + for J in 1 .. 3 loop + Num_Descriptors := + Poll + (Fds'Address, Fds_Count, Timeout, D'Access, Is_Set'Address); + + exit when Num_Descriptors /= -1; + end loop; case Num_Descriptors is -- 2.30.2