OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: android: lowmemorykiller: cleanup android low memory killer 

Clean up the code in lowmem_shrink() for the Android low memory killer so
that it follows the kernel coding style.

It's unnecessary to check for p->oomkilladj >= min_adj if the selected
task's oomkilladj score is stored since get_mm_rss() will always be
greater than zero.

Cc: San Mehat <san@android.com>
Cc: Arve Hjønnevåg <arve@android.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Rientjes 2009-05-11 15:45:12 -07:00 committed by Greg Kroah-Hartman
parent 31d59a4198
commit 34006e11ee
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/staging/android/lowmemorykiller.c
View File

@ -57,58 +57,71 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
int i; int i;
int min_adj = OOM_ADJUST_MAX + 1; int min_adj = OOM_ADJUST_MAX + 1;
int selected_tasksize = 0; int selected_tasksize = 0;
int selected_oom_adj;
int array_size = ARRAY_SIZE(lowmem_adj); int array_size = ARRAY_SIZE(lowmem_adj);
int other_free = global_page_state(NR_FREE_PAGES); int other_free = global_page_state(NR_FREE_PAGES);
int other_file = global_page_state(NR_FILE_PAGES); int other_file = global_page_state(NR_FILE_PAGES);
if(lowmem_adj_size < array_size)
if (lowmem_adj_size < array_size)
array_size = lowmem_adj_size; array_size = lowmem_adj_size;
if(lowmem_minfree_size < array_size) if (lowmem_minfree_size < array_size)
array_size = lowmem_minfree_size; array_size = lowmem_minfree_size;
for(i = 0; i < array_size; i++) { for (i = 0; i < array_size; i++) {
if (other_free < lowmem_minfree[i] && if (other_free < lowmem_minfree[i] &&
other_file < lowmem_minfree[i]) { other_file < lowmem_minfree[i]) {
min_adj = lowmem_adj[i]; min_adj = lowmem_adj[i];
break; break;
} }
} }
if(nr_to_scan > 0) if (nr_to_scan > 0)
lowmem_print(3, "lowmem_shrink %d, %x, ofree %d %d, ma %d\n", nr_to_scan, gfp_mask, other_free, other_file, min_adj); lowmem_print(3, "lowmem_shrink %d, %x, ofree %d %d, ma %d\n",
nr_to_scan, gfp_mask, other_free, other_file,
min_adj);
rem = global_page_state(NR_ACTIVE_ANON) + rem = global_page_state(NR_ACTIVE_ANON) +
global_page_state(NR_ACTIVE_FILE) + global_page_state(NR_ACTIVE_FILE) +
global_page_state(NR_INACTIVE_ANON) + global_page_state(NR_INACTIVE_ANON) +
global_page_state(NR_INACTIVE_FILE); global_page_state(NR_INACTIVE_FILE);
if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) { if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) {
lowmem_print(5, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem); lowmem_print(5, "lowmem_shrink %d, %x, return %d\n",
nr_to_scan, gfp_mask, rem);
return rem; return rem;
} }
selected_oom_adj = min_adj;
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
for_each_process(p) { for_each_process(p) {
if (p->oomkilladj < min_adj || !p->mm) int oom_adj;
if (!p->mm)
continue;
oom_adj = p->oomkilladj;
if (oom_adj < min_adj)
continue; continue;
tasksize = get_mm_rss(p->mm); tasksize = get_mm_rss(p->mm);
if (tasksize <= 0) if (tasksize <= 0)
continue; continue;
if (selected) { if (selected) {
if (p->oomkilladj < selected->oomkilladj) if (oom_adj < selected_oom_adj)
continue; continue;
if (p->oomkilladj == selected->oomkilladj && if (oom_adj == selected_oom_adj &&
tasksize <= selected_tasksize) tasksize <= selected_tasksize)
continue; continue;
} }
selected = p; selected = p;
selected_tasksize = tasksize; selected_tasksize = tasksize;
selected_oom_adj = oom_adj;
lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n", lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n",
p->pid, p->comm, p->oomkilladj, tasksize); p->pid, p->comm, oom_adj, tasksize);
} }
if(selected != NULL) { if (selected) {
lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n", lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n",
selected->pid, selected->comm, selected->pid, selected->comm,
selected->oomkilladj, selected_tasksize); selected_oom_adj, selected_tasksize);
force_sig(SIGKILL, selected); force_sig(SIGKILL, selected);
rem -= selected_tasksize; rem -= selected_tasksize;
} }
lowmem_print(4, "lowmem_shrink %d, %x, return %d\n", nr_to_scan, gfp_mask, rem); lowmem_print(4, "lowmem_shrink %d, %x, return %d\n",
nr_to_scan, gfp_mask, rem);
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
return rem; return rem;
} }