projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: empty indexes_ht before destroying it.
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-ust.c
diff --git
a/src/bin/lttng-sessiond/trace-ust.c
b/src/bin/lttng-sessiond/trace-ust.c
index 96225a21b4846e974ffb1f900c054202759e3b5a..d06edcba3aebccfbd7336dd1b91a4fa4ac1c1e05 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.c
+++ b/
src/bin/lttng-sessiond/trace-ust.c
@@
-336,6
+336,7
@@
error:
/*
* Allocate and initialize a ust event. Set name and event type.
/*
* Allocate and initialize a ust event. Set name and event type.
+ * We own filter_expression, filter, and exclusion.
*
* Return pointer to structure or NULL.
*/
*
* Return pointer to structure or NULL.
*/
@@
-393,6
+394,11
@@
struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
goto error_free_event;
}
ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
goto error_free_event;
}
+ /*
+ * Fix for enabler race. Enable is now done explicitly by
+ * sessiond after setting filter.
+ */
+ lue->attr.disabled = 1;
/* Same layout. */
lue->filter_expression = filter_expression;
/* Same layout. */
lue->filter_expression = filter_expression;
@@
-411,6
+417,9
@@
struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
error_free_event:
free(lue);
error:
error_free_event:
free(lue);
error:
+ free(filter_expression);
+ free(filter);
+ free(exclusion);
return NULL;
}
return NULL;
}
This page took
0.026743 seconds
and
4
git commands to generate.