From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Thu, 29 Sep 2011 20:39:11 -0400
Subject: [ltt-dev] [BABELTRACE PATCH] Pass stream pointer with callback
	caller	data
In-Reply-To: <1317139393-27971-1-git-send-email-julien.desfossez@polymtl.ca>
References: <1317139393-27971-1-git-send-email-julien.desfossez@polymtl.ca>
Message-ID: <20110930003911.GA18084@Krystal>

* Julien Desfossez (julien.desfossez at polymtl.ca) wrote:
> Signed-off-by: Julien Desfossez <julien.desfossez at polymtl.ca>

Merged, thanks!

Mathieu

> ---
>  converter/babeltrace-lib.c      |    1 +
>  include/babeltrace/babeltrace.h |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
> index d62565c..ac3bd7c 100644
> --- a/converter/babeltrace-lib.c
> +++ b/converter/babeltrace-lib.c
> @@ -505,6 +505,7 @@ void process_callbacks(struct babeltrace_iter *iter,
>  	struct bt_ctf_data ctf_data;
>  
>  	ctf_data.event = extract_ctf_stream_event(stream);
> +	ctf_data.stream = stream;
>  
>  	/* process all events callback first */
>  	if (iter->main_callbacks.callback) {
> diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
> index fe5881a..5fce0a6 100644
> --- a/include/babeltrace/babeltrace.h
> +++ b/include/babeltrace/babeltrace.h
> @@ -52,6 +52,7 @@ struct trace_collection_pos {
>  
>  struct bt_ctf_data {
>  	struct ctf_stream_event *event;
> +	struct ctf_stream *stream;
>  };
>  
>  /*
> -- 
> 1.7.6.3
> 

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com