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

procfs: add number of threads to stat and status

Browse Source 
Change-Id: I98dd0868b20e9a1725c7d6e4f8379a4d86769780
This commit is contained in:
Balazs Gerofi
2019-04-12 07:56:20 +00:00
committed by Masamichi Takagi
parent 75e42badf4
commit 07c517828d
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/procfs.c
View File

@@ -515,6 +515,9 @@ int process_procfs_request(struct ikc_scd_packet *rpacket)
int bitmasks_offset = 0; int bitmasks_offset = 0;
char *cpu_bitmask, *cpu_list, *numa_bitmask, *numa_list; char *cpu_bitmask, *cpu_list, *numa_bitmask, *numa_list;
char *state; char *state;
struct mcs_rwlock_node_irqsave lock;
struct thread *thread_iter;
int nr_threads = 0;
bitmasks = kmalloc(BITMASKS_BUF_SIZE, IHK_MC_AP_CRITICAL); bitmasks = kmalloc(BITMASKS_BUF_SIZE, IHK_MC_AP_CRITICAL);
if (!bitmasks) { if (!bitmasks) {
@@ -556,6 +559,13 @@ int process_procfs_request(struct ikc_scd_packet *rpacket)
proc->vm->numa_mask, PROCESS_NUMA_MASK_BITS); proc->vm->numa_mask, PROCESS_NUMA_MASK_BITS);
bitmasks_offset++; bitmasks_offset++;
mcs_rwlock_reader_lock(&proc->threads_lock, &lock);
list_for_each_entry(thread_iter, &proc->threads_list,
siblings_list) {
++nr_threads;
}
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
state = "R (running)"; state = "R (running)";
if (proc->status == PS_STOPPED) if (proc->status == PS_STOPPED)
state = "T (stopped)"; state = "T (stopped)";
@@ -568,12 +578,14 @@ int process_procfs_request(struct ikc_scd_packet *rpacket)
"Uid:\t%d\t%d\t%d\t%d\n" "Uid:\t%d\t%d\t%d\t%d\n"
"Gid:\t%d\t%d\t%d\t%d\n" "Gid:\t%d\t%d\t%d\t%d\n"
"State:\t%s\n" "State:\t%s\n"
"VmLck:\t%9lu kB\n", "VmLck:\t%9lu kB\n"
"Threads: %d\n",
proc->pid, proc->pid,
proc->ruid, proc->euid, proc->suid, proc->fsuid, proc->ruid, proc->euid, proc->suid, proc->fsuid,
proc->rgid, proc->egid, proc->sgid, proc->fsgid, proc->rgid, proc->egid, proc->sgid, proc->fsgid,
state, state,
(lockedsize + 1023) >> 10); (lockedsize + 1023) >> 10,
nr_threads);
if (ans < 0 || ans > count || if (ans < 0 || ans > count ||
buf_add(&buf_top, &buf_cur, buf, ans) < 0) { buf_add(&buf_top, &buf_cur, buf, ans) < 0) {
goto err; goto err;
@@ -670,6 +682,9 @@ int process_procfs_request(struct ikc_scd_packet *rpacket)
if (!strcmp(p, "stat")) { if (!strcmp(p, "stat")) {
const char *comm = "exe"; const char *comm = "exe";
char state; char state;
struct mcs_rwlock_node_irqsave lock;
struct thread *thread_iter;
int nr_threads = 0;
if (proc->saved_cmdline) { if (proc->saved_cmdline) {
comm = strrchr(proc->saved_cmdline, '/'); comm = strrchr(proc->saved_cmdline, '/');
@@ -705,6 +720,13 @@ int process_procfs_request(struct ikc_scd_packet *rpacket)
} }
} }
mcs_rwlock_reader_lock(&proc->threads_lock, &lock);
list_for_each_entry(thread_iter, &proc->threads_list,
siblings_list) {
++nr_threads;
}
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
/* /*
* pid (comm) state ppid * pid (comm) state ppid
* pgrp session tty_nr tpgid * pgrp session tty_nr tpgid
@@ -735,7 +757,7 @@ int process_procfs_request(struct ikc_scd_packet *rpacket)
thread->proc->pid, 0, 0, 0, // pgrp... thread->proc->pid, 0, 0, 0, // pgrp...
0, 0L, 0L, 0L, // flags... 0, 0L, 0L, 0L, // flags...
0L, 0L, 0L, 0L, // cmajflt... 0L, 0L, 0L, 0L, // cmajflt...
0L, 0L, 0L, 0L, // cstime... 0L, 0L, 0L, nr_threads, // cstime...
0L, 0LL, 0L, 0L, // itrealvalue... 0L, 0LL, 0L, 0L, // itrealvalue...
0L, 0L, 0L, 0L, // rsslim... 0L, 0L, 0L, 0L, // rsslim...
0L, 0L, 0L, 0L, // kstkesp... 0L, 0L, 0L, 0L, // kstkesp...