Page MenuHomeFreeBSD
Files F162850875

D30632.id90417.diff
No OneTemporary
Actions

D30632.id90417.diff
View Options

diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c
--- a/sys/kern/kern_racct.c
+++ b/sys/kern/kern_racct.c
@@ -104,6 +104,8 @@
static void racct_add_cred_locked(struct ucred *cred, int resource,
uint64_t amount);
+static uint64_t racct_estimate_pcpu(uint64_t runtime, struct timeval *wallclock);
+
SDT_PROVIDER_DEFINE(racct);
SDT_PROBE_DEFINE3(racct, , rusage, add,
"struct proc *", "int", "uint64_t");
@@ -315,6 +317,17 @@
#define CCPU_EXP_MAX 110
+static uint64_t
+racct_estimate_pcpu(uint64_t runtime, struct timeval *wallclock)
+{
+ if (wallclock->tv_sec > 0 || wallclock->tv_usec > 0) {
+ return ((runtime * 100) /
+ ((uint64_t)wallclock->tv_sec * 1000000 +
+ wallclock->tv_usec));
+ } else
+ return (0);
+}
+
/*
* This function is analogical to the getpcpu() function in the ps(1) command.
* They should both calculate in the same way so that the racct %cpu
@@ -1012,12 +1025,7 @@
#endif
microuptime(&wallclock);
timevalsub(&wallclock, &p->p_stats->p_start);
- if (wallclock.tv_sec > 0 || wallclock.tv_usec > 0) {
- pct_estimate = (1000000 * runtime * 100) /
- ((uint64_t)wallclock.tv_sec * 1000000 +
- wallclock.tv_usec);
- } else
- pct_estimate = 0;
+ pct_estimate = racct_estimate_pcpu(runtime, &wallclock);
pct = racct_getpcpu(p, pct_estimate);
RACCT_LOCK();
@@ -1282,12 +1290,7 @@
runtime = p->p_prev_runtime;
#endif
p->p_prev_runtime = runtime;
- if (wallclock.tv_sec > 0 || wallclock.tv_usec > 0) {
- pct_estimate = (1000000 * runtime * 100) /
- ((uint64_t)wallclock.tv_sec * 1000000 +
- wallclock.tv_usec);
- } else
- pct_estimate = 0;
+ pct_estimate = racct_estimate_pcpu(runtime, &wallclock);
pct = racct_getpcpu(p, pct_estimate);
RACCT_LOCK();
#ifdef RCTL

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 18, 2:59 PM (16 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35199308
Default Alt Text
D30632.id90417.diff (1 KB)

Event Timeline