From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Wed, 24 May 2017 16:11:48 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-modules] Fix: update sched
 instrumentation for kernel 4.12
In-Reply-To: <1495568718-29003-1-git-send-email-mjeanson@efficios.com>
References: <1495568718-29003-1-git-send-email-mjeanson@efficios.com>
Message-ID: <417919179.24120.1495642308675.JavaMail.zimbra@efficios.com>

Merged into master, 2.10, 2.9, 2.8.

Thanks,

Mathieu

----- On May 23, 2017, at 9:45 PM, Michael Jeanson mjeanson at efficios.com wrote:

> See upstream commit b91473ff6e979c0028f02f90e40c844959c736d8
> 
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> instrumentation/events/lttng-module/sched.h | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/instrumentation/events/lttng-module/sched.h
> b/instrumentation/events/lttng-module/sched.h
> index e5066af..c68dd27 100644
> --- a/instrumentation/events/lttng-module/sched.h
> +++ b/instrumentation/events/lttng-module/sched.h
> @@ -540,7 +540,25 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
> )
> #endif
> 
> -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
> +/*
> + * Tracepoint for showing priority inheritance modifying a tasks
> + * priority.
> + */
> +LTTNG_TRACEPOINT_EVENT(sched_pi_setprio,
> +
> +	TP_PROTO(struct task_struct *tsk, struct task_struct *pi_task),
> +
> +	TP_ARGS(tsk, pi_task),
> +
> +	TP_FIELDS(
> +		ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
> +		ctf_integer(pid_t, tid, tsk->pid)
> +		ctf_integer(int, oldprio, tsk->prio - MAX_RT_PRIO)
> +		ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio -
> MAX_RT_PRIO)
> +	)
> +)
> +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
> /*
>  * Tracepoint for showing priority inheritance modifying a tasks
>  * priority.
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com