X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-app.c;h=e5bd47c7d2770721148af4505223823aa14d5d78;hp=ab65f2b1576f2d20ccbdff0bc89e488f81bc2e91;hb=78f0bacd8f9b34beef70d79a4048ba9e1a718db8;hpb=88ff5b7f958a7bb60723d10ed97ceb79f9913167 diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c index ab65f2b15..e5bd47c7d 100644 --- a/lttng-sessiond/ust-app.c +++ b/lttng-sessiond/ust-app.c @@ -244,6 +244,56 @@ error: return NULL; } +/* + * Disable the specified channel on to UST tracer for the UST session. + */ +static int disable_ust_channel(struct ust_app *app, + struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan) +{ + int ret; + + ret = ustctl_disable(app->key.sock, ua_chan->obj); + if (ret < 0) { + ERR("UST app channel %s disable failed for app (pid: %d) " + "and session handle %d with ret %d", + ua_chan->name, app->key.pid, ua_sess->handle, ret); + goto error; + } + + ua_chan->enabled = 0; + + DBG2("UST app channel %s disabled successfully for app (pid: %d)", + ua_chan->name, app->key.pid); + +error: + return ret; +} + +/* + * Enable the specified channel on to UST tracer for the UST session. + */ +static int enable_ust_channel(struct ust_app *app, + struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan) +{ + int ret; + + ret = ustctl_enable(app->key.sock, ua_chan->obj); + if (ret < 0) { + ERR("UST app channel %s enable failed for app (pid: %d) " + "and session handle %d with ret %d", + ua_chan->name, app->key.pid, ua_sess->handle, ret); + goto error; + } + + ua_chan->enabled = 1; + + DBG2("UST app channel %s enabled successfully for app (pid: %d)", + ua_chan->name, app->key.pid); + +error: + return ret; +} + /* * Open metadata onto the UST tracer for a UST session. */ @@ -569,6 +619,9 @@ static void shadow_copy_session(struct ust_app_session *ua_sess, } } +/* + * Lookup sesison wrapper. + */ static void __lookup_session_by_app(struct ltt_ust_session *usess, struct ust_app *app, struct cds_lfht_iter *iter) @@ -651,6 +704,66 @@ error: return NULL; } +/* + * Lookup ust app channel for session and disable it on the tracer side. + */ +static int disable_ust_app_channel(struct ust_app_session *ua_sess, + struct ltt_ust_channel *uchan, struct ust_app *app) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct cds_lfht_node *ua_chan_node; + struct ust_app_channel *ua_chan; + + ua_chan_node = hashtable_lookup(ua_sess->channels, + (void *)uchan->name, strlen(uchan->name), &iter); + if (ua_chan_node == NULL) { + DBG2("Unable to find channel %s in ust session uid %u", + uchan->name, ua_sess->uid); + goto error; + } + + ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); + + ret = disable_ust_channel(app, ua_sess, ua_chan); + if (ret < 0) { + goto error; + } + +error: + return ret; +} + +/* + * Lookup ust app channel for session and enable it on the tracer side. + */ +static int enable_ust_app_channel(struct ust_app_session *ua_sess, + struct ltt_ust_channel *uchan, struct ust_app *app) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct cds_lfht_node *ua_chan_node; + struct ust_app_channel *ua_chan; + + ua_chan_node = hashtable_lookup(ua_sess->channels, + (void *)uchan->name, strlen(uchan->name), &iter); + if (ua_chan_node == NULL) { + DBG2("Unable to find channel %s in ust session uid %u", + uchan->name, ua_sess->uid); + goto error; + } + + ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); + + ret = enable_ust_channel(app, ua_sess, ua_chan); + if (ret < 0) { + goto error; + } + +error: + return ret; +} + /* * Create UST app channel and create it on the tracer. */ @@ -835,21 +948,14 @@ int ust_app_register(struct ust_register_msg *msg, int sock) { struct ust_app *lta; - /* - * Currently support only tracing of application which share the - * same bitness as the consumer. Eventually implement dispatch - * to specific compat32 consumer. - */ - if (msg->bits_per_long != CAA_BITS_PER_LONG) { + if ((msg->bits_per_long == 64 && ust_consumerd64_fd == -EINVAL) + || (msg->bits_per_long == 32 && ust_consumerd32_fd == -EINVAL)) { ERR("Registration failed: application \"%s\" (pid: %d) has " - "%d-bit long, but only " - "%d-bit lttng-consumerd is available.\n", - msg->name, msg->pid, msg->bits_per_long, - CAA_BITS_PER_LONG); + "%d-bit long, but no consumerd for this long size is available.\n", + msg->name, msg->pid, msg->bits_per_long); close(sock); return -EINVAL; } - lta = zmalloc(sizeof(struct ust_app)); if (lta == NULL) { PERROR("malloc"); @@ -859,6 +965,7 @@ int ust_app_register(struct ust_register_msg *msg, int sock) lta->ppid = msg->ppid; lta->uid = msg->uid; lta->gid = msg->gid; + lta->bits_per_long = msg->bits_per_long; lta->v_major = msg->major; lta->v_minor = msg->minor; strncpy(lta->name, msg->name, sizeof(lta->name)); @@ -1034,6 +1141,92 @@ void ust_app_ht_alloc(void) ust_app_sock_key_map = hashtable_new(0); } +/* + * For a specific UST session, disable the channel for all registered apps. + */ +int ust_app_disable_channel_all(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct ust_app *app; + struct ust_app_session *ua_sess; + + if (usess == NULL || uchan == NULL) { + ERR("Disabling UST global channel with NULL values"); + ret = -1; + goto error; + } + + DBG2("UST app disablling channel %s from global domain for session uid %d", + uchan->name, usess->uid); + + rcu_read_lock(); + + /* For every registered applications */ + cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + ua_sess = lookup_session_by_app(usess, app); + if (ua_sess == NULL) { + continue; + } + + /* Create channel onto application */ + ret = disable_ust_app_channel(ua_sess, uchan, app); + if (ret < 0) { + /* XXX: We might want to report this error at some point... */ + continue; + } + } + + rcu_read_unlock(); + +error: + return ret; +} + +/* + * For a specific UST session, enable the channel for all registered apps. + */ +int ust_app_enable_channel_all(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct ust_app *app; + struct ust_app_session *ua_sess; + + if (usess == NULL || uchan == NULL) { + ERR("Adding UST global channel to NULL values"); + ret = -1; + goto error; + } + + DBG2("UST app enabling channel %s to global domain for session uid %d", + uchan->name, usess->uid); + + rcu_read_lock(); + + /* For every registered applications */ + cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + ua_sess = lookup_session_by_app(usess, app); + if (ua_sess == NULL) { + continue; + } + + /* Enable channel onto application */ + ret = enable_ust_app_channel(ua_sess, uchan, app); + if (ret < 0) { + /* XXX: We might want to report this error at some point... */ + continue; + } + } + + rcu_read_unlock(); + +error: + return ret; +} + /* * For a specific UST session, create the channel for all registered apps. */ @@ -1140,6 +1333,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; struct ltt_ust_stream *ustream; + int consumerd_fd; DBG("Starting tracing for ust app pid %d", app->key.pid); @@ -1151,9 +1345,10 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) goto error_rcu_unlock; } - /* upon restart, we skip the setup, already done */ - if (ua_sess->started) + /* Upon restart, we skip the setup, already done */ + if (ua_sess->started) { goto skip_setup; + } ret = create_ust_app_metadata(ua_sess, usess->pathname, app); if (ret < 0) { @@ -1193,8 +1388,20 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) } } + switch (app->bits_per_long) { + case 64: + consumerd_fd = ust_consumerd64_fd; + break; + case 32: + consumerd_fd = ust_consumerd32_fd; + break; + default: + ret = -EINVAL; + goto error_rcu_unlock; + } + /* Setup UST consumer socket and send fds to it */ - ret = ust_consumer_send_session(ust_consumer_fd, ua_sess); + ret = ust_consumer_send_session(consumerd_fd, ua_sess); if (ret < 0) { goto error_rcu_unlock; }