This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
PATCH: Refactor ser-unix.c
- From: Mark Mitchell <mark at codesourcery dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Tue, 22 Mar 2005 00:17:03 -0800
- Subject: PATCH: Refactor ser-unix.c
- Reply-to: mark at codesourcery dot com
This patch splits ser-unix.c into two files:
* ser-base.c, which contains functions that have nothing to do with
UNIX, and
* ser-unix.c, which contains functions that are either (a)
UNIX-specific, or (b) deal with the "hardwire" serial interface.
The purpose of this patch is that for non-Cygwin Windows, we want the
functions in ser-base.c, but not those in ser-unix.c.
There are no changes to any of the routines; this is purely code
motion.
In order to keep the patch easiser to read, I did not rename the
ser-base.c routines with a ser_base prefix instead of the current
ser_unix prefix, but I would like to make that change before
check-in.
Tested on x86_64-unknown-linux-gnu. OK?
--
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com
2005-03-22 Mark Mitchell <mark@codesourcery.com>
* Makefile.in (SFILES): Add ser-base.c.
(ser_base_h): New variable.
(ser-base.o): New target.
(ser-pipe.o): Depend on $(ser_base_h).
(ser-tcp.o): Likewise.
(ser-unix.o): Likewise. Do not depend on $(event_loop_h).
* configure.ac (SER_HARDWIRE): Include ser-base.o where
appropriate.
* ser-base.c: New file.
(push_event): Move from ser-unix.c.
(fd_event): Likewise.
(reschedule): Likewise.
(ser_unix_write): Likewise.
(ser_unix_nop_flush_output): Likewise.
(ser_unix_flush_input): Likewise.
(ser_unix_nop_send_break): Likewise.
(ser_unix_nop_drain_output): Likewise.
(ser_unix_nop_raw): Likewise.
(ser_unix_nop_get_tty_state): Likewise.
(ser_unix_nop_set_tty_state): Likewise.
(ser_unix_nop_noflush_set_tty_state): Likewise.
(ser_unix_nop_print_tty_state): Likewise.
(ser_unix_nop_setbaudrate): Likewise.
(ser_unix_nop_setstopbits): Likewise.
(ser_unix_async): Likewise.
* ser-base.h: New file.
* ser-pipe.c (ser-base.h): Include it.
* ser-tcp.c (ser-base.h): Likewise.
* ser-unix.h (ser_unix_nop_flush_output): Remove.
(ser_unix_flush_input): Likewise.
(ser_unix_nop_send_break): Likewise.
(ser_unix_nop_raw): Likewise.
(ser_unix_nop_get_tty_state): Likewise.
(ser_unix_nop_set_tty_state): Likewise.
(ser_unix_nop_print_tty_state): Likewise.
(ser_unix_nop_noflush_set_tty_state): Likewise.
(ser_unix_nop_setbaudrate): Likewise.
(ser_unix_nop_setstopbits): Likewise.
(ser_unix_nop_drain_output): Likewise.
(ser_unix_wait_for): Likewise.
(ser_unix_write): Likewise.
(ser_unix_async): Likewise.
* ser-unix.c (event-loop.h): Do not include it.
(push_event): Move to ser-base.c.
(fd_event): Likewise.
(reschedule): Likewise.
(ser_unix_write): Likewise.
(ser_unix_nop_flush_output): Likewise.
(ser_unix_flush_input): Likewise.
(ser_unix_nop_send_break): Likewise.
(ser_unix_nop_drain_output): Likewise.
(ser_unix_nop_raw): Likewise.
(ser_unix_nop_get_tty_state): Likewise.
(ser_unix_nop_set_tty_state): Likewise.
(ser_unix_nop_noflush_set_tty_state): Likewise.
(ser_unix_nop_print_tty_state): Likewise.
(ser_unix_nop_setbaudrate): Likewise.
(ser_unix_nop_setstopbits): Likewise.
(ser_unix_async): Likewise.
(ser_unix_wait_for): Make it static.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.707
diff -c -5 -p -r1.707 Makefile.in
*** Makefile.in 18 Mar 2005 21:03:38 -0000 1.707
--- Makefile.in 22 Mar 2005 08:08:32 -0000
*************** SFILES = ada-exp.y ada-lang.c ada-typepr
*** 543,553 ****
objfiles.c osabi.c observer.c \
p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \
regcache.c reggroups.c remote.c remote-fileio.c \
scm-exp.c scm-lang.c scm-valprint.c \
sentinel-frame.c \
! serial.c ser-unix.c source.c \
stabsread.c stack.c std-regs.c symfile.c symfile-mem.c symmisc.c \
symtab.c \
target.c thread.c top.c tracepoint.c \
trad-frame.c \
tramp-frame.c \
--- 543,553 ----
objfiles.c osabi.c observer.c \
p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \
regcache.c reggroups.c remote.c remote-fileio.c \
scm-exp.c scm-lang.c scm-valprint.c \
sentinel-frame.c \
! serial.c ser-base.c ser-unix.c source.c \
stabsread.c stack.c std-regs.c symfile.c symfile-mem.c symmisc.c \
symtab.c \
target.c thread.c top.c tracepoint.c \
trad-frame.c \
tramp-frame.c \
*************** remote_utils_h = remote-utils.h $(target
*** 762,771 ****
--- 762,772 ----
s390_tdep_h = s390-tdep.h
scm_lang_h = scm-lang.h $(scm_tags_h)
scm_tags_h = scm-tags.h
sentinel_frame_h = sentinel-frame.h
serial_h = serial.h
+ ser_base_h = ser-base.h
ser_unix_h = ser-unix.h
shnbsd_tdep_h = shnbsd-tdep.h
sh_tdep_h = sh-tdep.h
sim_regno_h = sim-regno.h
solib_h = solib.h
*************** scm-valprint.o: scm-valprint.c $(defs_h)
*** 2483,2497 ****
sentinel-frame.o: sentinel-frame.c $(defs_h) $(regcache_h) \
$(sentinel_frame_h) $(inferior_h) $(frame_unwind_h)
ser-e7kpc.o: ser-e7kpc.c $(defs_h) $(serial_h) $(gdb_string_h)
ser-go32.o: ser-go32.c $(defs_h) $(gdbcmd_h) $(serial_h) $(gdb_string_h)
serial.o: serial.c $(defs_h) $(serial_h) $(gdb_string_h) $(gdbcmd_h)
! ser-pipe.o: ser-pipe.c $(defs_h) $(serial_h) $(ser_unix_h) $(gdb_vfork_h) \
$(gdb_string_h)
! ser-tcp.o: ser-tcp.c $(defs_h) $(serial_h) $(ser_unix_h) $(gdb_string_h)
! ser-unix.o: ser-unix.c $(defs_h) $(serial_h) $(ser_unix_h) $(terminal_h) \
! $(gdb_string_h) $(event_loop_h)
sh3-rom.o: sh3-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \
$(serial_h) $(srec_h) $(arch_utils_h) $(regcache_h) $(gdb_string_h) \
$(sh_tdep_h)
sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(objfiles_h) \
$(gdbtypes_h) $(gdbcmd_h) $(gdbcore_h) $(value_h) $(dis_asm_h) \
--- 2484,2500 ----
sentinel-frame.o: sentinel-frame.c $(defs_h) $(regcache_h) \
$(sentinel_frame_h) $(inferior_h) $(frame_unwind_h)
ser-e7kpc.o: ser-e7kpc.c $(defs_h) $(serial_h) $(gdb_string_h)
ser-go32.o: ser-go32.c $(defs_h) $(gdbcmd_h) $(serial_h) $(gdb_string_h)
serial.o: serial.c $(defs_h) $(serial_h) $(gdb_string_h) $(gdbcmd_h)
! ser-base.o: ser-base.c $(defs_h) $(serial_h) $(ser_base_h) $(event_loop_h)
! ser-pipe.o: ser-pipe.c $(defs_h) $(serial_h) $(ser_base_h) $(ser_unix_h) \
! $(gdb_vfork_h) $(gdb_string_h)
! ser-tcp.o: ser-tcp.c $(defs_h) $(serial_h) $(ser_base_h) $(ser_unix_h) \
$(gdb_string_h)
! ser-unix.o: ser-unix.c $(defs_h) $(serial_h) $(ser_base_h) $(ser_unix_h) \
! $(terminal_h) $(gdb_string_h)
sh3-rom.o: sh3-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \
$(serial_h) $(srec_h) $(arch_utils_h) $(regcache_h) $(gdb_string_h) \
$(sh_tdep_h)
sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(objfiles_h) \
$(gdbtypes_h) $(gdbcmd_h) $(gdbcore_h) $(value_h) $(dis_asm_h) \
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/gdb/configure.ac,v
retrieving revision 1.15
diff -c -5 -p -r1.15 configure.ac
*** configure.ac 21 Mar 2005 21:23:34 -0000 1.15
--- configure.ac 22 Mar 2005 08:08:33 -0000
*************** AC_CACHE_CHECK([for cygwin], gdb_cv_os_c
*** 1168,1181 ****
lose
#endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
dnl Figure out which of the many generic ser-*.c files the _host_ supports.
! SER_HARDWIRE="ser-unix.o ser-pipe.o ser-tcp.o"
case ${host} in
*go32* ) SER_HARDWIRE=ser-go32.o ;;
*djgpp* ) SER_HARDWIRE=ser-go32.o ;;
esac
AC_SUBST(SER_HARDWIRE)
# libreadline needs libuser32.a in a cygwin environment
WIN32LIBS=
--- 1168,1182 ----
lose
#endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
dnl Figure out which of the many generic ser-*.c files the _host_ supports.
! SER_HARDWIRE="ser-base.o ser-unix.o ser-pipe.o ser-tcp.o"
case ${host} in
*go32* ) SER_HARDWIRE=ser-go32.o ;;
*djgpp* ) SER_HARDWIRE=ser-go32.o ;;
+ *mingw32*) SER_HARDWIRE="ser-base.o ser-tcp.o" ;;
esac
AC_SUBST(SER_HARDWIRE)
# libreadline needs libuser32.a in a cygwin environment
WIN32LIBS=
Index: ser-base.c
===================================================================
RCS file: ser-base.c
diff -N ser-base.c
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- ser-base.c 22 Mar 2005 08:08:33 -0000
***************
*** 0 ****
--- 1,306 ----
+ /* Generic serial interface functions.
+
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2003, 2004, 2005 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+ #include "defs.h"
+ #include "serial.h"
+ #include "ser-unix.h"
+ #include "event-loop.h"
+
+ static timer_handler_func push_event;
+ static handler_func fd_event;
+
+ /* Event handling for ASYNC serial code.
+
+ At any time the SERIAL device either: has an empty FIFO and is
+ waiting on a FD event; or has a non-empty FIFO/error condition and
+ is constantly scheduling timer events.
+
+ ASYNC only stops pestering its client when it is de-async'ed or it
+ is told to go away. */
+
+ /* Value of scb->async_state: */
+ enum {
+ /* >= 0 (TIMER_SCHEDULED) */
+ /* The ID of the currently scheduled timer event. This state is
+ rarely encountered. Timer events are one-off so as soon as the
+ event is delivered the state is shanged to NOTHING_SCHEDULED. */
+ FD_SCHEDULED = -1,
+ /* The fd_event() handler is scheduled. It is called when ever the
+ file descriptor becomes ready. */
+ NOTHING_SCHEDULED = -2
+ /* Either no task is scheduled (just going into ASYNC mode) or a
+ timer event has just gone off and the current state has been
+ forced into nothing scheduled. */
+ };
+
+ /* Identify and schedule the next ASYNC task based on scb->async_state
+ and scb->buf* (the input FIFO). A state machine is used to avoid
+ the need to make redundant calls into the event-loop - the next
+ scheduled task is only changed when needed. */
+
+ void
+ reschedule (struct serial *scb)
+ {
+ if (serial_is_async_p (scb))
+ {
+ int next_state;
+ switch (scb->async_state)
+ {
+ case FD_SCHEDULED:
+ if (scb->bufcnt == 0)
+ next_state = FD_SCHEDULED;
+ else
+ {
+ delete_file_handler (scb->fd);
+ next_state = create_timer (0, push_event, scb);
+ }
+ break;
+ case NOTHING_SCHEDULED:
+ if (scb->bufcnt == 0)
+ {
+ add_file_handler (scb->fd, fd_event, scb);
+ next_state = FD_SCHEDULED;
+ }
+ else
+ {
+ next_state = create_timer (0, push_event, scb);
+ }
+ break;
+ default: /* TIMER SCHEDULED */
+ if (scb->bufcnt == 0)
+ {
+ delete_timer (scb->async_state);
+ add_file_handler (scb->fd, fd_event, scb);
+ next_state = FD_SCHEDULED;
+ }
+ else
+ next_state = scb->async_state;
+ break;
+ }
+ if (serial_debug_p (scb))
+ {
+ switch (next_state)
+ {
+ case FD_SCHEDULED:
+ if (scb->async_state != FD_SCHEDULED)
+ fprintf_unfiltered (gdb_stdlog, "[fd%d->fd-scheduled]\n",
+ scb->fd);
+ break;
+ default: /* TIMER SCHEDULED */
+ if (scb->async_state == FD_SCHEDULED)
+ fprintf_unfiltered (gdb_stdlog, "[fd%d->timer-scheduled]\n",
+ scb->fd);
+ break;
+ }
+ }
+ scb->async_state = next_state;
+ }
+ }
+
+ /* FD_EVENT: This is scheduled when the input FIFO is empty (and there
+ is no pending error). As soon as data arrives, it is read into the
+ input FIFO and the client notified. The client should then drain
+ the FIFO using readchar(). If the FIFO isn't immediatly emptied,
+ push_event() is used to nag the client until it is. */
+
+ static void
+ fd_event (int error, void *context)
+ {
+ struct serial *scb = context;
+ if (error != 0)
+ {
+ scb->bufcnt = SERIAL_ERROR;
+ }
+ else if (scb->bufcnt == 0)
+ {
+ /* Prime the input FIFO. The readchar() function is used to
+ pull characters out of the buffer. See also
+ generic_readchar(). */
+ int nr;
+ do
+ {
+ nr = read (scb->fd, scb->buf, BUFSIZ);
+ }
+ while (nr == -1 && errno == EINTR);
+ if (nr == 0)
+ {
+ scb->bufcnt = SERIAL_EOF;
+ }
+ else if (nr > 0)
+ {
+ scb->bufcnt = nr;
+ scb->bufp = scb->buf;
+ }
+ else
+ {
+ scb->bufcnt = SERIAL_ERROR;
+ }
+ }
+ scb->async_handler (scb, scb->async_context);
+ reschedule (scb);
+ }
+
+ /* PUSH_EVENT: The input FIFO is non-empty (or there is a pending
+ error). Nag the client until all the data has been read. In the
+ case of errors, the client will need to close or de-async the
+ device before naging stops. */
+
+ static void
+ push_event (void *context)
+ {
+ struct serial *scb = context;
+ scb->async_state = NOTHING_SCHEDULED; /* Timers are one-off */
+ scb->async_handler (scb, scb->async_context);
+ /* re-schedule */
+ reschedule (scb);
+ }
+
+ int
+ ser_unix_write (struct serial *scb, const char *str, int len)
+ {
+ int cc;
+
+ while (len > 0)
+ {
+ cc = write (scb->fd, str, len);
+
+ if (cc < 0)
+ return 1;
+ len -= cc;
+ str += cc;
+ }
+ return 0;
+ }
+
+ int
+ ser_unix_nop_flush_output (struct serial *scb)
+ {
+ return 0;
+ }
+
+ int
+ ser_unix_flush_input (struct serial *scb)
+ {
+ if (scb->bufcnt >= 0)
+ {
+ scb->bufcnt = 0;
+ scb->bufp = scb->buf;
+ return 0;
+ }
+ else
+ return SERIAL_ERROR;
+ }
+
+ int
+ ser_unix_nop_send_break (struct serial *scb)
+ {
+ return 0;
+ }
+
+ int
+ ser_unix_nop_drain_output (struct serial *scb)
+ {
+ return 0;
+ }
+
+ void
+ ser_unix_nop_raw (struct serial *scb)
+ {
+ return; /* Always in raw mode */
+ }
+
+ serial_ttystate
+ ser_unix_nop_get_tty_state (struct serial *scb)
+ {
+ /* allocate a dummy */
+ return (serial_ttystate) XMALLOC (int);
+ }
+
+ int
+ ser_unix_nop_set_tty_state (struct serial *scb, serial_ttystate ttystate)
+ {
+ return 0;
+ }
+
+ int
+ ser_unix_nop_noflush_set_tty_state (struct serial *scb,
+ serial_ttystate new_ttystate,
+ serial_ttystate old_ttystate)
+ {
+ return 0;
+ }
+
+ void
+ ser_unix_nop_print_tty_state (struct serial *scb,
+ serial_ttystate ttystate,
+ struct ui_file *stream)
+ {
+ /* Nothing to print. */
+ return;
+ }
+
+ int
+ ser_unix_nop_setbaudrate (struct serial *scb, int rate)
+ {
+ return 0; /* Never fails! */
+ }
+
+ int
+ ser_unix_nop_setstopbits (struct serial *scb, int num)
+ {
+ return 0; /* Never fails! */
+ }
+
+ /* Put the SERIAL device into/out-of ASYNC mode. */
+
+ void
+ ser_unix_async (struct serial *scb,
+ int async_p)
+ {
+ if (async_p)
+ {
+ /* Force a re-schedule. */
+ scb->async_state = NOTHING_SCHEDULED;
+ if (serial_debug_p (scb))
+ fprintf_unfiltered (gdb_stdlog, "[fd%d->asynchronous]\n",
+ scb->fd);
+ reschedule (scb);
+ }
+ else
+ {
+ if (serial_debug_p (scb))
+ fprintf_unfiltered (gdb_stdlog, "[fd%d->synchronous]\n",
+ scb->fd);
+ /* De-schedule whatever tasks are currently scheduled. */
+ switch (scb->async_state)
+ {
+ case FD_SCHEDULED:
+ delete_file_handler (scb->fd);
+ break;
+ case NOTHING_SCHEDULED:
+ break;
+ default: /* TIMER SCHEDULED */
+ delete_timer (scb->async_state);
+ break;
+ }
+ }
+ }
Index: ser-base.h
===================================================================
RCS file: ser-base.h
diff -N ser-base.h
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- ser-base.h 22 Mar 2005 08:08:33 -0000
***************
*** 0 ****
--- 1,50 ----
+ /* Generic serial interface functions.
+
+ Copyright 2005 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+ #ifndef SER_BASE_H
+ #define SER_BASE_H
+
+ struct serial;
+ struct ui_file;
+
+ extern void reschedule (struct serial *scb);
+ extern int ser_unix_nop_flush_output (struct serial *scb);
+ extern int ser_unix_flush_input (struct serial *scb);
+ extern int ser_unix_nop_send_break (struct serial *scb);
+ extern void ser_unix_nop_raw (struct serial *scb);
+ extern serial_ttystate ser_unix_nop_get_tty_state (struct serial *scb);
+ extern int ser_unix_nop_set_tty_state (struct serial *scb,
+ serial_ttystate ttystate);
+ extern void ser_unix_nop_print_tty_state (struct serial *scb,
+ serial_ttystate ttystate,
+ struct ui_file *stream);
+ extern int ser_unix_nop_noflush_set_tty_state (struct serial *scb,
+ serial_ttystate new_ttystate,
+ serial_ttystate old_ttystate);
+ extern int ser_unix_nop_setbaudrate (struct serial *scb, int rate);
+ extern int ser_unix_nop_setstopbits (struct serial *scb, int rate);
+ extern int ser_unix_nop_drain_output (struct serial *scb);
+
+ extern int ser_unix_write (struct serial *scb, const char *str, int len);
+
+ extern void ser_unix_async (struct serial *scb, int async_p);
+
+ #endif
Index: ser-pipe.c
===================================================================
RCS file: /cvs/src/src/gdb/ser-pipe.c,v
retrieving revision 1.13
diff -c -5 -p -r1.13 ser-pipe.c
*** ser-pipe.c 22 Jan 2004 22:20:39 -0000 1.13
--- ser-pipe.c 22 Mar 2005 08:08:33 -0000
***************
*** 20,29 ****
--- 20,30 ----
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "serial.h"
+ #include "ser-base.h"
#include "ser-unix.h"
#include "gdb_vfork.h"
#include <sys/types.h>
Index: ser-tcp.c
===================================================================
RCS file: /cvs/src/src/gdb/ser-tcp.c,v
6~retrieving revision 1.18
diff -c -5 -p -r1.18 ser-tcp.c
*** ser-tcp.c 16 Mar 2005 17:05:31 -0000 1.18
--- ser-tcp.c 22 Mar 2005 08:08:33 -0000
***************
*** 19,28 ****
--- 19,29 ----
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "serial.h"
+ #include "ser-base.h"
#include "ser-unix.h"
#include <sys/types.h>
#ifdef HAVE_SYS_FILIO_H
Index: ser-unix.c
===================================================================
RCS file: /cvs/src/src/gdb/ser-unix.c,v
retrieving revision 1.22
diff -c -5 -p -r1.22 ser-unix.c
*** ser-unix.c 11 Feb 2005 04:06:04 -0000 1.22
--- ser-unix.c 22 Mar 2005 08:08:33 -0000
***************
*** 1,9 ****
/* Serial interface for local (hardwired) serial ports on Un*x like systems
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! 2003, 2004 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- 1,9 ----
/* Serial interface for local (hardwired) serial ports on Un*x like systems
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
***************
*** 20,39 ****
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "serial.h"
#include "ser-unix.h"
#include <fcntl.h>
#include <sys/types.h>
#include "terminal.h"
#include <sys/socket.h>
#include <sys/time.h>
#include "gdb_string.h"
- #include "event-loop.h"
#ifdef HAVE_TERMIOS
struct hardwire_ttystate
{
--- 20,39 ----
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "serial.h"
+ #include "ser-base.h"
#include "ser-unix.h"
#include <fcntl.h>
#include <sys/types.h>
#include "terminal.h"
#include <sys/socket.h>
#include <sys/time.h>
#include "gdb_string.h"
#ifdef HAVE_TERMIOS
struct hardwire_ttystate
{
*************** static int hardwire_drain_output (struct
*** 90,104 ****
static int hardwire_flush_output (struct serial *);
static int hardwire_flush_input (struct serial *);
static int hardwire_send_break (struct serial *);
static int hardwire_setstopbits (struct serial *, int);
- static int do_unix_readchar (struct serial *scb, int timeout);
- static timer_handler_func push_event;
- static handler_func fd_event;
- static void reschedule (struct serial *scb);
-
void _initialize_ser_hardwire (void);
/* Open up a real live device for serial I/O */
static int
--- 90,99 ----
*************** hardwire_close (struct serial *scb)
*** 868,902 ****
close (scb->fd);
scb->fd = -1;
}
- /* Generic operations used by all UNIX/FD based serial interfaces. */
-
- serial_ttystate
- ser_unix_nop_get_tty_state (struct serial *scb)
- {
- /* allocate a dummy */
- return (serial_ttystate) XMALLOC (int);
- }
-
- int
- ser_unix_nop_set_tty_state (struct serial *scb, serial_ttystate ttystate)
- {
- return 0;
- }
-
- void
- ser_unix_nop_raw (struct serial *scb)
- {
- return; /* Always in raw mode */
- }
-
/* Wait for input on scb, with timeout seconds. Returns 0 on success,
otherwise SERIAL_TIMEOUT or SERIAL_ERROR. */
! int
ser_unix_wait_for (struct serial *scb, int timeout)
{
while (1)
{
int numfds;
--- 863,876 ----
close (scb->fd);
scb->fd = -1;
}
/* Wait for input on scb, with timeout seconds. Returns 0 on success,
otherwise SERIAL_TIMEOUT or SERIAL_ERROR. */
! static int
ser_unix_wait_for (struct serial *scb, int timeout)
{
while (1)
{
int numfds;
*************** generic_readchar (struct serial *scb, in
*** 1072,1342 ****
int
ser_unix_readchar (struct serial *scb, int timeout)
{
return generic_readchar (scb, timeout, do_unix_readchar);
}
-
- int
- ser_unix_nop_noflush_set_tty_state (struct serial *scb,
- serial_ttystate new_ttystate,
- serial_ttystate old_ttystate)
- {
- return 0;
- }
-
- void
- ser_unix_nop_print_tty_state (struct serial *scb,
- serial_ttystate ttystate,
- struct ui_file *stream)
- {
- /* Nothing to print. */
- return;
- }
-
- int
- ser_unix_nop_setbaudrate (struct serial *scb, int rate)
- {
- return 0; /* Never fails! */
- }
-
- int
- ser_unix_nop_setstopbits (struct serial *scb, int num)
- {
- return 0; /* Never fails! */
- }
-
- int
- ser_unix_write (struct serial *scb, const char *str, int len)
- {
- int cc;
-
- while (len > 0)
- {
- cc = write (scb->fd, str, len);
-
- if (cc < 0)
- return 1;
- len -= cc;
- str += cc;
- }
- return 0;
- }
-
- int
- ser_unix_nop_flush_output (struct serial *scb)
- {
- return 0;
- }
-
- int
- ser_unix_flush_input (struct serial *scb)
- {
- if (scb->bufcnt >= 0)
- {
- scb->bufcnt = 0;
- scb->bufp = scb->buf;
- return 0;
- }
- else
- return SERIAL_ERROR;
- }
-
- int
- ser_unix_nop_send_break (struct serial *scb)
- {
- return 0;
- }
-
- int
- ser_unix_nop_drain_output (struct serial *scb)
- {
- return 0;
- }
-
-
- /* Event handling for ASYNC serial code.
-
- At any time the SERIAL device either: has an empty FIFO and is
- waiting on a FD event; or has a non-empty FIFO/error condition and
- is constantly scheduling timer events.
-
- ASYNC only stops pestering its client when it is de-async'ed or it
- is told to go away. */
-
- /* Value of scb->async_state: */
- enum {
- /* >= 0 (TIMER_SCHEDULED) */
- /* The ID of the currently scheduled timer event. This state is
- rarely encountered. Timer events are one-off so as soon as the
- event is delivered the state is shanged to NOTHING_SCHEDULED. */
- FD_SCHEDULED = -1,
- /* The fd_event() handler is scheduled. It is called when ever the
- file descriptor becomes ready. */
- NOTHING_SCHEDULED = -2
- /* Either no task is scheduled (just going into ASYNC mode) or a
- timer event has just gone off and the current state has been
- forced into nothing scheduled. */
- };
-
- /* Identify and schedule the next ASYNC task based on scb->async_state
- and scb->buf* (the input FIFO). A state machine is used to avoid
- the need to make redundant calls into the event-loop - the next
- scheduled task is only changed when needed. */
-
- static void
- reschedule (struct serial *scb)
- {
- if (serial_is_async_p (scb))
- {
- int next_state;
- switch (scb->async_state)
- {
- case FD_SCHEDULED:
- if (scb->bufcnt == 0)
- next_state = FD_SCHEDULED;
- else
- {
- delete_file_handler (scb->fd);
- next_state = create_timer (0, push_event, scb);
- }
- break;
- case NOTHING_SCHEDULED:
- if (scb->bufcnt == 0)
- {
- add_file_handler (scb->fd, fd_event, scb);
- next_state = FD_SCHEDULED;
- }
- else
- {
- next_state = create_timer (0, push_event, scb);
- }
- break;
- default: /* TIMER SCHEDULED */
- if (scb->bufcnt == 0)
- {
- delete_timer (scb->async_state);
- add_file_handler (scb->fd, fd_event, scb);
- next_state = FD_SCHEDULED;
- }
- else
- next_state = scb->async_state;
- break;
- }
- if (serial_debug_p (scb))
- {
- switch (next_state)
- {
- case FD_SCHEDULED:
- if (scb->async_state != FD_SCHEDULED)
- fprintf_unfiltered (gdb_stdlog, "[fd%d->fd-scheduled]\n",
- scb->fd);
- break;
- default: /* TIMER SCHEDULED */
- if (scb->async_state == FD_SCHEDULED)
- fprintf_unfiltered (gdb_stdlog, "[fd%d->timer-scheduled]\n",
- scb->fd);
- break;
- }
- }
- scb->async_state = next_state;
- }
- }
-
- /* FD_EVENT: This is scheduled when the input FIFO is empty (and there
- is no pending error). As soon as data arrives, it is read into the
- input FIFO and the client notified. The client should then drain
- the FIFO using readchar(). If the FIFO isn't immediatly emptied,
- push_event() is used to nag the client until it is. */
-
- static void
- fd_event (int error, void *context)
- {
- struct serial *scb = context;
- if (error != 0)
- {
- scb->bufcnt = SERIAL_ERROR;
- }
- else if (scb->bufcnt == 0)
- {
- /* Prime the input FIFO. The readchar() function is used to
- pull characters out of the buffer. See also
- generic_readchar(). */
- int nr;
- do
- {
- nr = read (scb->fd, scb->buf, BUFSIZ);
- }
- while (nr == -1 && errno == EINTR);
- if (nr == 0)
- {
- scb->bufcnt = SERIAL_EOF;
- }
- else if (nr > 0)
- {
- scb->bufcnt = nr;
- scb->bufp = scb->buf;
- }
- else
- {
- scb->bufcnt = SERIAL_ERROR;
- }
- }
- scb->async_handler (scb, scb->async_context);
- reschedule (scb);
- }
-
- /* PUSH_EVENT: The input FIFO is non-empty (or there is a pending
- error). Nag the client until all the data has been read. In the
- case of errors, the client will need to close or de-async the
- device before naging stops. */
-
- static void
- push_event (void *context)
- {
- struct serial *scb = context;
- scb->async_state = NOTHING_SCHEDULED; /* Timers are one-off */
- scb->async_handler (scb, scb->async_context);
- /* re-schedule */
- reschedule (scb);
- }
-
- /* Put the SERIAL device into/out-of ASYNC mode. */
-
- void
- ser_unix_async (struct serial *scb,
- int async_p)
- {
- if (async_p)
- {
- /* Force a re-schedule. */
- scb->async_state = NOTHING_SCHEDULED;
- if (serial_debug_p (scb))
- fprintf_unfiltered (gdb_stdlog, "[fd%d->asynchronous]\n",
- scb->fd);
- reschedule (scb);
- }
- else
- {
- if (serial_debug_p (scb))
- fprintf_unfiltered (gdb_stdlog, "[fd%d->synchronous]\n",
- scb->fd);
- /* De-schedule whatever tasks are currently scheduled. */
- switch (scb->async_state)
- {
- case FD_SCHEDULED:
- delete_file_handler (scb->fd);
- break;
- case NOTHING_SCHEDULED:
- break;
- default: /* TIMER SCHEDULED */
- delete_timer (scb->async_state);
- break;
- }
- }
- }
-
void
_initialize_ser_hardwire (void)
{
struct serial_ops *ops = XMALLOC (struct serial_ops);
memset (ops, 0, sizeof (struct serial_ops));
--- 1046,1056 ----
Index: ser-unix.h
===================================================================
RCS file: /cvs/src/src/gdb/ser-unix.h,v
retrieving revision 1.4
diff -c -5 -p -r1.4 ser-unix.h
*** ser-unix.h 12 Apr 2003 17:41:25 -0000 1.4
--- ser-unix.h 22 Mar 2005 08:08:33 -0000
***************
*** 20,54 ****
Boston, MA 02111-1307, USA. */
#ifndef SER_UNIX_H
#define SER_UNIX_H
- struct serial;
- struct ui_file;
-
- /* Generic UNIX/FD functions */
-
- extern int ser_unix_nop_flush_output (struct serial *scb);
- extern int ser_unix_flush_input (struct serial *scb);
- extern int ser_unix_nop_send_break (struct serial *scb);
- extern void ser_unix_nop_raw (struct serial *scb);
- extern serial_ttystate ser_unix_nop_get_tty_state (struct serial *scb);
- extern int ser_unix_nop_set_tty_state (struct serial *scb,
- serial_ttystate ttystate);
- extern void ser_unix_nop_print_tty_state (struct serial *scb,
- serial_ttystate ttystate,
- struct ui_file *stream);
- extern int ser_unix_nop_noflush_set_tty_state (struct serial *scb,
- serial_ttystate new_ttystate,
- serial_ttystate old_ttystate);
- extern int ser_unix_nop_setbaudrate (struct serial *scb, int rate);
- extern int ser_unix_nop_setstopbits (struct serial *scb, int rate);
- extern int ser_unix_nop_drain_output (struct serial *scb);
-
- extern int ser_unix_wait_for (struct serial *scb, int timeout);
extern int ser_unix_readchar (struct serial *scb, int timeout);
- extern int ser_unix_write (struct serial *scb, const char *str, int len);
-
- extern void ser_unix_async (struct serial *scb, int async_p);
-
#endif
--- 20,27 ----