Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/timeout import from FreeBSD



details:   https://anonhg.NetBSD.org/src/rev/b88971080a6a
branches:  trunk
changeset: 797876:b88971080a6a
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 01 13:50:55 2014 +0000

description:
import from FreeBSD

diffstat:

 usr.bin/timeout/Makefile  |    5 +
 usr.bin/timeout/timeout.1 |  114 +++++++++++++++
 usr.bin/timeout/timeout.c |  333 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 452 insertions(+), 0 deletions(-)

diffs (truncated from 464 to 300 lines):

diff -r 4c0258a230f8 -r b88971080a6a usr.bin/timeout/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/timeout/Makefile  Fri Aug 01 13:50:55 2014 +0000
@@ -0,0 +1,5 @@
+# $FreeBSD: head/usr.bin/timeout/Makefile 268745 2014-07-16 09:55:36Z bapt $
+
+PROG=  timeout
+
+.include <bsd.prog.mk>
diff -r 4c0258a230f8 -r b88971080a6a usr.bin/timeout/timeout.1
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/timeout/timeout.1 Fri Aug 01 13:50:55 2014 +0000
@@ -0,0 +1,114 @@
+.\" Copyright (c) 2014 Baptiste Daroussin <bapt%FreeBSD.org@localhost>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD: head/usr.bin/timeout/timeout.1 268861 2014-07-18 22:56:59Z bapt $
+.\"
+.Dd July 19, 2014
+.Dt TIMEOUT 1
+.Os
+.Sh NAME
+.Nm timeout
+.Nd run a command with a time limit
+.Sh SYNOPSIS
+.Nm
+.Op Fl -signal Ar sig | Fl s Ar sig
+.Op Fl -preserve-status
+.Op Fl -kill-after Ar time | Fl k Ar time
+.Op Fl -foreground
+.Ao Ar duration Ac
+.Ao Ar command Ac
+.Ao Ar args ... Ac
+.Sh DESCRIPTION
+.Nm
+starts the
+.Ar command
+with its
+.Ar args.
+If
+.Ar command
+is still running after
+.Ar duration ,
+it is killed.
+By default,
+.Ar SIGTERM.
+is sent.
+.Bl -tag -width "-k time, --kill-after time"
+.It Fl -preserve-status
+Always exits with the same status as
+.Ar command
+even if it times out.
+.It Fl -foreground
+Do not propagate timeout to the
+.Ar command
+children.
+.It Fl s Ar sig , Fl -signal Ar sig
+Specify the signal to send on timeout.
+By default,
+.Ar SIGTERM .
+is sent.
+.It Fl k Ar time , Fl -kill-after Ar time
+Send a second kill signal if
+.Ar command
+is still running after
+.Ar time
+after the first signal was sent.
+.El
+.Sh DURATION FORMAT
+.Ar duration
+and
+.Ar time
+can be integer or decimal numbers.
+Values without unit symbols are interpreted as seconds.
+.Pp
+Supported unit symbols are:
+.Bl -tag -width indent -compact
+.It s
+seconds
+.It m
+minutes
+.It h
+hours
+.It d
+days
+.El
+.Sh EXIT STATUS
+If the timeout was not reached, the exit status of
+.Ar command
+is returned.
+.Pp
+If the timeout was reached and
+.Fl -preserve-status
+is set, the exit status of
+.Ar command
+is returned.
+If
+.Fl -preserve-status
+is not set, an exit status of 124 is returned.
+.Pp
+If
+.Ar command
+exits after receiving a signal, the exit status returned is the signal number plus 128.
+.Sh SEE ALSO
+.Xr kill 1 ,
+.Xr signal 3
diff -r 4c0258a230f8 -r b88971080a6a usr.bin/timeout/timeout.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/timeout/timeout.c Fri Aug 01 13:50:55 2014 +0000
@@ -0,0 +1,333 @@
+/*-
+ * Copyright (c) 2014 Baptiste Daroussin <bapt%FreeBSD.org@localhost>
+ * Copyright (c) 2014 Vsevolod Stakhov <vsevolod%FreeBSD.org@localhost>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/usr.bin/timeout/timeout.c 268763 2014-07-16 13:52:05Z bapt $");
+
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#define EXIT_TIMEOUT 124
+
+static sig_atomic_t sig_chld = 0;
+static sig_atomic_t sig_term = 0;
+static sig_atomic_t sig_alrm = 0;
+static sig_atomic_t sig_ign = 0;
+
+static void
+usage(void)
+{
+
+       fprintf(stderr, "Usage: %s [--signal sig | -s sig] [--preserve-status]"
+           " [--kill-after time | -k time] [--foreground] <duration> <command>"
+           " <arg ...>\n", getprogname());
+
+       exit(EX_USAGE);
+}
+
+static double
+parse_duration(const char *duration)
+{
+       double ret;
+       char *end;
+
+       ret = strtod(duration, &end);
+       if (ret == 0 && end == duration)
+               errx(EXIT_FAILURE, "invalid duration");
+
+       if (end == NULL || *end == '\0')
+               return (ret);
+
+       if (end != NULL && *(end + 1) != '\0')
+               errx(EX_USAGE, "invalid duration");
+
+       switch (*end) {
+       case 's':
+               break;
+       case 'm':
+               ret *= 60;
+               break;
+       case 'h':
+               ret *= 60 * 60;
+               break;
+       case 'd':
+               ret *= 60 * 60 * 24;
+               break;
+       default:
+               errx(EX_USAGE, "invalid duration");
+       }
+
+       if (ret < 0 || ret >= 100000000UL)
+               errx(EX_USAGE, "invalid duration");
+
+       return (ret);
+}
+
+static int
+parse_signal(const char *str)
+{
+       int sig, i;
+       const char *errstr;
+
+       sig = strtonum(str, 0, sys_nsig, &errstr);
+
+       if (errstr == NULL)
+               return (sig);
+       if (strncasecmp(str, "SIG", 3) == 0)
+               str += 3;
+
+       for (i = 1; i < sys_nsig; i++) {
+               if (strcasecmp(str, sys_signame[i]) == 0)
+                       return (i);
+       }
+
+       errx(EX_USAGE, "invalid signal");
+}
+
+static void
+sig_handler(int signo)
+{
+       if (sig_ign != 0 && signo == sig_ign) {
+               sig_ign = 0;
+               return;
+       }
+
+       switch(signo) {
+       case 0:
+       case SIGINT:
+       case SIGHUP:
+       case SIGQUIT:
+       case SIGTERM:
+               sig_term = signo;
+               break;
+       case SIGCHLD:
+               sig_chld = 1;
+               break;
+       case SIGALRM:
+               sig_alrm = 1;
+               break;
+       }
+}
+
+static void
+set_interval(double iv)
+{
+       struct itimerval tim;
+
+       memset(&tim, 0, sizeof(tim));
+       tim.it_value.tv_sec = (time_t)iv;
+       iv -= (time_t)iv;
+       tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL);
+
+       if (setitimer(ITIMER_REAL, &tim, NULL) == -1)
+               err(EX_OSERR, "setitimer()");
+}
+
+int
+main(int argc, char **argv)
+{
+       int ch;
+       unsigned long i;
+       int foreground, preserve;
+       int error, pstat, status;
+       int killsig = SIGTERM;
+       pid_t pgid, pid, cpid;



Home | Main Index | Thread Index | Old Index