* gdb_usleep.h, gdb_usleep.c: New files.

            * Makefile.in (SFILES): Add gdb_usleep.c.
            (HFILES_NO_SRCDIR): Add gdb_usleep.h.
            (COMMON_OBS): Add gdb_usleep.o.
            * ser-unix.c (hardwire_send_break): Replace call to gdb_select
            by call to gdb_usleep.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a34fb2a88e59de33736b53030f55438ccdef534..09f157dbf6648c6034a83cb3e8d3206f7657ad08 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-23  Joel Brobecker  <brobecker@adacore.com>
+
+       Add gdb_usleep as a portable version of sleep based on gdb_select.
+       * gdb_usleep.h, gdb_usleep.c: New files.
+       * Makefile.in (SFILES): Add gdb_usleep.c.
+       (HFILES_NO_SRCDIR): Add gdb_usleep.h.
+       (COMMON_OBS): Add gdb_usleep.o.
+       * ser-unix.c (hardwire_send_break): Replace call to gdb_select
+       by call to gdb_usleep.
+
 2009-03-23  Joel Brobecker  <brobecker@adacore.com>
 
        * buildsym.c (end_symtab): If we ignore the subfiles, then

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8e192655d69707ac74a1f9cce6211b4d38c99ce7..95b95a1a41ec1e59d360c9cd7cffbe244c677093 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -666,7 +666,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
        valarith.c valops.c valprint.c value.c varobj.c vec.c \
        wrapper.c \
        xml-tdesc.c xml-support.c \
-       inferior.c
+       inferior.c gdb_usleep.c
 
 LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 
@@ -736,7 +736,8 @@ config/sparc/nm-sol2.h config/nm-linux.h config/mips/nm-irix5.h     \
 config/rs6000/nm-rs6000.h top.h bsd-kvm.h gdb-stabs.h reggroups.h \
 annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h        \
 remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
-sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h
+sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
+gdb_usleep.h
 
 # Header files that already have srcdir in them, or which are in objdir.
 
@@ -817,7 +818,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
        solib.o solib-null.o \
        prologue-value.o memory-map.o xml-support.o \
        target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o \
-       inferior.o osdata.o
+       inferior.o osdata.o gdb_usleep.o
 
 TSOBS = inflow.o
 

diff --git a/gdb/gdb_usleep.c b/gdb/gdb_usleep.c
new file mode 100644 (file)
index 0000000..dd6d460
--- /dev/null
+++ b/gdb/gdb_usleep.c
@@ -0,0 +1,41 @@
+/* Copyright (C) 2009 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 3 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, see <http://www.gnu.org/licenses/>.  */
+
+#include "defs.h"
+#include "gdb_usleep.h"
+#include "gdb_select.h"
+#include "gdb_usleep.h"
+
+#include <sys/time.h>
+
+int
+gdb_usleep (int usec)
+{
+  struct timeval delay;
+  int retval;
+
+  delay.tv_sec = usec / 1000000;
+  delay.tv_usec = usec % 1000000;
+  retval = gdb_select (0, 0, 0, 0, &delay);
+
+  if (retval < 0)
+    retval = -1;
+  else
+    retval = 0;
+
+  return retval;
+}

diff --git a/gdb/gdb_usleep.h b/gdb/gdb_usleep.h
new file mode 100644 (file)
index 0000000..444ffbd
--- /dev/null
+++ b/gdb/gdb_usleep.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2009 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 3 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, see <http://www.gnu.org/licenses/>.  */
+
+#if !defined(GDB_USLEEP_H)
+#define GDB_USLEEP_H
+
+/* Suspend execution for USEC microseconds.
+
+   Limitation: If a signal is raised during the delay, gdb_usleep
+   might return earlier than requested.
+
+   It returns 0 on success or -1 on error.  */
+extern int gdb_usleep (int usect);
+
+#endif /* !defined(GDB_USLEEP_H) */
+

diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 07abf2b62094a41e9d5348df4a10759b7d8919ea..ea2938d2cddc3fbb72e08c11e662729b26e7e8d3 100644 (file)
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -368,16 +368,13 @@ hardwire_send_break (struct serial *scb)
 #ifdef HAVE_SGTTY
   {
     int status;
-    struct timeval timeout;
 
     status = ioctl (scb->fd, TIOCSBRK, 0);
 
     /* Can't use usleep; it doesn't exist in BSD 4.2.  */
-    /* Note that if this select() is interrupted by a signal it will not wait
-       the full length of time.  I think that is OK.  */
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 250000;
-    gdb_select (0, 0, 0, 0, &timeout);
+    /* Note that if this gdb_select() is interrupted by a signal it will not
+       wait the full length of time.  I think that is OK.  */
+    gdb_usleep (250000);
     status = ioctl (scb->fd, TIOCCBRK, 0);
     return status;
   }