X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=9321d278984186cce37591e0c5de99347bdf4073;hb=2b00d46244cab86f1186a7b00cdc660f24a26f72;hp=0f8664cc3c65fd29471c1ef78786ddde8ee0fca7;hpb=44760c20f4fc255b63894ca758cf2ee5f253220b;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 0f8664cc3..9321d2789 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -1323,7 +1324,7 @@ error: * Return allocated filter or NULL on error. */ static struct lttng_ust_filter_bytecode *create_ust_bytecode_from_bytecode( - const struct lttng_filter_bytecode *orig_f) + const struct lttng_bytecode *orig_f) { struct lttng_ust_filter_bytecode *filter = NULL; @@ -1334,7 +1335,7 @@ static struct lttng_ust_filter_bytecode *create_ust_bytecode_from_bytecode( goto error; } - assert(sizeof(struct lttng_filter_bytecode) == + assert(sizeof(struct lttng_bytecode) == sizeof(struct lttng_ust_filter_bytecode)); memcpy(filter, orig_f, sizeof(*filter) + orig_f->len); error: @@ -1393,7 +1394,7 @@ error: * Return an ust_app_event object or NULL on error. */ static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht, - const char *name, const struct lttng_filter_bytecode *filter, + const char *name, const struct lttng_bytecode *filter, int loglevel_value, const struct lttng_event_exclusion *exclusion) { @@ -1502,7 +1503,7 @@ error: * Set the filter on the tracer. */ static int set_ust_object_filter(struct ust_app *app, - const struct lttng_filter_bytecode *bytecode, + const struct lttng_bytecode *bytecode, struct lttng_ust_object_data *ust_object) { int ret; @@ -2111,7 +2112,7 @@ static void shadow_copy_event(struct ust_app_event *ua_event, /* Copy filter bytecode */ if (uevent->filter) { - ua_event->filter = lttng_filter_bytecode_copy(uevent->filter); + ua_event->filter = lttng_bytecode_copy(uevent->filter); /* Filter might be NULL here in case of ENONEM. */ }