X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=6fb328eb9ca0cfd991328d227445d1aa6fbdadca;hp=63b106ae43a2de504df24aff7e6a070000bb5045;hb=53a80697a772bc2e260e3dff006f910be6709f04;hpb=f37d259d342af1ff8855d9eaa578cb7a3cfcc4f2 diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 63b106ae4..6fb328eb9 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -32,6 +32,7 @@ #include "ust-consumer.h" #include "ust-ctl.h" #include "fd-limit.h" +#include "../../common/sessiond-comm/sessiond-comm.h" /* * Delete ust context safely. RCU read lock must be held before calling @@ -65,6 +66,7 @@ void delete_ust_app_event(int sock, struct ust_app_event *ua_event) assert(!ret); delete_ust_app_ctx(sock, ua_ctx); } + free(ua_event->filter); lttng_ht_destroy(ua_event->ctx); if (ua_event->obj != NULL) { @@ -430,6 +432,31 @@ error: return ret; } +/* + * Set the filter on the tracer. + */ +static +int set_ust_event_filter(struct ust_app_event *ua_event, + struct ust_app *app) +{ + int ret; + + if (!ua_event->filter) { + return 0; + } + + ret = ustctl_set_filter(app->sock, ua_event->filter, + ua_event->obj); + if (ret < 0) { + goto error; + } + + DBG2("UST filter set successfully for event %s", ua_event->name); + +error: + return ret; +} + /* * Disable the specified event on to UST tracer for the UST session. */ @@ -645,7 +672,7 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess, ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj, &ua_event->obj); if (ret < 0) { - if (ret == -EEXIST) { + if (ret == -EEXIST || ret == -EPERM) { ret = 0; goto error; } @@ -705,6 +732,16 @@ static void shadow_copy_event(struct ust_app_event *ua_event, /* Copy event attributes */ memcpy(&ua_event->attr, &uevent->attr, sizeof(ua_event->attr)); + /* Copy filter bytecode */ + if (uevent->filter) { + ua_event->filter = zmalloc(sizeof(*ua_event->filter) + + uevent->filter->len); + if (!ua_event->filter) { + return; + } + memcpy(ua_event->filter, uevent->filter, + sizeof(*ua_event->filter) + uevent->filter->len); + } cds_lfht_for_each_entry(uevent->ctx->ht, &iter.iter, uctx, node.node) { ua_ctx = alloc_ust_app_ctx(&uctx->ctx); if (ua_ctx == NULL) { @@ -797,8 +834,8 @@ static void shadow_copy_session(struct ust_app_session *ua_sess, ua_sess->uid = usess->uid; ua_sess->gid = usess->gid; - ret = snprintf(ua_sess->path, PATH_MAX, "%s/%s-%d-%s", usess->pathname, - app->name, app->pid, datetime); + ret = snprintf(ua_sess->path, PATH_MAX, "%s-%d-%s/", app->name, app->pid, + datetime); if (ret < 0) { PERROR("asprintf UST shadow copy session"); /* TODO: We cannot return an error from here.. */ @@ -997,6 +1034,35 @@ error: return ret; } +/* + * Set UST filter for the event on the tracer. + */ +static +int set_ust_app_event_filter(struct ust_app_session *ua_sess, + struct ust_app_event *ua_event, + struct lttng_filter_bytecode *bytecode, + struct ust_app *app) +{ + int ret = 0; + + DBG2("UST app adding context to event %s", ua_event->name); + + /* Copy filter bytecode */ + ua_event->filter = zmalloc(sizeof(*ua_event->filter) + bytecode->len); + if (!ua_event->filter) { + return -ENOMEM; + } + memcpy(ua_event->filter, bytecode, + sizeof(*ua_event->filter) + bytecode->len); + ret = set_ust_event_filter(ua_event, app); + if (ret < 0) { + goto error; + } + +error: + return ret; +} + /* * Enable on the tracer side a ust app event for the session and channel. */ @@ -1225,13 +1291,6 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess, goto error; } - ret = run_as_mkdir(ua_sess->path, S_IRWXU | S_IRWXG, - ua_sess->uid, ua_sess->gid); - if (ret < 0) { - PERROR("mkdir UST metadata"); - goto error; - } - ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/metadata", ua_sess->path); if (ret < 0) { @@ -1548,7 +1607,6 @@ int ust_app_list_event_fields(struct lttng_event_field **fields) goto rcu_error; } } - memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN); tmp[count].type = uiter.type; @@ -2100,9 +2158,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) /* Order is important */ cds_list_add_tail(&ustream->list, &ua_chan->streams.head); - ret = snprintf(ustream->pathname, PATH_MAX, "%s/%s_%u", - ua_sess->path, ua_chan->name, - ua_chan->streams.count++); + ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u", + ua_chan->name, ua_chan->streams.count++); if (ret < 0) { PERROR("asprintf UST create stream"); /* @@ -2111,8 +2168,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) */ continue; } - DBG2("UST stream %d ready at %s", ua_chan->streams.count, - ustream->pathname); + DBG2("UST stream %d ready (handle: %d)", ua_chan->streams.count, + ustream->handle); } } @@ -2129,7 +2186,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) } /* Setup UST consumer socket and send fds to it */ - ret = ust_consumer_send_session(consumerd_fd, ua_sess); + ret = ust_consumer_send_session(consumerd_fd, ua_sess, usess->consumer); if (ret < 0) { goto error_rcu_unlock; } @@ -2428,6 +2485,11 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) continue; } } + ret = set_ust_event_filter(ua_event, app); + if (ret < 0) { + /* FIXME: Should we quit here or continue... */ + continue; + } } } @@ -2549,6 +2611,63 @@ int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, return ret; } +/* + * Add context to a specific event in a channel for global UST domain. + */ +int ust_app_set_filter_event_glb(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, + struct lttng_filter_bytecode *bytecode) +{ + int ret = 0; + struct lttng_ht_node_str *ua_chan_node, *ua_event_node; + struct lttng_ht_iter iter, uiter; + struct ust_app_session *ua_sess; + struct ust_app_event *ua_event; + struct ust_app_channel *ua_chan = NULL; + struct ust_app *app; + + rcu_read_lock(); + + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } + ua_sess = lookup_session_by_app(usess, app); + if (ua_sess == NULL) { + continue; + } + + /* Lookup channel in the ust app session */ + lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter); + ua_chan_node = lttng_ht_iter_get_node_str(&uiter); + if (ua_chan_node == NULL) { + continue; + } + ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, + node); + + lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &uiter); + ua_event_node = lttng_ht_iter_get_node_str(&uiter); + if (ua_event_node == NULL) { + continue; + } + ua_event = caa_container_of(ua_event_node, struct ust_app_event, + node); + + ret = set_ust_app_event_filter(ua_sess, ua_event, bytecode, app); + if (ret < 0) { + continue; + } + } + + rcu_read_unlock(); + return ret; +} + /* * Enable event for a channel from a UST session for a specific PID. */