adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sched: Assert task state bits at build time

Browse source 
Since everybody is lazy and prone to forgetting things, make the
compiler help us a bit.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20091217121830.060186433@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-12-17 13:16:30 +01:00 committed by Ingo Molnar
parent 464763cf1c
commit e1781538cf
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/proc/array.c
View file

@ -134,14 +134,14 @@ static inline void task_name(struct seq_file *m, struct task_struct *p)
* simple bit tests. * simple bit tests.
*/ */
static const char *task_state_array[] = { static const char *task_state_array[] = {
"R (running)", /* 0 */ "R (running)", /* 0 */
"S (sleeping)", /* 1 */ "S (sleeping)", /* 1 */
"D (disk sleep)", /* 2 */ "D (disk sleep)", /* 2 */
"T (stopped)", /* 4 */ "T (stopped)", /* 4 */
"t (tracing stop)", /* 8 */ "t (tracing stop)", /* 8 */
"Z (zombie)", /* 16 */ "Z (zombie)", /* 16 */
"X (dead)", /* 32 */ "X (dead)", /* 32 */
"x (dead)", /* 64 */ "x (dead)", /* 64 */
"K (wakekill)", /* 128 */ "K (wakekill)", /* 128 */
"W (waking)", /* 256 */ "W (waking)", /* 256 */
}; };
@ -151,6 +151,8 @@ static inline const char *get_task_state(struct task_struct *tsk)
unsigned int state = (tsk->state & TASK_REPORT) | tsk->exit_state; unsigned int state = (tsk->state & TASK_REPORT) | tsk->exit_state;
const char **p = &task_state_array[0]; const char **p = &task_state_array[0];
BUILD_BUG_ON(1 + ilog2(TASK_STATE_MAX) != ARRAY_SIZE(task_state_array));
while (state) { while (state) {
p++; p++;
state >>= 1; state >>= 1;

4
include/linux/sched.h
View file

@ -192,9 +192,13 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
#define TASK_DEAD 64 #define TASK_DEAD 64
#define TASK_WAKEKILL 128 #define TASK_WAKEKILL 128
#define TASK_WAKING 256 #define TASK_WAKING 256
#define TASK_STATE_MAX 512
#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKW" #define TASK_STATE_TO_CHAR_STR "RSDTtZXxKW"
extern char ___assert_task_state[1 - 2*!!(
sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];
/* Convenience macros for the sake of set_task_state */ /* Convenience macros for the sake of set_task_state */
#define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE) #define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED) #define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED)