git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
proc
/
array.c
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index
47e2543
..
d00c864
100644
(file)
--- a/
fs/proc/array.c
+++ b/
fs/proc/array.c
@@
-142,7
+142,6
@@
static inline const char * get_task_state(struct task_struct *tsk)
TASK_INTERRUPTIBLE |
TASK_UNINTERRUPTIBLE |
TASK_ZOMBIE |
TASK_INTERRUPTIBLE |
TASK_UNINTERRUPTIBLE |
TASK_ZOMBIE |
- TASK_DEAD |
TASK_STOPPED |
TASK_ONHOLD);
const char **p = &task_state_array[0];
TASK_STOPPED |
TASK_ONHOLD);
const char **p = &task_state_array[0];
@@
-158,11
+157,9
@@
static inline char * task_state(struct task_struct *p, char *buffer)
{
struct group_info *group_info;
int g;
{
struct group_info *group_info;
int g;
- pid_t p
id, ppid, tg
id;
+ pid_t p
p
id;
read_lock(&tasklist_lock);
read_lock(&tasklist_lock);
- tgid = vx_map_tgid(current->vx_info, p->tgid);
- pid = vx_map_tgid(current->vx_info, p->pid);
ppid = vx_map_tgid(current->vx_info, p->real_parent->pid);
buffer += sprintf(buffer,
"State:\t%s\n"
ppid = vx_map_tgid(current->vx_info, p->real_parent->pid);
buffer += sprintf(buffer,
"State:\t%s\n"
@@
-175,7
+172,8
@@
static inline char * task_state(struct task_struct *p, char *buffer)
"Gid:\t%d\t%d\t%d\t%d\n",
get_task_state(p),
(p->sleep_avg/1024)*100/(1020000000/1024),
"Gid:\t%d\t%d\t%d\t%d\n",
get_task_state(p),
(p->sleep_avg/1024)*100/(1020000000/1024),
- tgid, pid, p->pid ? ppid : 0,
+ p->tgid,
+ p->pid, p->pid ? ppid : 0,
p->pid && p->ptrace ? p->parent->pid : 0,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
p->pid && p->ptrace ? p->parent->pid : 0,
p->uid, p->euid, p->suid, p->fsuid,
p->gid, p->egid, p->sgid, p->fsgid);
@@
-352,7
+350,7
@@
int proc_pid_stat(struct task_struct *task, char * buffer)
sigset_t sigign, sigcatch;
char state;
int res;
sigset_t sigign, sigcatch;
char state;
int res;
- pid_t p
id, p
pid, pgid = -1, sid = -1;
+ pid_t ppid, pgid = -1, sid = -1;
int num_threads = 0;
struct mm_struct *mm;
unsigned long long start_time;
int num_threads = 0;
struct mm_struct *mm;
unsigned long long start_time;
@@
-368,7
+366,6
@@
int proc_pid_stat(struct task_struct *task, char * buffer)
if (bias_jiffies > task->start_time)
bias_jiffies = task->start_time;
}
if (bias_jiffies > task->start_time)
bias_jiffies = task->start_time;
}
- pid = vx_map_tgid(task->vx_info, task->pid);
mm = task->mm;
if(mm)
mm = task->mm;
if(mm)
@@
-421,7
+418,7
@@
int proc_pid_stat(struct task_struct *task, char * buffer)
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",
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",
- pid,
+
task->
pid,
task->comm,
state,
ppid,
task->comm,
state,
ppid,