diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2017-09-22 18:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-09-29 10:09:08 +0200 |
| commit | 1593baab910da72480d651ea7bf2ce6e3a25a484 (patch) | |
| tree | f25d6f915062f9c322233c987d30a66260f474bb /fs/proc | |
| parent | 770b782f555d663d133fcd4dc1632023f79357b9 (diff) | |
| download | linux-1593baab910da72480d651ea7bf2ce6e3a25a484.tar.gz linux-1593baab910da72480d651ea7bf2ce6e3a25a484.tar.bz2 linux-1593baab910da72480d651ea7bf2ce6e3a25a484.zip | |
sched/debug: Implement consistent task-state printing
Currently get_task_state() and task_state_to_char() report different
states, create a number of common helpers and unify the reported state
space.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/array.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 525157ca25cb..01196d3ad452 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -130,19 +130,8 @@ static const char * const task_state_array[] = { static inline const char *get_task_state(struct task_struct *tsk) { - unsigned int state = (tsk->state | tsk->exit_state) & TASK_REPORT; - - /* - * Parked tasks do not run; they sit in __kthread_parkme(). - * Without this check, we would report them as running, which is - * clearly wrong, so we report them as sleeping instead. - */ - if (tsk->state == TASK_PARKED) - state = TASK_INTERRUPTIBLE; - - BUILD_BUG_ON(1 + ilog2(TASK_REPORT) != ARRAY_SIZE(task_state_array)-1); - - return task_state_array[fls(state)]; + BUILD_BUG_ON(1 + ilog2(TASK_REPORT) != ARRAY_SIZE(task_state_array) - 1); + return task_state_array[__get_task_state(tsk)]; } static inline int get_task_umask(struct task_struct *tsk) |