Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

[gdbsupport] Handle EINTR in event-pipe.cc

Browse Source 
Use gdb syscall wrappers to handle EINTR in event-pipe.cc.

Tested on aarch64-linux.
This commit is contained in:
Tom de Vries
2024-11-22 17:44:29 +01:00
parent 2af94d6c92
commit e031f02db3
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gdbsupport/event-pipe.cc
View File

@@ -19,6 +19,7 @@
#include "gdbsupport/event-pipe.h" #include "gdbsupport/event-pipe.h"
#include "gdbsupport/filestuff.h" #include "gdbsupport/filestuff.h"
#include "gdbsupport/eintr.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@@ -41,8 +42,8 @@ event_pipe::open_pipe ()
if (gdb_pipe_cloexec (m_fds) == -1) if (gdb_pipe_cloexec (m_fds) == -1)
return false; return false;
if (fcntl (m_fds[0], F_SETFL, O_NONBLOCK) == -1 if (gdb::fcntl (m_fds[0], F_SETFL, O_NONBLOCK) == -1
|| fcntl (m_fds[1], F_SETFL, O_NONBLOCK) == -1) || gdb::fcntl (m_fds[1], F_SETFL, O_NONBLOCK) == -1)
{ {
close_pipe (); close_pipe ();
return false; return false;
@@ -56,8 +57,8 @@ event_pipe::open_pipe ()
void void
event_pipe::close_pipe () event_pipe::close_pipe ()
{ {
::close (m_fds[0]); gdb::close (m_fds[0]);
::close (m_fds[1]); gdb::close (m_fds[1]);
m_fds[0] = -1; m_fds[0] = -1;
m_fds[1] = -1; m_fds[1] = -1;
} }
@@ -72,9 +73,9 @@ event_pipe::flush ()
do do
{ {
ret = read (m_fds[0], &buf, 1); ret = gdb::read (m_fds[0], &buf, 1);
} }
while (ret >= 0 || (ret == -1 && errno == EINTR)); while (ret >= 0);
} }
/* See event-pipe.h. */ /* See event-pipe.h. */
@@ -82,18 +83,12 @@ event_pipe::flush ()
void void
event_pipe::mark () event_pipe::mark ()
{ {
int ret;
/* It doesn't really matter what the pipe contains, as long we end /* It doesn't really matter what the pipe contains, as long we end
up with something in it. Might as well flush the previous up with something in it. Might as well flush the previous
left-overs. */ left-overs. */
flush (); flush ();
do gdb::write (m_fds[1], "+", 1);
{
ret = write (m_fds[1], "+", 1);
}
while (ret == -1 && errno == EINTR);
/* Ignore EAGAIN. If the pipe is full, the event loop will already /* Ignore EAGAIN. If the pipe is full, the event loop will already
be awakened anyway. */ be awakened anyway. */