From a86753f3fde41576bb9fbedb85c274496cb8a38f Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Fri, 25 Oct 2013 18:38:50 -0400 Subject: [PATCH] Importing usr.bin/renice No Minix-specific changes needed. Change-Id: Ib698cef1dfa6b386cf658b6026409e0336a8b1c4 --- distrib/sets/lists/minix/mi | 2 + releasetools/nbsd_ports | 1 + usr.bin/Makefile | 2 +- usr.bin/renice/Makefile | 7 ++ usr.bin/renice/renice.8 | 151 ++++++++++++++++++++++++++++++ usr.bin/renice/renice.c | 181 ++++++++++++++++++++++++++++++++++++ 6 files changed, 343 insertions(+), 1 deletion(-) create mode 100644 usr.bin/renice/Makefile create mode 100644 usr.bin/renice/renice.8 create mode 100644 usr.bin/renice/renice.c diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index fc63a3962..c62c3f137 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -454,6 +454,7 @@ ./usr/bin/remsync minix-sys ./usr/bin/repartition minix-sys ./usr/bin/restore minix-sys +./usr/bin/renice minix-sys ./usr/bin/rev minix-sys ./usr/bin/rget minix-sys ./usr/bin/rlogin minix-sys @@ -4449,6 +4450,7 @@ ./usr/man/man8/rdate.8 minix-sys ./usr/man/man8/readclock.8 minix-sys ./usr/man/man8/reboot.8 minix-sys +./usr/man/man8/renice.8 minix-sys ./usr/man/man8/repartition.8 minix-sys ./usr/man/man8/rshd.8 minix-sys ./usr/man/man8/screendump.8 minix-sys diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index 31428cf93..aac260e7e 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -194,6 +194,7 @@ 2013/10/17 12:00:00,usr.bin/printenv 2012/10/17 12:00:00,usr.bin/printf 2013/10/24 12:00:00,usr.bin/pwhash +2012/10/17 12:00:00,usr.bin/renice 2013/09/28 12:00:00,usr.bin/rev 2010/02/19 16:35:27,usr.bin/sed 2010/05/27 08:40:19,usr.bin/seq diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 28b24327c..75a0a432b 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -21,7 +21,7 @@ SUBDIR= \ nbperf newgrp nice nl nohup nvi \ passwd pr \ printenv printf pwhash \ - rev \ + renice rev \ \ shuffle sed seq \ sort stat su \ diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile new file mode 100644 index 000000000..bfba0255a --- /dev/null +++ b/usr.bin/renice/Makefile @@ -0,0 +1,7 @@ +# $NetBSD: Makefile,v 1.5 1997/01/09 14:39:10 tls Exp $ +# from: @(#)Makefile 8.1 (Berkeley) 6/9/93 + +PROG= renice +MAN= renice.8 + +.include diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8 new file mode 100644 index 000000000..4cc007dad --- /dev/null +++ b/usr.bin/renice/renice.8 @@ -0,0 +1,151 @@ +.\" $NetBSD: renice.8,v 1.13 2009/04/08 13:20:23 joerg Exp $ +.\" +.\" Copyright (c) 1983, 1991, 1993 +.\" The Regents of the University of California. 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. +.\" 3. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +.\" +.\" from: @(#)renice.8 8.1 (Berkeley) 6/9/93 +.\" $NetBSD: renice.8,v 1.13 2009/04/08 13:20:23 joerg Exp $ +.\" +.Dd June 9, 1993 +.Dt RENICE 8 +.Os +.Sh NAME +.Nm renice +.Nd alter priority of running processes +.Sh SYNOPSIS +.Nm +.Ar priority +.Oo +.Op Fl p +.Ar pid ... +.Oc +.Oo +.Fl g +.Ar pgrp ... +.Oc +.Oo +.Fl u +.Ar user ... +.Oc +.Nm +.Fl n +.Ar increment +.Oo +.Op Fl p +.Ar pid ... +.Oc +.Oo +.Fl g +.Ar pgrp ... +.Oc +.Oo +.Fl u +.Ar user ... +.Oc +.Sh DESCRIPTION +.Nm +alters the +scheduling priority of one or more running processes. +The following +.Ar who +parameters are interpreted as process ID's, process group +ID's, or user names. +.Nm Ns 'ing +a process group causes all processes in the process group +to have their scheduling priority altered. +.Nm Ns 'ing +a user causes all processes owned by the user to have +their scheduling priority altered. +By default, the processes to be affected are specified by +their process ID's. +.Pp +Options supported by +.Nm : +.Bl -tag -width Ds +.It Fl g +Force +.Ar who +parameters to be interpreted as process group ID's. +.It Fl n +Instead of changing the specified processes to the given priority, +interpret the following argument as an increment to be applied to +the current priority of each process. +.It Fl u +Force the +.Ar who +parameters to be interpreted as user names. +.It Fl p +Resets the +.Ar who +interpretation to be (the default) process ID's. +.El +.Pp +For example, +.Bd -literal -offset indent +renice +1 987 -u daemon root -p 32 +.Ed +.Pp +would change the priority of process ID's 987 and 32, and +all processes owned by users daemon and root. +.Pp +Users other than the super-user may only alter the priority of +processes they own, +and can only monotonically increase their ``nice value'' +within the range 0 to +.Dv PRIO_MAX +(20). +(This prevents overriding administrative fiats.) +The super-user +may alter the priority of any process +and set the priority to any value in the range +.Dv PRIO_MIN +(\-20) +to +.Dv PRIO_MAX . +.Pp +Useful priorities are: +0, the ``base'' scheduling priority; +20, the affected processes will run only when nothing at the base priority +wants to; +anything negative, the processes will receive a scheduling preference. +.Sh FILES +.Bl -tag -width /etc/passwd -compact +.It Pa /etc/passwd +to map user names to user ID's +.El +.Sh SEE ALSO +.Xr nice 1 , +.Xr getpriority 2 , +.Xr setpriority 2 +.Sh HISTORY +The +.Nm +command appeared in +.Bx 4.0 . +.Sh BUGS +Non super-users can not increase scheduling priorities of their own processes, +even if they were the ones that decreased the priorities in the first place. diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c new file mode 100644 index 000000000..977f08103 --- /dev/null +++ b/usr.bin/renice/renice.c @@ -0,0 +1,181 @@ +/* $NetBSD: renice.c,v 1.18 2008/07/21 14:19:25 lukem Exp $ */ + +/* + * Copyright (c) 1983, 1989, 1993 + * The Regents of the University of California. 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. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + */ + +#include +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\ + The Regents of the University of California. All rights reserved."); +#endif /* not lint */ + +#ifndef lint +/*static char sccsid[] = "from: @(#)renice.c 8.1 (Berkeley) 6/9/93";*/ +__RCSID("$NetBSD: renice.c,v 1.18 2008/07/21 14:19:25 lukem Exp $"); +#endif /* not lint */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +static int getnum(const char *, const char *, int *); +static int donice(int, id_t, int, int); +static void usage(void) __dead; + +/* + * Change the priority (nice) of processes + * or groups of processes which are already + * running. + */ +int +main(int argc, char **argv) +{ + int which = PRIO_PROCESS; + int prio, errs = 0, incr = 0; + id_t who = 0; + + argc--, argv++; + if (argc < 2) + usage(); + if (strcmp(*argv, "-n") == 0) { + incr = 1; + argc--, argv++; + if (argc == 0) + usage(); + } + if (getnum("priority", *argv, &prio)) + return 1; + argc--, argv++; + for (; argc > 0; argc--, argv++) { + if (strcmp(*argv, "-g") == 0) { + which = PRIO_PGRP; + continue; + } + if (strcmp(*argv, "-u") == 0) { + which = PRIO_USER; + continue; + } + if (strcmp(*argv, "-p") == 0) { + which = PRIO_PROCESS; + continue; + } + if (which == PRIO_USER) { + struct passwd *pwd = getpwnam(*argv); + + if (pwd == NULL) { + warnx("%s: unknown user", *argv); + errs++; + continue; + } + who = (id_t)pwd->pw_uid; + } else { + int twho; + if (getnum("pid", *argv, &twho)) { + errs++; + continue; + } + if (twho < 0) { + warnx("%s: bad value", *argv); + errs++; + continue; + } + who = (id_t)twho; + } + errs += donice(which, who, prio, incr); + } + return errs == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +static int +getnum(const char *com, const char *str, int *val) +{ + long v; + char *ep; + + errno = 0; + v = strtol(str, &ep, 0); + + if (*ep) { + warnx("Bad %s argument: %s", com, str); + return 1; + } + if ((v == LONG_MIN || v == LONG_MAX) && errno == ERANGE) { + warn("Invalid %s argument: %s", com, str); + return 1; + } + + *val = (int)v; + return 0; +} + +static int +donice(int which, id_t who, int prio, int incr) +{ + int oldprio; + + errno = 0; + if ((oldprio = getpriority(which, who)) == -1 && errno != 0) { + warn("%d: getpriority", who); + return 1; + } + + if (incr) + prio = oldprio + prio; + + if (prio > PRIO_MAX) + prio = PRIO_MAX; + if (prio < PRIO_MIN) + prio = PRIO_MIN; + + if (setpriority(which, who, prio) == -1) { + warn("%d: setpriority", who); + return 1; + } + (void)printf("%d: old priority %d, new priority %d\n", + who, oldprio, prio); + return 0; +} + +static void +usage(void) +{ + + (void)fprintf(stderr, "Usage: %s [ | -n ] ", + getprogname()); + (void)fprintf(stderr, "[[-p] ...] [-g ...] "); + (void)fprintf(stderr, "[-u ...]\n"); + exit(1); +}