summaryrefslogtreecommitdiffstats
path: root/kernel/tsacct.c
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2016-02-10 20:08:25 -0500
committerIngo Molnar <mingo@kernel.org>2016-02-29 03:53:09 -0500
commitb2add86edd3bc050af350515e6ba26f4622c38f3 (patch)
tree62e07bf918c43db0ea7ac6ad7882435884b95ea1 /kernel/tsacct.c
parent382c2fe994321d503647ce8ee329b9420dc7c1f9 (diff)
acct, time: Change indentation in __acct_update_integrals()
Change the indentation in __acct_update_integrals() to make the function a little easier to read. Suggested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Rik van Riel <riel@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Frederic Weisbecker <fweisbec@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: clark@redhat.com Cc: eric.dumazet@gmail.com Cc: fweisbec@gmail.com Cc: luto@amacapital.net Link: http://lkml.kernel.org/r/1455152907-18495-3-git-send-email-riel@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/tsacct.c')
-rw-r--r--kernel/tsacct.c51
1 files changed, 26 insertions, 25 deletions
diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 460ee2bbfef3..d12e815b7bcd 100644
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -125,31 +125,32 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
125static void __acct_update_integrals(struct task_struct *tsk, 125static void __acct_update_integrals(struct task_struct *tsk,
126 cputime_t utime, cputime_t stime) 126 cputime_t utime, cputime_t stime)
127{ 127{
128 if (likely(tsk->mm)) { 128 cputime_t time, dtime;
129 cputime_t time, dtime; 129 unsigned long flags;
130 unsigned long flags; 130 u64 delta;
131 u64 delta; 131
132 132 if (!likely(tsk->mm))
133 local_irq_save(flags); 133 return;
134 time = stime + utime; 134
135 dtime = time - tsk->acct_timexpd; 135 local_irq_save(flags);
136 /* Avoid division: cputime_t is often in nanoseconds already. */ 136 time = stime + utime;
137 delta = cputime_to_nsecs(dtime); 137 dtime = time - tsk->acct_timexpd;
138 138 /* Avoid division: cputime_t is often in nanoseconds already. */
139 if (delta < TICK_NSEC) 139 delta = cputime_to_nsecs(dtime);
140 goto out; 140
141 141 if (delta < TICK_NSEC)
142 tsk->acct_timexpd = time; 142 goto out;
143 /* 143
144 * Divide by 1024 to avoid overflow, and to avoid division. 144 tsk->acct_timexpd = time;
145 * The final unit reported to userspace is Mbyte-usecs, 145 /*
146 * the rest of the math is done in xacct_add_tsk. 146 * Divide by 1024 to avoid overflow, and to avoid division.
147 */ 147 * The final unit reported to userspace is Mbyte-usecs,
148 tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm) >> 10; 148 * the rest of the math is done in xacct_add_tsk.
149 tsk->acct_vm_mem1 += delta * tsk->mm->total_vm >> 10; 149 */
150 out: 150 tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm) >> 10;
151 local_irq_restore(flags); 151 tsk->acct_vm_mem1 += delta * tsk->mm->total_vm >> 10;
152 } 152out:
153 local_irq_restore(flags);
153} 154}
154 155
155/** 156/**