gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Bug for measuring rss in fork()

Browse Source 
refs: #1032
This commit is contained in:
Ken Sato
2018-03-15 14:29:16 +09:00
parent bc89a51e00
commit c107d1fdf9
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/cls.h
View File

@@ -97,6 +97,8 @@ struct cpu_local_var {
ihk_spinlock_t smp_func_req_lock;
struct list_head smp_func_req_list;
struct process_vm *on_fork_vm;
} __attribute__((aligned(64)));

7
kernel/include/rusage_private.h
View File

@@ -35,7 +35,7 @@ rusage_rss_add(unsigned long size)
unsigned long newval;
unsigned long oldval;
unsigned long retval;
struct process_vm *vm = cpu_local_var(current)->vm;
struct process_vm *vm;
newval = __sync_add_and_fetch(&rusage->rss_current, size);
oldval = rusage->memory_max_usage;
@@ -49,6 +49,11 @@ rusage_rss_add(unsigned long size)
}
/* process rss */
vm = cpu_local_var(on_fork_vm);
if (!vm) {
vm = cpu_local_var(current)->vm;
}
vm->currss += size;
if (vm->currss > vm->proc->maxrss) {
vm->proc->maxrss = vm->currss;