226f14bc83
wrong for many years that negative niceness would lower the priority of a process below PUSER, and once below PUSER, there were conditionals in the code that are required to test for whether a process was in the kernel which would break. The breakage could (and did) cause lock-ups, basically nothing else but the least nice program being able to run in some conditions. The algorithm which adjusts the priority now subtracts PRIO_MIN to do things properly, and the ESTCPULIM() algorithm was updated to use PRIO_TOTAL (PRIO_MAX - PRIO_MIN) to calculate the estcpu. NICE_WEIGHT is now 1 to accomodate the full range of priorities better (a -20 process with full CPU time has the priority of a +0 process with no CPU time). There are now 20 queues (exactly; 80 priorities) for use in user processes' scheduling, and PUSER has been lowered to 48 to accomplish this. This means, to the user, that things will be scheduled more correctly (noticeable), there is no lock-up anymore WRT a niced -20 process never releasing the CPU time for other processes. In this fair system, tsleep()ed < PUSER processes now will get the proper higher priority than priority >= PUSER user processes. The detective work of this was done by me, along with part of the solution. Luoqi Chen has provided most of the solution, and really helped me understand what was happening better, to boot :) Submitted by: luoqi Concept reviewed by: bde
151 lines
4.5 KiB
C
151 lines
4.5 KiB
C
/*
|
|
* Copyright (c) 1982, 1986, 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. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. 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.
|
|
*
|
|
* @(#)resource.h 8.4 (Berkeley) 1/9/95
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _SYS_RESOURCE_H_
|
|
#define _SYS_RESOURCE_H_
|
|
|
|
/*
|
|
* Process priority specifications to get/setpriority.
|
|
*/
|
|
#define PRIO_MIN -20
|
|
#define PRIO_MAX 20
|
|
#ifdef _KERNEL
|
|
#define PRIO_TOTAL (PRIO_MAX - PRIO_MIN)
|
|
#endif /* _KERNEL */
|
|
|
|
#define PRIO_PROCESS 0
|
|
#define PRIO_PGRP 1
|
|
#define PRIO_USER 2
|
|
|
|
/*
|
|
* Resource utilization information.
|
|
*/
|
|
|
|
#define RUSAGE_SELF 0
|
|
#define RUSAGE_CHILDREN -1
|
|
|
|
struct rusage {
|
|
struct timeval ru_utime; /* user time used */
|
|
struct timeval ru_stime; /* system time used */
|
|
long ru_maxrss; /* max resident set size */
|
|
#define ru_first ru_ixrss
|
|
long ru_ixrss; /* integral shared memory size */
|
|
long ru_idrss; /* integral unshared data " */
|
|
long ru_isrss; /* integral unshared stack " */
|
|
long ru_minflt; /* page reclaims */
|
|
long ru_majflt; /* page faults */
|
|
long ru_nswap; /* swaps */
|
|
long ru_inblock; /* block input operations */
|
|
long ru_oublock; /* block output operations */
|
|
long ru_msgsnd; /* messages sent */
|
|
long ru_msgrcv; /* messages received */
|
|
long ru_nsignals; /* signals received */
|
|
long ru_nvcsw; /* voluntary context switches */
|
|
long ru_nivcsw; /* involuntary " */
|
|
#define ru_last ru_nivcsw
|
|
};
|
|
|
|
/*
|
|
* Resource limits
|
|
*/
|
|
#define RLIMIT_CPU 0 /* cpu time in milliseconds */
|
|
#define RLIMIT_FSIZE 1 /* maximum file size */
|
|
#define RLIMIT_DATA 2 /* data size */
|
|
#define RLIMIT_STACK 3 /* stack size */
|
|
#define RLIMIT_CORE 4 /* core file size */
|
|
#define RLIMIT_RSS 5 /* resident set size */
|
|
#define RLIMIT_MEMLOCK 6 /* locked-in-memory address space */
|
|
#define RLIMIT_NPROC 7 /* number of processes */
|
|
#define RLIMIT_NOFILE 8 /* number of open files */
|
|
#define RLIMIT_SBSIZE 9 /* maximum size of all socket buffers */
|
|
|
|
#define RLIM_NLIMITS 10 /* number of resource limits */
|
|
|
|
#define RLIM_INFINITY ((rlim_t)(((u_quad_t)1 << 63) - 1))
|
|
|
|
|
|
/*
|
|
* Resource limit string identifiers
|
|
*/
|
|
|
|
#ifdef _RLIMIT_IDENT
|
|
static char *rlimit_ident[] = {
|
|
"cpu",
|
|
"fsize",
|
|
"data",
|
|
"stack",
|
|
"core",
|
|
"rss",
|
|
"memlock",
|
|
"nproc",
|
|
"nofile",
|
|
"sbsize",
|
|
};
|
|
#endif
|
|
|
|
struct orlimit {
|
|
int32_t rlim_cur; /* current (soft) limit */
|
|
int32_t rlim_max; /* maximum value for rlim_cur */
|
|
};
|
|
|
|
struct rlimit {
|
|
rlim_t rlim_cur; /* current (soft) limit */
|
|
rlim_t rlim_max; /* maximum value for rlim_cur */
|
|
};
|
|
|
|
/* Load average structure. */
|
|
struct loadavg {
|
|
fixpt_t ldavg[3];
|
|
long fscale;
|
|
};
|
|
|
|
#ifdef _KERNEL
|
|
extern struct loadavg averunnable;
|
|
|
|
#else
|
|
#include <sys/cdefs.h>
|
|
|
|
__BEGIN_DECLS
|
|
int getpriority __P((int, int));
|
|
int getrlimit __P((int, struct rlimit *));
|
|
int getrusage __P((int, struct rusage *));
|
|
int setpriority __P((int, int, int));
|
|
int setrlimit __P((int, const struct rlimit *));
|
|
__END_DECLS
|
|
|
|
#endif /* _KERNEL */
|
|
#endif /* !_SYS_RESOURCE_H_ */
|