From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20009 invoked by alias); 17 Mar 2009 16:12:57 -0000 Received: (qmail 19998 invoked by uid 22791); 17 Mar 2009 16:12:55 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 17 Mar 2009 16:12:46 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 6ED9F2BAC37 for ; Tue, 17 Mar 2009 12:12:41 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 6N1w9f9X5kqr for ; Tue, 17 Mar 2009 12:12:41 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 4ED562BAC36 for ; Tue, 17 Mar 2009 12:12:41 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id D1604F5CFA; Tue, 17 Mar 2009 09:12:40 -0700 (PDT) Date: Tue, 17 Mar 2009 17:25:00 -0000 From: Joel Brobecker To: gdb-patches@sourceware.org Subject: [RFA] New gdb_usleep function? Message-ID: <20090317161240.GB31959@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="X1bOJ3K7DJ5YkBrT" Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-03/txt/msg00312.txt.bz2 --X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 1076 Hello guys, I'm working on a patch for AIX where I need to do a timed-delay. I could do what I always do, which is call gdb_select, but I thought that this something we do occasionally, so I think it'd be nice to have a function that does everything for us. This is why I came up with gdb_usleep. As explained in the "Limitation:" comment, the function is not perfect, since it might return early if a signal is raised. But I think it's good enough for what we need to do, at least thus far. I think it can be enhanced by checking the time remaining, but I'm not certain that this is completely portable. 2009-03-17 Joel Brobecker 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. Tested in amd64-linux. Any objection? -- Joel --X1bOJ3K7DJ5YkBrT Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="gdb_usleep.diff" Content-length: 4483 diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 74aa72e..1ab851d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -663,7 +663,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 @@ -733,7 +733,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. @@ -814,7 +815,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 index 0000000..e768c3d --- /dev/null +++ b/gdb/gdb_usleep.c @@ -0,0 +1,37 @@ +/* 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 . */ + +#include "defs.h" +#include "gdb_select.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 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 . */ + +#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 07abf2b..ea2938d 100644 --- 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; } --X1bOJ3K7DJ5YkBrT--