OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* ser-unix.c (wait_for): New routine to handle read timeouts, 

etc.  Uses poll() if HAVE_TERMIO[S] is defined, select() otherwise.
This commit is contained in:
Stu Grossman 1993-05-04 02:22:14 +00:00
parent f6dddd4e1d
commit 9775789df6
2 changed files with 68 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 3 19:20:20 1993 Stu Grossman (grossman@cygnus.com)
* ser-unix.c (wait_for): New routine to handle read timeouts,
etc. Uses poll() if HAVE_TERMIO[S] is defined, select() otherwise.
Mon May 3 13:52:08 1993 Ian Lance Taylor (ian@cygnus.com)
* mips-pinsn.c (print_insn): Return value.

160
gdb/ser-unix.c
View File

@ -21,24 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "serial.h"
#include <fcntl.h>
#include <sys/types.h>
/* Note: HAVE_SELECT is not yet defined on all the systems which could
define it. The USE_ALARM_TIMEOUT code seems to work OK, though, so
it doesn't really matter. */
#if !defined (HAVE_SELECT)
#if defined (HAVE_TERMIO)
#define USE_TERMIO_TIMEOUT 1
#else
#define USE_ALARM_TIMEOUT 1
#endif
#endif
#if defined (HAVE_SELECT)
#include <sys/time.h>
#endif
#ifdef USE_ALARM_TIMEOUT
#include <signal.h>
#endif
#if !defined (HAVE_TERMIOS) && !defined (HAVE_TERMIO) && !defined (HAVE_SGTTY)
#define HAVE_SGTTY
@ -47,14 +30,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_TERMIOS
#include <termios.h>
#include <unistd.h>
#include <poll.h>
#endif
#ifdef HAVE_TERMIO
#include <termio.h>
#include <poll.h>
#endif
#ifdef HAVE_SGTTY
#include <sgtty.h>
#endif
static int hardwire_open PARAMS ((serial_t scb, const char *name));
static void hardwire_raw PARAMS ((serial_t scb));
static int wait_for PARAMS ((serial_t scb, int timeout));
static int hardwire_readchar PARAMS ((serial_t scb, int timeout));
static int rate_to_code PARAMS ((int rate));
static int hardwire_setbaudrate PARAMS ((serial_t scb, int rate));
static int hardwire_write PARAMS ((serial_t scb, const char *str, int len));
static void hardwire_restore PARAMS ((serial_t scb));
static void hardwire_close PARAMS ((serial_t scb));
/* Open up a real live device for serial I/O */
static int
@ -131,13 +126,52 @@ hardwire_raw(scb)
#endif
}
#ifdef USE_ALARM_TIMEOUT
/* Called when SIGALRM sent. */
static void
remote_timer ()
/* Wait for input on scb, with timeout seconds */
static int
wait_for(scb, timeout)
serial_t scb;
int timeout;
{
int numfds;
#ifdef HAVE_SGTTY
struct timeval tv;
fd_set readfds;
FD_ZERO (&readfds);
tv.tv_sec = timeout;
tv.tv_usec = 0;
FD_SET(scb->fd, &readfds);
if (timeout >= 0)
numfds = select(scb->fd+1, &readfds, 0, 0, &tv);
else
numfds = select(scb->fd+1, &readfds, 0, 0, 0);
#endif /* HAVE_SGTTY */
#if defined HAVE_TERMIO || defined HAVE_TERMIOS
struct pollfd pollfd;
pollfd.fd = scb->fd;
pollfd.events = POLLIN | POLLPRI;
if (timeout > 0)
timeout *= 1000;
numfds = poll(&pollfd, 1, timeout);
#endif /* defined HAVE_TERMIO || defined HAVE_TERMIOS */
if (numfds <= 0)
if (numfds == 0)
return SERIAL_TIMEOUT;
else
return SERIAL_ERROR; /* Got an error from select or poll */
}
#endif
/* Read a character with user-specified timeout. TIMEOUT is number of seconds
to wait, or -1 to wait forever. Use timeout of 0 to effect a poll. Returns
@ -149,86 +183,17 @@ hardwire_readchar(scb, timeout)
serial_t scb;
int timeout;
{
int status;
if (scb->bufcnt-- > 0)
return *scb->bufp++;
#ifdef HAVE_SELECT
{
int numfds;
struct timeval tv;
fd_set readfds;
FD_ZERO (&readfds);
status = wait_for(scb, timeout);
tv.tv_sec = timeout;
tv.tv_usec = 0;
if (status < 0)
return status;
FD_SET(scb->fd, &readfds);
if (timeout >= 0)
numfds = select(scb->fd+1, &readfds, 0, 0, &tv);
else
numfds = select(scb->fd+1, &readfds, 0, 0, 0);
if (numfds <= 0)
if (numfds == 0)
return SERIAL_TIMEOUT;
else
return SERIAL_ERROR; /* Got an error from select */
scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
}
#endif /* HAVE_SELECT. */
#ifdef USE_TERMIO_TIMEOUT
{
struct termio termio;
if (ioctl (scb->fd, TCGETA, &termio))
{
fprintf(stderr, "TCGETA failed: %s\n", safe_strerror(errno));
}
termio.c_cc[VTIME] = timeout * 10;
if (ioctl (scb->fd, TCSETA, &termio))
{
fprintf(stderr, "TCSETA failed: %s\n", safe_strerror(errno));
}
scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
if (scb->bufcnt == 0)
/* Can this also mean end of file? Does "end of file" have any
meaning with ICANON clear? */
return SERIAL_TIMEOUT;
}
#endif /* USE_TERMIO_TIMEOUT. */
#ifdef USE_ALARM_TIMEOUT
{
void (*old_sigalrm_handler) ();
int save_errno;
#ifndef NO_SIGINTERRUPT
/* Cause SIGARLM to make read fail with EINTR. */
if (siginterrupt (SIGALRM, 1) != 0)
fprintf (stderr, "siginterrupt failed: %s\n", safe_strerror (errno));
#endif
old_sigalrm_handler = (void (*) ()) signal (SIGALRM, remote_timer);
if (old_sigalrm_handler == (void (*) ()) -1)
fprintf (stderr, "signal failed: %s\n", safe_strerror (errno));
alarm (timeout);
scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
save_errno = errno;
alarm (0);
signal (SIGALRM, old_sigalrm_handler);
if (scb->bufcnt < 0 && errno == EINTR)
{
return SERIAL_TIMEOUT;
}
}
#endif /* USE_ALARM_TIMEOUT */
scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
if (scb->bufcnt <= 0)
if (scb->bufcnt == 0)
@ -390,6 +355,7 @@ static struct serial_ops hardwire_ops =
hardwire_setbaudrate
};
void
_initialize_ser_hardwire ()
{
serial_add_interface (&hardwire_ops);