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

Commit 5f6ad26e authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/tracing: Use common task-state helpers 



Remove yet another task-state char instance.

Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent efb40f58

include/linux/sched.h

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ struct task_group; 
#define TASK_NEW			0x0800

#define TASK_STATE_MAX			0x1000



#define TASK_STATE_TO_CHAR_STR		"RSDTtXZxKWPNn"



/* Convenience macros for the sake of set_current_state: */

#define TASK_KILLABLE			(TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)

#define TASK_STOPPED			(TASK_WAKEKILL | __TASK_STOPPED)

kernel/trace/trace_output.c

+6 −15
Original line number Diff line number Diff line
@@ -656,15 +656,6 @@ int trace_print_lat_context(struct trace_iterator *iter) 
	return !trace_seq_has_overflowed(s);

}



static const char state_to_char[] = TASK_STATE_TO_CHAR_STR;



static int task_state_char(unsigned long state)

{

	int bit = state ? __ffs(state) + 1 : 0;



	return bit < sizeof(state_to_char) - 1 ? state_to_char[bit] : '?';

}



/**

 * ftrace_find_event - find a registered event

 * @type: the type of event to look for
@@ -930,8 +921,8 @@ static enum print_line_t trace_ctxwake_print(struct trace_iterator *iter, 


	trace_assign_type(field, iter->ent);



	T = task_state_char(field->next_state);

	S = task_state_char(field->prev_state);

	T = __task_state_to_char(field->next_state);

	S = __task_state_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",
@@ -966,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_char(field->prev_state);

	T = task_state_char(field->next_state);

		S = __task_state_to_char(field->prev_state);

	T = __task_state_to_char(field->next_state);

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

			 field->prev_pid,

			 field->prev_prio,
@@ -1002,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_char(field->prev_state);

	T = task_state_char(field->next_state);

		S = __task_state_to_char(field->prev_state);

	T = __task_state_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		= prev->state;

	entry->prev_state		= __get_task_state(prev);

	entry->next_pid			= next->pid;

	entry->next_prio		= next->prio;

	entry->next_state		= next->state;

	entry->next_state		= __get_task_state(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		= curr->state;

	entry->prev_state		= __get_task_state(curr);

	entry->next_pid			= wakee->pid;

	entry->next_prio		= wakee->prio;

	entry->next_state		= wakee->state;

	entry->next_state		= __get_task_state(wakee);

	entry->next_cpu			= task_cpu(wakee);



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