diff options
author | Pedro Alves <palves@redhat.com> | 2012-06-13 11:06:50 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2012-06-13 11:06:50 +0000 |
commit | e02f3d0d618dd79d0a72216b421f4fb9d91db72c (patch) | |
tree | 0826439ecbf6e9d4fff1325725f24223dc449372 /gdb/serial.c | |
parent | ccb430de2b34ed7414e294a9620acfc0b302ac41 (diff) | |
download | gdb-e02f3d0d618dd79d0a72216b421f4fb9d91db72c.tar.gz |
2012-06-13 Pedro Alves <palves@redhat.com>
Partial revert of previous change.
* serial.c (scb_base): New global.
(serial_for_fd): New.
(serial_open, serial_fdopen_ops): Link new serial in open serials
chain.
(do_serial_close): Unlink serial from the open serials chain.
Diffstat (limited to 'gdb/serial.c')
-rw-r--r-- | gdb/serial.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/gdb/serial.c b/gdb/serial.c index 1140feb93c5..df18b2fa5a9 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -33,6 +33,10 @@ static int global_serial_debug_p; static struct serial_ops *serial_ops_list = NULL; +/* Pointer to list of scb's. */ + +static struct serial *scb_base; + /* Non-NULL gives filename which contains a recording of the remote session, suitable for playback by gdbserver. */ @@ -157,6 +161,21 @@ serial_add_interface (struct serial_ops *optable) serial_ops_list = optable; } +/* Return the open serial device for FD, if found, or NULL if FD is + not already opened. */ + +struct serial * +serial_for_fd (int fd) +{ + struct serial *scb; + + for (scb = scb_base; scb; scb = scb->next) + if (scb->fd == fd) + return scb; + + return NULL; +} + /* Open up a device or a network socket, depending upon the syntax of NAME. */ struct serial * @@ -206,10 +225,12 @@ serial_open (const char *name) } scb->name = xstrdup (name); + scb->next = scb_base; scb->debug_p = 0; scb->async_state = 0; scb->async_handler = NULL; scb->async_context = NULL; + scb_base = scb; if (serial_logfile != NULL) { @@ -249,10 +270,12 @@ serial_fdopen_ops (const int fd, struct serial_ops *ops) scb->refcnt = 1; scb->name = NULL; + scb->next = scb_base; scb->debug_p = 0; scb->async_state = 0; scb->async_handler = NULL; scb->async_context = NULL; + scb_base = scb; if ((ops->fdopen) != NULL) (*ops->fdopen) (scb, fd); @@ -296,6 +319,18 @@ do_serial_close (struct serial *scb, int really_close) /* For serial_is_open. */ scb->bufp = NULL; + if (scb_base == scb) + scb_base = scb_base->next; + else + for (tmp_scb = scb_base; tmp_scb; tmp_scb = tmp_scb->next) + { + if (tmp_scb->next != scb) + continue; + + tmp_scb->next = tmp_scb->next->next; + break; + } + serial_unref (scb); } |