* : base.c too.
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/file.h>
#include <linux/times.h>
#include <linux/cpuset.h>
-#include <linux/vs_context.h>
-#include <linux/vs_network.h>
-#include <linux/vs_cvirt.h>
+#include <linux/tracehook.h>
+#include <linux/rcupdate.h>
+#include <linux/delayacct.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
"T (tracing stop)", /* 8 */
"Z (zombie)", /* 16 */
"X (dead)", /* 32 */
- "H (on hold)" /* 64 */
+ "N (noninteractive)", /* 64 */
+ "H (on hold)" /* 128 */
};
static inline const char * get_task_state(struct task_struct *tsk)
static inline char * task_state(struct task_struct *p, char *buffer)
{
+ struct task_struct *tracer;
+ pid_t tracer_pid, pid, ptgid, tgid;
struct group_info *group_info;
int g;
- pid_t pid, ptgid, tppid, tgid;
+ struct fdtable *fdt = NULL;
+
+ rcu_read_lock();
+ tracer = tracehook_tracer_task(p);
+ tracer_pid = tracer == NULL ? 0 : vx_map_pid(tracer->pid);
+ rcu_read_unlock();
read_lock(&tasklist_lock);
tgid = vx_map_tgid(p->tgid);
pid = vx_map_pid(p->pid);
- ptgid = vx_map_pid(p->group_leader->real_parent->tgid);
- tppid = vx_map_pid(p->parent->pid);
+ ptgid = vx_map_pid(p->group_leader->parent->tgid);
buffer += sprintf(buffer,
"State:\t%s\n"
"SleepAVG:\t%lu%%\n"
get_task_state(p),
(p->sleep_avg/1024)*100/(1020000000/1024),
tgid, pid, (pid > 1) ? ptgid : 0,
- pid_alive(p) && p->ptrace ? tppid : 0,
+ tracer_pid,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
read_unlock(&tasklist_lock);
task_lock(p);
+ rcu_read_lock();
+ if (p->files)
+ fdt = files_fdtable(p->files);
buffer += sprintf(buffer,
"FDSize:\t%d\n"
"Groups:\t",
- p->files ? p->files->max_fds : 0);
+ fdt ? fdt->max_fds : 0);
+ rcu_read_unlock();
group_info = p->group_info;
get_group_info(group_info);
put_nx_info(nxi);
#endif
skip:
-#if defined(CONFIG_ARCH_S390)
+#if defined(CONFIG_S390)
buffer = task_show_regs(task, buffer);
#endif
return buffer - orig;
{
unsigned long vsize, eip, esp, wchan = ~0UL;
long priority, nice;
- unsigned long long bias_uptime = 0;
int tty_pgrp = -1, tty_nr = 0;
sigset_t sigign, sigcatch;
char state;
unsigned long min_flt = 0, maj_flt = 0;
cputime_t cutime, cstime, utime, stime;
unsigned long rsslim = 0;
- unsigned long it_real_value = 0;
struct task_struct *t;
char tcomm[sizeof(task->comm)];
sigemptyset(&sigign);
sigemptyset(&sigcatch);
cutime = cstime = utime = stime = cputime_zero;
+
+ mutex_lock(&tty_mutex);
read_lock(&tasklist_lock);
if (task->sighand) {
spin_lock_irq(&task->sighand->siglock);
utime = cputime_add(utime, task->signal->utime);
stime = cputime_add(stime, task->signal->stime);
}
- it_real_value = task->signal->it_real_value;
}
pid = vx_info_map_pid(task->vx_info, pid_alive(task) ? task->pid : 0);
ppid = (!(pid > 1)) ? 0 : vx_info_map_tgid(task->vx_info,
- task->group_leader->real_parent->tgid);
+ task->group_leader->parent->tgid);
pgid = vx_info_map_pid(task->vx_info, pgid);
read_unlock(&tasklist_lock);
+ mutex_unlock(&tty_mutex);
if (!whole || num_threads<2) {
wchan = 0;
priority = task_prio(task);
nice = task_nice(task);
- read_lock(&tasklist_lock);
- pid = vx_info_map_pid(task->vx_info, task->pid);
- ppid = (!(pid > 1)) ? 0 :
- vx_info_map_pid(task->vx_info, task->real_parent->pid);
- pgid = vx_info_map_pid(task->vx_info, pgid);
- read_unlock(&tasklist_lock);
-
/* Temporary variable needed for gcc-2.96 */
/* convert timespec -> nsec*/
start_time = (unsigned long long)task->start_time.tv_sec * NSEC_PER_SEC
+ task->start_time.tv_nsec;
-
/* convert nsec -> ticks */
- start_time = nsec_to_clock_t(start_time - bias_uptime);
-
- /* fixup start time for virt uptime */
- if (vx_flags(VXF_VIRT_UPTIME, 0)) {
- unsigned long long bias =
- current->vx_info->cvirt.bias_clock;
-
- if (start_time > bias)
- start_time -= bias;
- else
- start_time = 0;
- }
-
- /* fixup start time for virt uptime */
- if (vx_flags(VXF_VIRT_UPTIME, 0)) {
- unsigned long long bias =
- current->vx_info->cvirt.bias_clock;
-
- if (start_time > bias)
- start_time -= bias;
- else
- start_time = 0;
- }
-
- /* fixup start time for virt uptime */
- if (vx_flags(VXF_VIRT_UPTIME, 0)) {
- unsigned long long bias =
- current->vx_info->cvirt.bias_clock;
-
- if (start_time > bias)
- start_time -= bias;
- else
- start_time = 0;
- }
+ start_time = nsec_to_clock_t(start_time);
/* fixup start time for virt uptime */
if (vx_flags(VXF_VIRT_UPTIME, 0)) {
}
res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
-%lu %lu %lu %lu %lu %ld %ld %ld %ld %d %ld %llu %lu %ld %lu %lu %lu %lu %lu \
-%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
+%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 %lu %lu %llu\n",
pid,
tcomm,
state,
priority,
nice,
num_threads,
- jiffies_to_clock_t(it_real_value),
start_time,
vsize,
- mm ? get_mm_counter(mm, rss) : 0, /* you might want to shift this left 3 */
+ mm ? get_mm_rss(mm) : 0,
rsslim,
mm ? mm->start_code : 0,
mm ? mm->end_code : 0,
task->exit_signal,
task_cpu(task),
task->rt_priority,
- task->policy);
+ task->policy,
+ (unsigned long long)delayacct_blkio_ticks(task));
if(mm)
mmput(mm);
return res;
git://git.onelab.eu / linux-2.6.git / blobdiff