[PATCH v2 2/2] sched/debug: intruduce task_state_to_char helper function

[Xie XiuQi]

Now we have more than one place to get the task state,
so intruduce task_state_to_char helper to save some code.

No function changed.

Signed-off-by: Xie XiuQi 
---
 include/linux/sched.h | 13 +
 kernel/sched/core.c   | 15 ---
 kernel/sched/debug.c  | 10 +++---
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2b69fc6..d20edc0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1189,6 +1189,19 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
return task_pgrp_nr_ns(tsk, _pid_ns);
 }
 
+static inline char task_state_to_char(struct task_struct *task)
+{
+   const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
+   unsigned long state = task->state;
+
+   state = state ? __ffs(state) + 1 : 0;
+
+   /* Make sure the string lines up properly with the number of task 
states: */
+   BUILD_BUG_ON(sizeof(TASK_STATE_TO_CHAR_STR)-1 != 
ilog2(TASK_STATE_MAX)+1);
+
+   return state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?';
+}
+
 /**
  * is_global_init - check if a task structure is init. Since init
  * is free to have sub-threads we need to check tgid.
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 326d4f8..79a3841 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5316,24 +5316,17 @@ void io_schedule(void)
return retval;
 }
 
-static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-
 void sched_show_task(struct task_struct *p)
 {
unsigned long free = 0;
int ppid;
-   unsigned long state = p->state;
-
-   /* Make sure the string lines up properly with the number of task 
states: */
-   BUILD_BUG_ON(sizeof(TASK_STATE_TO_CHAR_STR)-1 != 
ilog2(TASK_STATE_MAX)+1);
 
if (!try_get_task_stack(p))
return;
-   if (state)
-   state = __ffs(state) + 1;
-   printk(KERN_INFO "%-15.15s %c", p->comm,
-   state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
-   if (state == TASK_RUNNING)
+
+   printk(KERN_INFO "%-15.15s %c", p->comm, task_state_to_char(p));
+
+   if (p->state == TASK_RUNNING)
printk(KERN_CONT "  running task");
 #ifdef CONFIG_DEBUG_STACK_USAGE
free = stack_not_used(p);
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 60f7e20..b6ed776 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -426,14 +426,10 @@ static char *task_group_path(struct task_group *tg)
 static void
 print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
 {
-   unsigned long state;
-
-   if (rq->curr == p) {
+   if (rq->curr == p)
SEQ_printf(m, ">R");
-   } else {
-   state = p->state ? __ffs(p->state) + 1 : 0;
-   SEQ_printf(m, " %c", state < sizeof(stat_nam) - 1 ? 
stat_nam[state] : '?');
-   }
+   else
+   SEQ_printf(m, " %c", task_state_to_char(p));
 
SEQ_printf(m, "%15s %5d %9Ld.%06ld %9Ld %5d ",
p->comm, task_pid_nr(p),
-- 
1.8.3.1

[PATCH v2 2/2] sched/debug: intruduce task_state_to_char helper function

[Xie XiuQi]

Now we have more than one place to get the task state,
so intruduce task_state_to_char helper to save some code.

No function changed.

Signed-off-by: Xie XiuQi 
---
 include/linux/sched.h | 13 +
 kernel/sched/core.c   | 15 ---
 kernel/sched/debug.c  | 10 +++---
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2b69fc6..d20edc0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1189,6 +1189,19 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)
return task_pgrp_nr_ns(tsk, _pid_ns);
 }
 
+static inline char task_state_to_char(struct task_struct *task)
+{
+   const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
+   unsigned long state = task->state;
+
+   state = state ? __ffs(state) + 1 : 0;
+
+   /* Make sure the string lines up properly with the number of task 
states: */
+   BUILD_BUG_ON(sizeof(TASK_STATE_TO_CHAR_STR)-1 != 
ilog2(TASK_STATE_MAX)+1);
+
+   return state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?';
+}
+
 /**
  * is_global_init - check if a task structure is init. Since init
  * is free to have sub-threads we need to check tgid.
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 326d4f8..79a3841 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5316,24 +5316,17 @@ void io_schedule(void)
return retval;
 }
 
-static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-
 void sched_show_task(struct task_struct *p)
 {
unsigned long free = 0;
int ppid;
-   unsigned long state = p->state;
-
-   /* Make sure the string lines up properly with the number of task 
states: */
-   BUILD_BUG_ON(sizeof(TASK_STATE_TO_CHAR_STR)-1 != 
ilog2(TASK_STATE_MAX)+1);
 
if (!try_get_task_stack(p))
return;
-   if (state)
-   state = __ffs(state) + 1;
-   printk(KERN_INFO "%-15.15s %c", p->comm,
-   state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
-   if (state == TASK_RUNNING)
+
+   printk(KERN_INFO "%-15.15s %c", p->comm, task_state_to_char(p));
+
+   if (p->state == TASK_RUNNING)
printk(KERN_CONT "  running task");
 #ifdef CONFIG_DEBUG_STACK_USAGE
free = stack_not_used(p);
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 60f7e20..b6ed776 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -426,14 +426,10 @@ static char *task_group_path(struct task_group *tg)
 static void
 print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
 {
-   unsigned long state;
-
-   if (rq->curr == p) {
+   if (rq->curr == p)
SEQ_printf(m, ">R");
-   } else {
-   state = p->state ? __ffs(p->state) + 1 : 0;
-   SEQ_printf(m, " %c", state < sizeof(stat_nam) - 1 ? 
stat_nam[state] : '?');
-   }
+   else
+   SEQ_printf(m, " %c", task_state_to_char(p));
 
SEQ_printf(m, "%15s %5d %9Ld.%06ld %9Ld %5d ",
p->comm, task_pid_nr(p),
-- 
1.8.3.1