To avoid ugly parameter specifications for the sprintf statement
we pull the ppid,tpid computations out. Later these statements
will get a tiny bit more elaborate, because we need to deal with
the special case of an illegal task_vvpid (not in the same container)
virtualization. This is simply in preparation for that.
Signed-off-by: Hubertus Franke <[email protected]>
---
array.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
Index: linux-2.6.15/fs/proc/array.c
===================================================================
--- linux-2.6.15.orig/fs/proc/array.c 2006-01-17 08:37:04.000000000 -0500
+++ linux-2.6.15/fs/proc/array.c 2006-01-17 08:37:04.000000000 -0500
@@ -161,8 +161,17 @@
struct group_info *group_info;
int g;
struct fdtable *fdt = NULL;
+ pid_t ppid, tpid;
read_lock(&tasklist_lock);
+ if (pid_alive(p))
+ ppid = task_vtgid(p->group_leader->real_parent);
+ else
+ ppid = 0;
+ if (pid_alive(p) && p->ptrace)
+ tpid = task_vppid(p);
+ else
+ tpid = 0;
buffer += sprintf(buffer,
"State:\t%s\n"
"SleepAVG:\t%lu%%\n"
@@ -175,9 +184,8 @@
get_task_state(p),
(p->sleep_avg/1024)*100/(1020000000/1024),
task_vtgid(p),
- task_vpid(p), pid_alive(p) ?
- task_vtgid(p->group_leader->real_parent) : 0,
- pid_alive(p) && p->ptrace ? task_vpid(p->parent) : 0,
+ task_vpid(p),
+ ppid, tpid,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
read_unlock(&tasklist_lock);
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
