projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skip internal events when saving a session configuration
[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 0efdc9253d59adc98da8508c8909b9a6d9e58f06..91a7a912d02a1dd4f62fe431a6daf5bed789219b 100644
(file)
--- a/
src/bin/lttng-sessiond/event.c
+++ b/
src/bin/lttng-sessiond/event.c
@@
-129,7
+129,8
@@
int event_kernel_disable_event_all(struct ltt_kernel_channel *kchan)
* We own filter_expression and filter.
*/
int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
* We own filter_expression and filter.
*/
int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
- struct lttng_event *event)
+ struct lttng_event *event, char *filter_expression,
+ struct lttng_filter_bytecode *filter)
{
int ret;
struct ltt_kernel_event *kevent;
{
int ret;
struct ltt_kernel_event *kevent;
@@
-137,10
+138,14
@@
int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
assert(kchan);
assert(event);
assert(kchan);
assert(event);
- kevent = trace_kernel_
get_event_by_name
(event->name, kchan,
- event->type);
+ kevent = trace_kernel_
find_event
(event->name, kchan,
+ event->type
, filter
);
if (kevent == NULL) {
if (kevent == NULL) {
- ret = kernel_create_event(event, kchan);
+ ret = kernel_create_event(event, kchan,
+ filter_expression, filter);
+ /* We have passed ownership */
+ filter_expression = NULL;
+ filter = NULL;
if (ret < 0) {
switch (-ret) {
case EEXIST:
if (ret < 0) {
switch (-ret) {
case EEXIST:
@@
-169,6
+174,8
@@
int event_kernel_enable_event(struct ltt_kernel_channel *kchan,
ret = LTTNG_OK;
end:
ret = LTTNG_OK;
end:
+ free(filter_expression);
+ free(filter);
return ret;
}
return ret;
}
@@
-236,7
+243,7
@@
int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
/* Create ust event */
uevent = trace_ust_create_event(&events[i], filter_expression,
/* Create ust event */
uevent = trace_ust_create_event(&events[i], filter_expression,
-
filter, NULL
);
+
filter, NULL, false
);
if (uevent == NULL) {
ret = LTTNG_ERR_FATAL;
goto error_destroy;
if (uevent == NULL) {
ret = LTTNG_ERR_FATAL;
goto error_destroy;
@@
-283,7
+290,8
@@
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct lttng_event *event,
char *filter_expression,
struct lttng_filter_bytecode *filter,
struct ltt_ust_channel *uchan, struct lttng_event *event,
char *filter_expression,
struct lttng_filter_bytecode *filter,
- struct lttng_event_exclusion *exclusion)
+ struct lttng_event_exclusion *exclusion,
+ bool internal_event)
{
int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
{
int ret = LTTNG_OK, to_create = 0;
struct ltt_ust_event *uevent;
@@
-298,7
+306,7
@@
int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
event->loglevel, exclusion);
if (uevent == NULL) {
uevent = trace_ust_create_event(event, filter_expression,
event->loglevel, exclusion);
if (uevent == NULL) {
uevent = trace_ust_create_event(event, filter_expression,
-
filter, exclusion
);
+
filter, exclusion, internal_event
);
/* We have passed ownership */
filter_expression = NULL;
filter = NULL;
/* We have passed ownership */
filter_expression = NULL;
filter = NULL;
@@
-612,7
+620,7
@@
const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
}
break;
case LTTNG_DOMAIN_PYTHON:
}
break;
case LTTNG_DOMAIN_PYTHON:
- default_event_name = DEFAULT_
USER_
PYTHON_EVENT_NAME;
+ default_event_name = DEFAULT_PYTHON_EVENT_NAME;
break;
default:
assert(0);
break;
default:
assert(0);
This page took
0.025866 seconds
and
4
git commands to generate.