oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes to make it work with kernel 2.1.115.

Browse Source
This commit is contained in:
Martin Baulig
1998-08-12 16:30:06 +00:00
parent b05cfacb3d
commit 71310d645d
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/table21/.cvsignore Normal file
View File

@@ -0,0 +1,4 @@
kernel.patch
.main.o.flags
.table.o.flags
.module.o.flags

2
kernel/table21/Makefile
View File

@@ -10,7 +10,7 @@
O_TARGET := table.o O_TARGET := table.o
OX_OBJS := main.o OX_OBJS := main.o
M_TARGET := module.o M_TARGET := table_mod.o
MX_OBJS := module.o MX_OBJS := module.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make

36
kernel/table21/module.c
View File

@@ -305,7 +305,7 @@ table_fkt (int type, union table *buf, const void *param)
struct sysinfo i; struct sysinfo i;
struct task_struct *tsk = NULL; struct task_struct *tsk = NULL;
sigset_t sigign, sigcatch; sigset_t sigign, sigcatch;
int index, err; int index, tindex, err;
pid_t pid; pid_t pid;
if (type == TABLE_VERSION) if (type == TABLE_VERSION)
@@ -346,13 +346,16 @@ table_fkt (int type, union table *buf, const void *param)
switch (type) { switch (type) {
case TABLE_PROCLIST: case TABLE_PROCLIST:
tsk = task [0]; tsk = task [0];
for (index = 0; index < nr_tasks; index++) { read_lock (&tasklist_lock);
tbl.proclist.pids [index] = tsk->pid; for (index = tindex = 0; index < nr_tasks; index++) {
if (tsk->pid)
tbl.proclist.pids [tindex++] = tsk->pid;
tsk = tsk->next_task; tsk = tsk->next_task;
} }
tbl.proclist.nr_running = nr_running; tbl.proclist.nr_running = nr_running;
tbl.proclist.nr_tasks = nr_tasks;
tbl.proclist.last_pid = last_pid; tbl.proclist.last_pid = last_pid;
tbl.proclist.nr_tasks = tindex;
read_unlock(&tasklist_lock);
break; break;
case TABLE_CPU: case TABLE_CPU:
tbl.cpu.total = jiffies; tbl.cpu.total = jiffies;
@@ -460,7 +463,7 @@ table_fkt (int type, union table *buf, const void *param)
tbl.proc_mem.arg_end = tsk->mm->arg_end; tbl.proc_mem.arg_end = tsk->mm->arg_end;
tbl.proc_mem.env_start = tsk->mm->env_start; tbl.proc_mem.env_start = tsk->mm->env_start;
tbl.proc_mem.env_end = tsk->mm->env_end; tbl.proc_mem.env_end = tsk->mm->env_end;
tbl.proc_mem.rss = tsk->mm->rss; tbl.proc_mem.rss = tsk->mm->rss << PAGE_SHIFT;
tbl.proc_mem.total_vm = tsk->mm->total_vm; tbl.proc_mem.total_vm = tsk->mm->total_vm;
tbl.proc_mem.locked_vm = tsk->mm->locked_vm; tbl.proc_mem.locked_vm = tsk->mm->locked_vm;
} }
@@ -480,7 +483,18 @@ table_fkt (int type, union table *buf, const void *param)
vsize += vma->vm_end - vma->vm_start; vsize += vma->vm_end - vma->vm_start;
statm_pgd_range (pgd, vma->vm_start, vma->vm_end, statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
&pages, &shared, &dirty, &total); &pages, &shared, &dirty, &total);
#if 0
printk ("vma %p (%d) - %d, %d, %d, %d - "
"%lx - %lx, %lx - %lx - %lx\n",
vma, pid, pages, shared, dirty, total,
PAGE_SIZE, vma->vm_start, vma->vm_end,
vma->vm_end - vma->vm_start,
(vma->vm_end - vma->vm_start) >> PAGE_SHIFT);
#endif
resident += pages; resident += pages;
share += shared; share += shared;
dt += dirty; dt += dirty;
@@ -497,12 +511,12 @@ table_fkt (int type, union table *buf, const void *param)
} }
tbl.proc_segment.vsize = vsize; tbl.proc_segment.vsize = vsize;
tbl.proc_segment.size = size; tbl.proc_segment.size = size << PAGE_SHIFT;
tbl.proc_segment.resident = resident; tbl.proc_segment.resident = resident << PAGE_SHIFT;
tbl.proc_segment.shared = share; tbl.proc_segment.shared = share << PAGE_SHIFT;
tbl.proc_segment.trs = trs; tbl.proc_segment.trs = trs << PAGE_SHIFT;
tbl.proc_segment.lrs = lrs; tbl.proc_segment.lrs = lrs << PAGE_SHIFT;
tbl.proc_segment.dt = dt; tbl.proc_segment.dt = dt << PAGE_SHIFT;
} }
break; break;
case TABLE_PROC_TIME: case TABLE_PROC_TIME: