All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Francis Deslauriers <francis.deslauriers@efficios.com>
Cc: lttng-dev <lttng-dev@lists.lttng.org>
Subject: Re: [PATCH lttng-modules] Fix: timers cputime_t arguments replaced by ull in kernel 4.11
Date: Tue, 7 Mar 2017 16:53:37 +0000 (UTC)	[thread overview]
Message-ID: <1576661145.31931.1488905617675.JavaMail.zimbra__14223.1271406219$1488905637$gmane$org@efficios.com> (raw)
In-Reply-To: <1488903719-26185-1-git-send-email-francis.deslauriers@efficios.com>

merged into master and stable-2.9, thanks!

Mathieu

----- On Mar 7, 2017, at 11:21 AM, Francis Deslauriers francis.deslauriers@efficios.com wrote:

> cputime_t was changed to ull in the kernel commit: 858cf3a
> 
> Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
> ---
> instrumentation/events/lttng-module/timer.h | 38 +++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
> 
> diff --git a/instrumentation/events/lttng-module/timer.h
> b/instrumentation/events/lttng-module/timer.h
> index 9c02c96..d62fd25 100644
> --- a/instrumentation/events/lttng-module/timer.h
> +++ b/instrumentation/events/lttng-module/timer.h
> @@ -248,6 +248,26 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(timer_hrtimer_class,
> hrtimer_cancel,
>  *		zero, otherwise it is started
>  * @expires:	the itimers expiry time
>  */
> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
> +LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
> +
> +	timer_itimer_state,
> +
> +	TP_PROTO(int which, const struct itimerval *const value,
> +		 unsigned long long expires),
> +
> +	TP_ARGS(which, value, expires),
> +
> +	TP_FIELDS(
> +		ctf_integer(int, which, which)
> +		ctf_integer(unsigned long long, expires, expires)
> +		ctf_integer(long, value_sec, value->it_value.tv_sec)
> +		ctf_integer(long, value_usec, value->it_value.tv_usec)
> +		ctf_integer(long, interval_sec, value->it_interval.tv_sec)
> +		ctf_integer(long, interval_usec, value->it_interval.tv_usec)
> +	)
> +)
> +#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
> LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
> 
> 	timer_itimer_state,
> @@ -266,6 +286,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
> 		ctf_integer(long, interval_usec, value->it_interval.tv_usec)
> 	)
> )
> +#endif /* #else (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
> 
> /**
>  * itimer_expire - called when itimer expires
> @@ -273,6 +294,22 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
>  * @pid:	pid of the process which owns the timer
>  * @now:	current time, used to calculate the latency of itimer
>  */
> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
> +LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
> +
> +	timer_itimer_expire,
> +
> +	TP_PROTO(int which, struct pid *pid, unsigned long long now),
> +
> +	TP_ARGS(which, pid, now),
> +
> +	TP_FIELDS(
> +		ctf_integer(int , which, which)
> +		ctf_integer(pid_t, pid, pid_nr(pid))
> +		ctf_integer(unsigned long long, now, now)
> +	)
> +)
> +#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
> LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
> 
> 	timer_itimer_expire,
> @@ -287,6 +324,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
> 		ctf_integer(cputime_t, now, now)
> 	)
> )
> +#endif /* #else (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
> 
> #endif /*  LTTNG_TRACE_TIMER_H */
> 
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

       reply	other threads:[~2017-03-07 16:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1488903719-26185-1-git-send-email-francis.deslauriers@efficios.com>
2017-03-07 16:53 ` Mathieu Desnoyers [this message]
2017-03-07 16:21 [PATCH lttng-modules] Fix: timers cputime_t arguments replaced by ull in kernel 4.11 Francis Deslauriers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='1576661145.31931.1488905617675.JavaMail.zimbra__14223.1271406219$1488905637$gmane$org@efficios.com' \
    --to=mathieu.desnoyers@efficios.com \
    --cc=francis.deslauriers@efficios.com \
    --cc=lttng-dev@lists.lttng.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.