Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d48b080 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/debug: Rename task-state printing helpers 



Steve requested better names for the new task-state helper functions.

So introduce the concept of task-state index for the printing and
rename __get_task_state() to task_state_index() and
__task_state_to_char() to task_index_to_char().

Requested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170929115016.pzlqc7ss3ccystyg@hirez.programming.kicks-ass.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 62cb1188

fs/proc/array.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static const char * const task_state_array[] = { 
static inline const char *get_task_state(struct task_struct *tsk)

{

	BUILD_BUG_ON(1 + ilog2(TASK_REPORT_MAX) != ARRAY_SIZE(task_state_array));

	return task_state_array[__get_task_state(tsk)];

	return task_state_array[task_state_index(tsk)];

}



static inline int get_task_umask(struct task_struct *tsk)

include/linux/sched.h

+3 −3
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk) 
#define TASK_REPORT_IDLE	(TASK_REPORT + 1)

#define TASK_REPORT_MAX		(TASK_REPORT_IDLE << 1)



static inline unsigned int __get_task_state(struct task_struct *tsk)

static inline unsigned int task_state_index(struct task_struct *tsk)

{

	unsigned int tsk_state = READ_ONCE(tsk->state);

	unsigned int state = (tsk_state | tsk->exit_state) & TASK_REPORT;
@@ -1261,7 +1261,7 @@ static inline unsigned int __get_task_state(struct task_struct *tsk) 
	return fls(state);

}



static inline char __task_state_to_char(unsigned int state)

static inline char task_index_to_char(unsigned int state)

{

	static const char state_char[] = "RSDTtXZPI";
@@ -1272,7 +1272,7 @@ static inline char __task_state_to_char(unsigned int state) 


static inline char task_state_to_char(struct task_struct *tsk)

{

	return __task_state_to_char(__get_task_state(tsk));

	return task_index_to_char(task_state_index(tsk));

}



/**

include/trace/events/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct * 
	if (preempt)

		return TASK_STATE_MAX;



	return __get_task_state(p);

	return task_state_index(p);

}

#endif /* CREATE_TRACE_POINTS */

kernel/trace/trace_output.c

+6 −6
Original line number Diff line number Diff line
@@ -921,8 +921,8 @@ static enum print_line_t trace_ctxwake_print(struct trace_iterator *iter, 


	trace_assign_type(field, iter->ent);



	T = __task_state_to_char(field->next_state);

	S = __task_state_to_char(field->prev_state);

	T = task_index_to_char(field->next_state);

	S = task_index_to_char(field->prev_state);

	trace_find_cmdline(field->next_pid, comm);

	trace_seq_printf(&iter->seq,

			 " %5d:%3d:%c %s [%03d] %5d:%3d:%c %s\n",
@@ -957,8 +957,8 @@ static int trace_ctxwake_raw(struct trace_iterator *iter, char S) 
	trace_assign_type(field, iter->ent);



	if (!S)

		S = __task_state_to_char(field->prev_state);

	T = __task_state_to_char(field->next_state);

		S = task_index_to_char(field->prev_state);

	T = task_index_to_char(field->next_state);

	trace_seq_printf(&iter->seq, "%d %d %c %d %d %d %c\n",

			 field->prev_pid,

			 field->prev_prio,
@@ -993,8 +993,8 @@ static int trace_ctxwake_hex(struct trace_iterator *iter, char S) 
	trace_assign_type(field, iter->ent);



	if (!S)

		S = __task_state_to_char(field->prev_state);

	T = __task_state_to_char(field->next_state);

		S = task_index_to_char(field->prev_state);

	T = task_index_to_char(field->next_state);



	SEQ_PUT_HEX_FIELD(s, field->prev_pid);

	SEQ_PUT_HEX_FIELD(s, field->prev_prio);

kernel/trace/trace_sched_wakeup.c

+4 −4
Original line number Diff line number Diff line
@@ -397,10 +397,10 @@ tracing_sched_switch_trace(struct trace_array *tr, 
	entry	= ring_buffer_event_data(event);

	entry->prev_pid			= prev->pid;

	entry->prev_prio		= prev->prio;

	entry->prev_state		= __get_task_state(prev);

	entry->prev_state		= task_state_index(prev);

	entry->next_pid			= next->pid;

	entry->next_prio		= next->prio;

	entry->next_state		= __get_task_state(next);

	entry->next_state		= task_state_index(next);

	entry->next_cpu	= task_cpu(next);



	if (!call_filter_check_discard(call, entry, buffer, event))
@@ -425,10 +425,10 @@ tracing_sched_wakeup_trace(struct trace_array *tr, 
	entry	= ring_buffer_event_data(event);

	entry->prev_pid			= curr->pid;

	entry->prev_prio		= curr->prio;

	entry->prev_state		= __get_task_state(curr);

	entry->prev_state		= task_state_index(curr);

	entry->next_pid			= wakee->pid;

	entry->next_prio		= wakee->prio;

	entry->next_state		= __get_task_state(wakee);

	entry->next_state		= task_state_index(wakee);

	entry->next_cpu			= task_cpu(wakee);



	if (!call_filter_check_discard(call, entry, buffer, event))