[lttng-dev] [PATCH lttng-tools] Fix: memory leak when UST events are enabled with exclusions

[lttng-dev] [PATCH lttng-tools] Fix: memory leak when UST events are enabled with exclusions

[David Goulet]

Merged!

On 31 Jan (22:38:51), Zifei Tong wrote:
> I have to apply this patch onto J?r?mie's one to bypass a double free
> error in unit test.
> 
> diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
> index 52b93e9..92f8771 100644
> --- a/tests/unit/test_ust_data.c
> +++ b/tests/unit/test_ust_data.c
> @@ -172,7 +172,6 @@ static void test_create_ust_event_exclusion(void)
>            event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
>            "Validate UST event and exclusion");
> 
> -       free(exclusion);
>         trace_ust_destroy_event(event);
>  }
> 
> --
> Best Regards,
> Zifei Tong
> 
> 
> On Fri, Jan 31, 2014 at 6:59 AM, Mathieu Desnoyers
> <mathieu.desnoyers at efficios.com> wrote:
> > David: this needs to be merged.
> >
> > Acked-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> >
> > Thanks,
> >
> > Mathieu
> >
> > ----- Original Message -----
> >> From: "J?r?mie Galarneau" <jeremie.galarneau@efficios.com>
> >> To: lttng-dev at lists.lttng.org
> >> Sent: Monday, January 20, 2014 12:51:12 PM
> >> Subject: [lttng-dev] [PATCH lttng-tools] Fix: memory leak when UST events     are enabled with exclusions
> >>
> >> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> >> ---
> >>  src/bin/lttng-sessiond/trace-ust.c | 1 +
> >>  src/bin/lttng-sessiond/trace-ust.h | 2 +-
> >>  2 files changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/src/bin/lttng-sessiond/trace-ust.c
> >> b/src/bin/lttng-sessiond/trace-ust.c
> >> index 70b3a91..c08246a 100644
> >> --- a/src/bin/lttng-sessiond/trace-ust.c
> >> +++ b/src/bin/lttng-sessiond/trace-ust.c
> >> @@ -504,6 +504,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
> >>
> >>       DBG2("Trace destroy UST event %s", event->attr.name);
> >>       free(event->filter);
> >> +     free(event->exclusion);
> >>       free(event);
> >>  }
> >>
> >> diff --git a/src/bin/lttng-sessiond/trace-ust.h
> >> b/src/bin/lttng-sessiond/trace-ust.h
> >> index f2f8c7e..07af0f1 100644
> >> --- a/src/bin/lttng-sessiond/trace-ust.h
> >> +++ b/src/bin/lttng-sessiond/trace-ust.h
> >> @@ -50,7 +50,7 @@ struct ltt_ust_event {
> >>       struct lttng_ust_event attr;
> >>       struct lttng_ht_node_str node;
> >>       struct lttng_ust_filter_bytecode *filter;
> >> -     const struct lttng_event_exclusion *exclusion;
> >> +     struct lttng_event_exclusion *exclusion;
> >>  };
> >>
> >>  /* UST channel */
> >> --
> >> 1.8.5.2
> >>
> >>
> >> _______________________________________________
> >> lttng-dev mailing list
> >> lttng-dev at lists.lttng.org
> >> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> >>
> >
> > --
> > Mathieu Desnoyers
> > EfficiOS Inc.
> > http://www.efficios.com
> >
> > _______________________________________________
> > lttng-dev mailing list
> > lttng-dev at lists.lttng.org
> > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20140204/645d6203/attachment-0001.pgp>

[lttng-dev] [PATCH lttng-tools] Fix: memory leak when UST events are enabled with exclusions

[David Goulet]

Merged!

On 20 Jan (12:51:12), J?r?mie Galarneau wrote:
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  src/bin/lttng-sessiond/trace-ust.c | 1 +
>  src/bin/lttng-sessiond/trace-ust.h | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
> index 70b3a91..c08246a 100644
> --- a/src/bin/lttng-sessiond/trace-ust.c
> +++ b/src/bin/lttng-sessiond/trace-ust.c
> @@ -504,6 +504,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
>  
>  	DBG2("Trace destroy UST event %s", event->attr.name);
>  	free(event->filter);
> +	free(event->exclusion);
>  	free(event);
>  }
>  
> diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
> index f2f8c7e..07af0f1 100644
> --- a/src/bin/lttng-sessiond/trace-ust.h
> +++ b/src/bin/lttng-sessiond/trace-ust.h
> @@ -50,7 +50,7 @@ struct ltt_ust_event {
>  	struct lttng_ust_event attr;
>  	struct lttng_ht_node_str node;
>  	struct lttng_ust_filter_bytecode *filter;
> -	const struct lttng_event_exclusion *exclusion;
> +	struct lttng_event_exclusion *exclusion;
>  };
>  
>  /* UST channel */
> -- 
> 1.8.5.2
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20140204/a48a5a2e/attachment.pgp>