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

Commit d1eb650f authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

tracepoint: Move signal sending tracepoint to events/signal.h 



Move signal sending event to events/signal.h. This patch also
renames sched_signal_send event to signal_generate.

Changes in v4:
 - Fix a typo of task_struct pointer.

Changes in v3:
 - Add docbook style comments

Changes in v2:
 - Add siginfo argument
 - Add siginfo storing macro

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Reviewed-by: default avatarJason Baron <jbaron@redhat.com>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Oleg Nesterov <oleg@redhat.com>
LKML-Reference: <20091124215645.30449.60208.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 80bbf6b6

Documentation/DocBook/tracepoint.tmpl

+5 −0
Original line number Original line Diff line number Diff line
@@ -86,4 +86,9 @@ 
!Iinclude/trace/events/irq.h

!Iinclude/trace/events/irq.h

  </chapter>

  </chapter>





  <chapter id="signal">

   <title>SIGNAL</title>

!Iinclude/trace/events/signal.h

  </chapter>



</book>
 
</book>

include/trace/events/sched.h

+0 −25
Original line number Original line Diff line number Diff line
@@ -287,31 +287,6 @@ TRACE_EVENT(sched_process_fork, 
		__entry->child_comm, __entry->child_pid)

		__entry->child_comm, __entry->child_pid)

);

);





/*

 * Tracepoint for sending a signal:

 */

TRACE_EVENT(sched_signal_send,



	TP_PROTO(int sig, struct task_struct *p),



	TP_ARGS(sig, p),



	TP_STRUCT__entry(

		__field(	int,	sig			)

		__array(	char,	comm,	TASK_COMM_LEN	)

		__field(	pid_t,	pid			)

	),



	TP_fast_assign(

		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);

		__entry->pid	= p->pid;

		__entry->sig	= sig;

	),



	TP_printk("sig=%d comm=%s pid=%d",

		  __entry->sig, __entry->comm, __entry->pid)

);



/*

/*

 * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE

 * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE

 *     adding sched_stat support to SCHED_FIFO/RR would be welcome.

 *     adding sched_stat support to SCHED_FIFO/RR would be welcome.

include/trace/events/signal.h

0 → 100644
+66 −0
Original line number Original line Diff line number Diff line 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM signal



#if !defined(_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_SIGNAL_H



#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/tracepoint.h>



#define TP_STORE_SIGINFO(__entry, info)				\

	do {							\

		if (info == SEND_SIG_NOINFO) {			\

			__entry->errno	= 0;			\

			__entry->code	= SI_USER;		\

		} else if (info == SEND_SIG_PRIV) {		\

			__entry->errno	= 0;			\

			__entry->code	= SI_KERNEL;		\

		} else {					\

			__entry->errno	= info->si_errno;	\

			__entry->code	= info->si_code;	\

		}						\

	} while (0)



/**

 * signal_generate - called when a signal is generated

 * @sig: signal number

 * @info: pointer to struct siginfo

 * @task: pointer to struct task_struct

 *

 * Current process sends a 'sig' signal to 'task' process with

 * 'info' siginfo. If 'info' is SEND_SIG_NOINFO or SEND_SIG_PRIV,

 * 'info' is not a pointer and you can't access its field. Instead,

 * SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV

 * means that si_code is SI_KERNEL.

 */

TRACE_EVENT(signal_generate,



	TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),



	TP_ARGS(sig, info, task),



	TP_STRUCT__entry(

		__field(	int,	sig			)

		__field(	int,	errno			)

		__field(	int,	code			)

		__array(	char,	comm,	TASK_COMM_LEN	)

		__field(	pid_t,	pid			)

	),



	TP_fast_assign(

		__entry->sig	= sig;

		TP_STORE_SIGINFO(__entry, info);

		memcpy(__entry->comm, task->comm, TASK_COMM_LEN);

		__entry->pid	= task->pid;

	),



	TP_printk("sig=%d errno=%d code=%d comm=%s pid=%d",

		  __entry->sig, __entry->errno, __entry->code,

		  __entry->comm, __entry->pid)

);



#endif /* _TRACE_SIGNAL_H */



/* This part must be outside protection */

#include <trace/define_trace.h>

kernel/signal.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,8 @@ 
#include <linux/freezer.h>

#include <linux/freezer.h>

#include <linux/pid_namespace.h>

#include <linux/pid_namespace.h>

#include <linux/nsproxy.h>

#include <linux/nsproxy.h>

#include <trace/events/sched.h>

#define CREATE_TRACE_POINTS

#include <trace/events/signal.h>





#include <asm/param.h>

#include <asm/param.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>
@@ -834,7 +835,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t, 
	struct sigqueue *q;

	struct sigqueue *q;

	int override_rlimit;

	int override_rlimit;





	trace_sched_signal_send(sig, t);

	trace_signal_generate(sig, info, t);





	assert_spin_locked(&t->sighand->siglock);

	assert_spin_locked(&t->sighand->siglock);