d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add a new per-process flag PS_XCPU to indicate that at least one thread

Browse Source 
has exceeded its CPU time limit.
- In mi_switch(), set PS_XCPU when the CPU time limit is exceeded.
- Perform actual CPU time limit exceeded work in ast() when PS_XCPU is set.

Requested by:	many
This commit is contained in:
John Baldwin 2002-09-30 21:13:54 +00:00
parent f4cd8f9ff4
commit dc183990ca
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/kern_synch.c
View File

@ -753,9 +753,6 @@ mi_switch(void)
struct thread *td = curthread; /* XXX */
struct proc *p = td->td_proc; /* XXX */
struct kse *ke = td->td_kse;
#if 0
register struct rlimit *rlim;
#endif
u_int sched_nest;
mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED);
@ -788,36 +785,13 @@ mi_switch(void)
}
#endif
#if 0
/*
* Check if the process exceeds its cpu resource allocation.
* If over max, kill it.
*
* XXX drop sched_lock, pickup Giant
*/
if (p->p_state != PRS_ZOMBIE &&
p->p_limit->p_cpulimit != RLIM_INFINITY &&
p->p_runtime > p->p_limit->p_cpulimit) {
rlim = &p->p_rlimit[RLIMIT_CPU];
if (p->p_runtime / (rlim_t)1000000 >= rlim->rlim_max) {
mtx_unlock_spin(&sched_lock);
PROC_LOCK(p);
killproc(p, "exceeded maximum CPU limit");
mtx_lock_spin(&sched_lock);
PROC_UNLOCK(p);
} else {
mtx_unlock_spin(&sched_lock);
PROC_LOCK(p);
psignal(p, SIGXCPU);
mtx_lock_spin(&sched_lock);
PROC_UNLOCK(p);
if (rlim->rlim_cur < rlim->rlim_max) {
/* XXX: we should make a private copy */
rlim->rlim_cur += 5;
}
}
}
#endif
p->p_runtime.sec > p->p_limit->p_cpulimit)
p->p_sflag |= PS_XCPU;
/*
* Finish up stats for outgoing thread.

14
sys/kern/subr_trap.c
View File

@ -153,6 +153,7 @@ ast(struct trapframe *framep)
struct proc *p = td->td_proc;
struct kse *ke;
struct ksegrp *kg = td->td_ksegrp;
struct rlimit *rlim;
u_int prticks, sticks;
int sflag;
int flags;
@ -224,6 +225,19 @@ ast(struct trapframe *framep)
psignal(p, SIGPROF);
PROC_UNLOCK(p);
}
if (sflag & PS_XCPU) {
PROC_LOCK(p);
rlim = &p->p_rlimit[RLIMIT_CPU];
if (p->p_runtime.sec >= rlim->rlim_max)
killproc(p, "exceeded maximum CPU limit");
else {
psignal(p, SIGXCPU);
if (rlim->rlim_cur < rlim->rlim_max)
/* XXX: we should make a private copy */
rlim->rlim_cur += 5;
}
PROC_UNLOCK(p);
}
if (flags & KEF_NEEDRESCHED) {
mtx_lock_spin(&sched_lock);
td->td_priority = kg->kg_user_pri;

1
sys/sys/proc.h
View File

@ -630,6 +630,7 @@ struct proc {
/* These flags are kept in p_sflag and are protected with sched_lock. */
#define PS_INMEM 0x00001 /* Loaded into memory. */
#define PS_XCPU 0x00002 /* Exceeded CPU limit. */
#define PS_PROFIL 0x00004 /* Has started profiling. */
#define PS_ALRMPEND 0x00020 /* Pending SIGVTALRM needs to be posted. */
#define PS_PROFPEND 0x00040 /* Pending SIGPROF needs to be posted. */