projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't save log level in session configuration when unneeded
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
event.c
diff --git
a/src/bin/lttng-sessiond/event.c
b/src/bin/lttng-sessiond/event.c
index 099cbd18db8ea42d767951f094df5dfd81856fbe..243937908f11ffdc0bd50b79da7ec5ab1b6a8c1c 100644
(file)
--- a/
src/bin/lttng-sessiond/event.c
+++ b/
src/bin/lttng-sessiond/event.c
@@
-180,6
+180,7
@@
int event_kernel_disable_all(struct ltt_kernel_channel *kchan)
/*
* Enable kernel tracepoint event for a channel from the kernel session.
/*
* Enable kernel tracepoint event for a channel from the kernel session.
+ * We own filter_expression and filter.
*/
int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
struct lttng_event *event)
*/
int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
struct lttng_event *event)
@@
-407,6
+408,7
@@
error:
/*
* Enable UST tracepoint event for a channel from a UST session.
/*
* Enable UST tracepoint event for a channel from a UST session.
+ * We own filter_expression, filter, and exclusion.
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
*/
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
@@
-428,6
+430,10
@@
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
if (uevent == NULL) {
uevent = trace_ust_create_event(event, filter_expression,
filter, exclusion);
if (uevent == NULL) {
uevent = trace_ust_create_event(event, filter_expression,
filter, exclusion);
+ /* We have passed ownership */
+ filter_expression = NULL;
+ filter = NULL;
+ exclusion = NULL;
if (uevent == NULL) {
ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
if (uevent == NULL) {
ret = LTTNG_ERR_UST_ENABLE_FAIL;
goto error;
@@
-475,6
+481,9
@@
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
end:
rcu_read_unlock();
end:
rcu_read_unlock();
+ free(filter_expression);
+ free(filter);
+ free(exclusion);
return ret;
error:
return ret;
error:
@@
-490,6
+499,9
@@
error:
trace_ust_destroy_event(uevent);
}
rcu_read_unlock();
trace_ust_destroy_event(uevent);
}
rcu_read_unlock();
+ free(filter_expression);
+ free(filter);
+ free(exclusion);
return ret;
}
return ret;
}
@@
-620,7
+632,8
@@
error:
*/
int event_agent_enable_all(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
*/
int event_agent_enable_all(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ struct lttng_filter_bytecode *filter,
+ char *filter_expression)
{
int ret;
struct agent_event *aevent;
{
int ret;
struct agent_event *aevent;
@@
-631,7
+644,7
@@
int event_agent_enable_all(struct ltt_ust_session *usess,
DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
/* Enable event on agent application through TCP socket. */
DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
/* Enable event on agent application through TCP socket. */
- ret = event_agent_enable(usess, agt, event, filter);
+ ret = event_agent_enable(usess, agt, event, filter
, filter_expression
);
if (ret != LTTNG_OK) {
goto error;
}
if (ret != LTTNG_OK) {
goto error;
}
@@
-657,7
+670,8
@@
error:
*/
int event_agent_enable(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
*/
int event_agent_enable(struct ltt_ust_session *usess,
struct agent *agt, struct lttng_event *event,
- struct lttng_filter_bytecode *filter)
+ struct lttng_filter_bytecode *filter,
+ char *filter_expression)
{
int ret, created = 0;
struct agent_event *aevent;
{
int ret, created = 0;
struct agent_event *aevent;
This page took
0.049656 seconds
and
4
git commands to generate.