David: this needs to be merged. Acked-by: Mathieu Desnoyers <[email protected]>
Thanks, Mathieu ----- Original Message ----- > From: "Jérémie Galarneau" <[email protected]> > To: [email protected] > 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 <[email protected]> > --- > 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 > [email protected] > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
