mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge "taskstats: handle NULL nla case in taskstats2"
This commit is contained in:
commit
514fa165a3
2 changed files with 209 additions and 1 deletions
|
|
@ -35,6 +35,7 @@
|
|||
|
||||
|
||||
#define TASKSTATS_VERSION 9
|
||||
#define TASKSTATS2_VERSION 1
|
||||
#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN
|
||||
* in linux/sched.h */
|
||||
|
||||
|
|
@ -170,6 +171,19 @@ struct taskstats {
|
|||
__u64 thrashing_delay_total;
|
||||
};
|
||||
|
||||
struct taskstats2 {
|
||||
__u16 version;
|
||||
__s16 oom_score;
|
||||
__u32 pid;
|
||||
__u64 anon_rss; /* KB */
|
||||
__u64 file_rss; /* KB */
|
||||
__u64 swap_rss; /* KB */
|
||||
__u64 shmem_rss; /* KB */
|
||||
#ifdef CONFIG_MM_STAT_UNRECLAIMABLE_PAGES
|
||||
__u64 unreclaimable; /* KB */
|
||||
#endif
|
||||
/* version 1 ends here */
|
||||
};
|
||||
|
||||
/*
|
||||
* Commands sent from userspace
|
||||
|
|
@ -181,6 +195,7 @@ enum {
|
|||
TASKSTATS_CMD_UNSPEC = 0, /* Reserved */
|
||||
TASKSTATS_CMD_GET, /* user->kernel request/get-response */
|
||||
TASKSTATS_CMD_NEW, /* kernel->user event */
|
||||
TASKSTATS2_CMD_GET, /* user->kernel request/get-response */
|
||||
__TASKSTATS_CMD_MAX,
|
||||
};
|
||||
|
||||
|
|
@ -194,6 +209,7 @@ enum {
|
|||
TASKSTATS_TYPE_AGGR_PID, /* contains pid + stats */
|
||||
TASKSTATS_TYPE_AGGR_TGID, /* contains tgid + stats */
|
||||
TASKSTATS_TYPE_NULL, /* contains nothing */
|
||||
TASKSTATS_TYPE_FOREACH, /* contains stats */
|
||||
__TASKSTATS_TYPE_MAX,
|
||||
};
|
||||
|
||||
|
|
@ -205,6 +221,7 @@ enum {
|
|||
TASKSTATS_CMD_ATTR_TGID,
|
||||
TASKSTATS_CMD_ATTR_REGISTER_CPUMASK,
|
||||
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK,
|
||||
TASKSTATS_CMD_ATTR_FOREACH,
|
||||
__TASKSTATS_CMD_ATTR_MAX,
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue