lkml.org 
[lkml]   [2011]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/5] oom: improve dump_tasks() show items
    On Fri, 20 May 2011, KOSAKI Motohiro wrote:

    > diff --git a/mm/oom_kill.c b/mm/oom_kill.c
    > index f52e85c..43d32ae 100644
    > --- a/mm/oom_kill.c
    > +++ b/mm/oom_kill.c
    > @@ -355,7 +355,7 @@ static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask)
    > struct task_struct *p;
    > struct task_struct *task;
    >
    > - pr_info("[ pid ] uid tgid total_vm rss cpu oom_adj oom_score_adj name\n");
    > + pr_info("[ pid] ppid uid total_vm rss swap score_adj name\n");
    > for_each_process(p) {
    > if (oom_unkillable_task(p, mem, nodemask))
    > continue;
    > @@ -370,11 +370,14 @@ static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask)
    > continue;
    > }
    >
    > - pr_info("[%5d] %5d %5d %8lu %8lu %3u %3d %5d %s\n",
    > - task->pid, task_uid(task), task->tgid,
    > - task->mm->total_vm, get_mm_rss(task->mm),
    > - task_cpu(task), task->signal->oom_adj,
    > - task->signal->oom_score_adj, task->comm);
    > + pr_info("[%6d] %6d %5d %8lu %8lu %8lu %9d %s\n",
    > + task_tgid_nr(task), task_tgid_nr(task->real_parent),
    > + task_uid(task),
    > + task->mm->total_vm,
    > + get_mm_rss(task->mm) + p->mm->nr_ptes,
    > + get_mm_counter(p->mm, MM_SWAPENTS),
    > + task->signal->oom_score_adj,
    > + task->comm);
    > task_unlock(task);
    > }
    > }

    Looks good, with the exception that the "score_adj" header should remain
    "oom_score_adj" since that is its name within procfs that changes the
    tunable.

    After that's fixed:

    Acked-by: David Rientjes <rientjes@google.com>


    \
     
     \ /
      Last update: 2011-05-24 00:19    [W:0.024 / U:2.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site