From: Laurent Vivier <Laurent.Vivier@bull.net>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: [RESEND]PATCH 2/4] Introduce a new fields "gtime" and "cgtime" in task_struct and signal_struct
Date: Mon, 10 Sep 2007 14:02:57 +0200 [thread overview]
Message-ID: <46E53271.7040804@bull.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 397 bytes --]
[PATCH 2/4] like for cpustat, introduce the "gtime" (guest time of the task) and
"cgtime" (guest time of the task children) fields for the
tasks. Modify signal_struct and task_struct. Modify /proc/<pid>/stat to display
these new fields.
Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
--
------------- Laurent.Vivier@bull.net --------------
"Software is hard" - Donald Knuth
[-- Attachment #2: proc_task_stat_guest --]
[-- Type: text/plain, Size: 6356 bytes --]
Index: linux-2.6/fs/proc/array.c
===================================================================
--- linux-2.6.orig/fs/proc/array.c 2007-09-10 12:59:07.000000000 +0200
+++ linux-2.6/fs/proc/array.c 2007-09-10 12:59:13.000000000 +0200
@@ -370,6 +370,13 @@ static cputime_t task_stime(struct task_
}
#endif
+#ifdef CONFIG_GUEST_ACCOUNTING
+static cputime_t task_gtime(struct task_struct *p)
+{
+ return p->gtime;
+}
+#endif
+
static int do_task_stat(struct task_struct *task, char *buffer, int whole)
{
unsigned long vsize, eip, esp, wchan = ~0UL;
@@ -385,6 +392,9 @@ static int do_task_stat(struct task_stru
unsigned long cmin_flt = 0, cmaj_flt = 0;
unsigned long min_flt = 0, maj_flt = 0;
cputime_t cutime, cstime, utime, stime;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ cputime_t cgtime, gtime;
+#endif
unsigned long rsslim = 0;
char tcomm[sizeof(task->comm)];
unsigned long flags;
@@ -403,6 +413,9 @@ static int do_task_stat(struct task_stru
sigemptyset(&sigign);
sigemptyset(&sigcatch);
cutime = cstime = utime = stime = cputime_zero;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ cgtime = gtime = cputime_zero;
+#endif
rcu_read_lock();
if (lock_task_sighand(task, &flags)) {
@@ -420,6 +433,9 @@ static int do_task_stat(struct task_stru
cmaj_flt = sig->cmaj_flt;
cutime = sig->cutime;
cstime = sig->cstime;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ cgtime = sig->cgtime;
+#endif
rsslim = sig->rlim[RLIMIT_RSS].rlim_cur;
/* add up live thread stats at the group level */
@@ -430,6 +446,9 @@ static int do_task_stat(struct task_stru
maj_flt += t->maj_flt;
utime = cputime_add(utime, task_utime(t));
stime = cputime_add(stime, task_stime(t));
+#ifdef CONFIG_GUEST_ACCOUNTING
+ gtime = cputime_add(gtime, task_gtime(t));
+#endif
t = next_thread(t);
} while (t != task);
@@ -437,6 +456,9 @@ static int do_task_stat(struct task_stru
maj_flt += sig->maj_flt;
utime = cputime_add(utime, sig->utime);
stime = cputime_add(stime, sig->stime);
+#ifdef CONFIG_GUEST_ACCOUNTING
+ gtime += cputime_add(gtime, sig->gtime);
+#endif
}
sid = signal_session(sig);
@@ -454,6 +476,9 @@ static int do_task_stat(struct task_stru
maj_flt = task->maj_flt;
utime = task_utime(task);
stime = task_stime(task);
+#ifdef CONFIG_GUEST_ACCOUNTING
+ gtime = task_gtime(task);
+#endif
}
/* scale priority and nice values from timeslices to -20..20 */
@@ -469,9 +494,13 @@ static int do_task_stat(struct task_stru
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
- res = sprintf(buffer, "%d (%s) %c %d %d %d %d %d %u %lu \
-%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
-%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu\n",
+ res = sprintf(buffer, "%d (%s) %c %d %d %d %d %d %u %lu "
+"%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu "
+#ifdef CONFIG_GUEST_ACCOUNTING
+"%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
+#else
+"%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu\n",
+#endif
task->pid,
tcomm,
state,
@@ -516,7 +545,13 @@ static int do_task_stat(struct task_stru
task_cpu(task),
task->rt_priority,
task->policy,
+#ifdef CONFIG_GUEST_ACCOUNTING
+ (unsigned long long)delayacct_blkio_ticks(task),
+ cputime_to_clock_t(gtime),
+ cputime_to_clock_t(cgtime));
+#else
(unsigned long long)delayacct_blkio_ticks(task));
+#endif
if (mm)
mmput(mm);
return res;
Index: linux-2.6/include/linux/sched.h
===================================================================
--- linux-2.6.orig/include/linux/sched.h 2007-09-10 12:59:07.000000000 +0200
+++ linux-2.6/include/linux/sched.h 2007-09-10 12:59:13.000000000 +0200
@@ -515,6 +515,10 @@ struct signal_struct {
* in __exit_signal, except for the group leader.
*/
cputime_t utime, stime, cutime, cstime;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ cputime_t gtime;
+ cputime_t cgtime;
+#endif
unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
unsigned long inblock, oublock, cinblock, coublock;
@@ -1022,6 +1026,9 @@ struct task_struct {
unsigned int rt_priority;
cputime_t utime, stime;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ cputime_t gtime;
+#endif
unsigned long nvcsw, nivcsw; /* context switch counts */
struct timespec start_time; /* monotonic time */
struct timespec real_start_time; /* boot based time */
Index: linux-2.6/kernel/exit.c
===================================================================
--- linux-2.6.orig/kernel/exit.c 2007-09-10 12:59:07.000000000 +0200
+++ linux-2.6/kernel/exit.c 2007-09-10 12:59:13.000000000 +0200
@@ -120,6 +120,9 @@ static void __exit_signal(struct task_st
*/
sig->utime = cputime_add(sig->utime, tsk->utime);
sig->stime = cputime_add(sig->stime, tsk->stime);
+#ifdef CONFIG_GUEST_ACCOUNTING
+ sig->gtime = cputime_add(sig->gtime, tsk->gtime);
+#endif
sig->min_flt += tsk->min_flt;
sig->maj_flt += tsk->maj_flt;
sig->nvcsw += tsk->nvcsw;
@@ -1251,6 +1254,13 @@ static int wait_task_zombie(struct task_
cputime_add(p->stime,
cputime_add(sig->stime,
sig->cstime)));
+#ifdef CONFIG_GUEST_ACCOUNTING
+ psig->cgtime =
+ cputime_add(psig->cgtime,
+ cputime_add(p->gtime,
+ cputime_add(sig->gtime,
+ sig->cgtime)));
+#endif
psig->cmin_flt +=
p->min_flt + sig->min_flt + sig->cmin_flt;
psig->cmaj_flt +=
Index: linux-2.6/kernel/fork.c
===================================================================
--- linux-2.6.orig/kernel/fork.c 2007-09-10 12:59:07.000000000 +0200
+++ linux-2.6/kernel/fork.c 2007-09-10 12:59:13.000000000 +0200
@@ -877,6 +877,10 @@ static inline int copy_signal(unsigned l
sig->tty_old_pgrp = NULL;
sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ sig->gtime = cputime_zero;
+ sig->cgtime = cputime_zero;
+#endif
sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0;
sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0;
sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0;
@@ -1045,6 +1049,9 @@ static struct task_struct *copy_process(
p->utime = cputime_zero;
p->stime = cputime_zero;
+#ifdef CONFIG_GUEST_ACCOUNTING
+ p->gtime = cputime_zero;
+#endif
#ifdef CONFIG_TASK_XACCT
p->rchar = 0; /* I/O counter: bytes read */
reply other threads:[~2007-09-10 12:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46E53271.7040804@bull.net \
--to=laurent.vivier@bull.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.