CbC/CbC_gcc: gcc/ada/libgnat/g-expect.adb comparison

comparison gcc/ada/libgnat/g-expect.adb @ 145:1830386684a0

gcc-9.2.0

author	anatofuz
date	Thu, 13 Feb 2020 11:34:05 +0900
parents	84e7813d76e9
children

comparison

equal deleted inserted replaced

-:84e7813d76e9
+:1830386684a0
 --                                                                          --
 --                          G N A T . E X P E C T                           --
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2000-2018, AdaCore                     --
+--                     Copyright (C) 2000-2019, AdaCore                     --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 is
 Current_Filter : Filter_List;
 Next_Filter    : Filter_List;
 begin
-if Descriptor.Input_Fd /= Invalid_FD then
+Close_Input (Descriptor);
-Close (Descriptor.Input_Fd);
-end if;
+if Descriptor.Error_Fd /= Descriptor.Output_Fd
+and then Descriptor.Error_Fd /= Invalid_FD
-if Descriptor.Error_Fd /= Descriptor.Output_Fd then
+then
 Close (Descriptor.Error_Fd);
 end if;
-Close (Descriptor.Output_Fd);
+if Descriptor.Output_Fd /= Invalid_FD then
+Close (Descriptor.Output_Fd);
+end if;
 --  ??? Should have timeouts for different signals
 if Descriptor.Pid > 0 then  --  see comment in Send_Signal
 Kill (Descriptor.Pid, Sig_Num => 9, Close => 0);
 Status : Integer;
 pragma Unreferenced (Status);
 begin
 Close (Descriptor, Status);
 end Close;
+-----------------
+-- Close_Input --
+-----------------
+procedure Close_Input (Pid : in out Process_Descriptor) is
+begin
+if Pid.Input_Fd /= Invalid_FD then
+Close (Pid.Input_Fd);
+end if;
+if Pid.Output_Fd = Pid.Input_Fd then
+Pid.Output_Fd := Invalid_FD;
+end if;
+if Pid.Error_Fd = Pid.Input_Fd then
+Pid.Error_Fd := Invalid_FD;
+end if;
+Pid.Input_Fd := Invalid_FD;
+end Close_Input;
 ------------
 -- Expect --
 ------------
 type Integer_Array is array (Fds'Range) of Integer;
 Is_Set : aliased Integer_Array;
 begin
 for J in Descriptors'Range loop
-if Descriptors (J) /= null then
+if Descriptors (J) /= null
+and then Descriptors (J).Output_Fd /= Invalid_FD
+then
 Fds (Fds'First + Fds_Count) := Descriptors (J).Output_Fd;
 Fds_To_Descriptor (Fds'First + Fds_Count) := J;
 Fds_Count := Fds_Count + 1;
 if Descriptors (J).Buffer_Size = 0 then
 Integer'Max (Buffer_Size, Descriptors (J).Buffer_Size);
 end if;
 end if;
 end loop;
+if Fds_Count = 0 then
+--  There are no descriptors to monitor, it means that process died.
+Result := Expect_Process_Died;
+return;
+end if;
 declare
 Buffer : aliased String (1 .. Buffer_Size);
 --  Buffer used for input. This is allocated only once, not for
 --  every iteration of the loop
 begin
 --  Loop until we match or we have a timeout
 loop
-Num_Descriptors :=
+--  Poll may be interrupted on Linux by a signal and need to be
-Poll (Fds'Address, Fds_Count, Timeout, D'Access, Is_Set'Address);
+--  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
 --  Error?
 when -1 =>
 Result := Expect_Internal_Error;
 if D /= 0 then
-Close (Descriptors (D).Input_Fd);
+Close_Input (Descriptors (D).all);
-Descriptors (D).Input_Fd := Invalid_FD;
 end if;
 return;
 --  Timeout?
 if Buffer_Size = 0 then
 Buffer_Size := 4096;
 end if;
-N := Read (Descriptors (D).Output_Fd, Buffer'Address,
+--  Read may be interrupted on Linux by a signal and
-Buffer_Size);
+--  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
+Close_Input (Descriptors (D).all);
---  in that case. See LiterateA.C:174
-Close (Descriptors (D).Input_Fd);
-Descriptors (D).Input_Fd := Invalid_FD;
 Result := Expect_Process_Died;
 return;
 else
 --  If there is no limit to the buffer size
 if Input'Length > 0 then
 Send (Process, Input);
 end if;
-Close (Process.Input_Fd);
+Close_Input (Process);
-Process.Input_Fd := Invalid_FD;
 declare
 Result : Expect_Match;
 pragma Unreferenced (Result);

Mercurial > hg > CbC > CbC_gcc

comparison gcc/ada/libgnat/g-expect.adb @ 145:1830386684a0