X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=96f8eb0b3ead316c0defa96905ff40cfcccb3136;hp=39dd9ba36e004e448915239063a1ddcf34253671;hb=0f83395d5e0e927fdab025eae023e68e9021af26;hpb=69892bbba677a6695b216046d586e58bfa0f82c9 diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 39dd9ba36..96f8eb0b3 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -1,19 +1,18 @@ /* * Copyright (C) 2011 - David Goulet * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 - * of the License. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2 only, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _GNU_SOURCE @@ -28,7 +27,10 @@ #include #include +#include +#include "fd-limit.h" +#include "health.h" #include "ust-app.h" #include "ust-consumer.h" #include "ust-ctl.h" @@ -65,6 +67,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) { @@ -83,6 +86,7 @@ void delete_ust_app_stream(int sock, struct ltt_ust_stream *stream) { if (stream->obj) { ustctl_release_object(sock, stream->obj); + lttng_fd_put(LTTNG_FD_APPS, 2); free(stream->obj); } free(stream); @@ -126,6 +130,7 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan) if (ua_chan->obj != NULL) { ustctl_release_object(sock, ua_chan->obj); + lttng_fd_put(LTTNG_FD_APPS, 2); free(ua_chan->obj); } free(ua_chan); @@ -145,12 +150,15 @@ void delete_ust_app_session(int sock, struct ust_app_session *ua_sess) if (ua_sess->metadata) { if (ua_sess->metadata->stream_obj) { ustctl_release_object(sock, ua_sess->metadata->stream_obj); + lttng_fd_put(LTTNG_FD_APPS, 2); free(ua_sess->metadata->stream_obj); } if (ua_sess->metadata->obj) { ustctl_release_object(sock, ua_sess->metadata->obj); + lttng_fd_put(LTTNG_FD_APPS, 2); free(ua_sess->metadata->obj); } + trace_ust_destroy_metadata(ua_sess->metadata); } cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan, @@ -181,26 +189,38 @@ void delete_ust_app(struct ust_app *app) rcu_read_lock(); /* Delete ust app sessions info */ - sock = app->key.sock; - app->key.sock = -1; + sock = app->sock; + app->sock = -1; /* Wipe sessions */ cds_lfht_for_each_entry(app->sessions->ht, &iter.iter, ua_sess, node.node) { ret = lttng_ht_del(app->sessions, &iter); assert(!ret); - delete_ust_app_session(app->key.sock, ua_sess); + delete_ust_app_session(app->sock, ua_sess); } lttng_ht_destroy(app->sessions); /* - * Wait until we have removed the key from the sock hash table before - * closing this socket, otherwise an application could re-use the socket ID - * and race with the teardown, using the same hash table entry. + * Wait until we have deleted the application from the sock hash table + * before closing this socket, otherwise an application could re-use the + * socket ID and race with the teardown, using the same hash table entry. + * + * It's OK to leave the close in call_rcu. We want it to stay unique for + * all RCU readers that could run concurrently with unregister app, + * therefore we _need_ to only close that socket after a grace period. So + * it should stay in this RCU callback. + * + * This close() is a very important step of the synchronization model so + * every modification to this function must be carefully reviewed. */ - close(sock); + ret = close(sock); + if (ret) { + PERROR("close"); + } + lttng_fd_put(LTTNG_FD_APPS, 1); - DBG2("UST app pid %d deleted", app->key.pid); + DBG2("UST app pid %d deleted", app->pid); free(app); rcu_read_unlock(); @@ -215,9 +235,9 @@ void delete_ust_app_rcu(struct rcu_head *head) struct lttng_ht_node_ulong *node = caa_container_of(head, struct lttng_ht_node_ulong, head); struct ust_app *app = - caa_container_of(node, struct ust_app, node); + caa_container_of(node, struct ust_app, pid_n); - DBG3("Call RCU deleting app PID %d", app->key.pid); + DBG3("Call RCU deleting app PID %d", app->pid); delete_ust_app(app); } @@ -352,25 +372,16 @@ static struct ust_app *find_app_by_sock(int sock) { struct lttng_ht_node_ulong *node; - struct ust_app_key *key; struct lttng_ht_iter iter; - lttng_ht_lookup(ust_app_sock_key_map, (void *)((unsigned long) sock), - &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node == NULL) { - DBG2("UST app find by sock %d key not found", sock); - goto error; - } - key = caa_container_of(node, struct ust_app_key, node); - - lttng_ht_lookup(ust_app_ht, (void *)((unsigned long) key->pid), &iter); + lttng_ht_lookup(ust_app_ht_by_sock, (void *)((unsigned long) sock), &iter); node = lttng_ht_iter_get_node_ulong(&iter); if (node == NULL) { DBG2("UST app find by sock %d not found", sock); goto error; } - return caa_container_of(node, struct ust_app, node); + + return caa_container_of(node, struct ust_app, sock_n); error: return NULL; @@ -385,7 +396,9 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan, { int ret; - ret = ustctl_add_context(app->key.sock, &ua_ctx->ctx, + health_code_update(&health_thread_cmd); + + ret = ustctl_add_context(app->sock, &ua_ctx->ctx, ua_chan->obj, &ua_ctx->obj); if (ret < 0) { goto error; @@ -396,6 +409,7 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan, DBG2("UST app context created successfully for channel %s", ua_chan->name); error: + health_code_update(&health_thread_cmd); return ret; } @@ -408,7 +422,9 @@ int create_ust_event_context(struct ust_app_event *ua_event, { int ret; - ret = ustctl_add_context(app->key.sock, &ua_ctx->ctx, + health_code_update(&health_thread_cmd); + + ret = ustctl_add_context(app->sock, &ua_ctx->ctx, ua_event->obj, &ua_ctx->obj); if (ret < 0) { goto error; @@ -419,6 +435,36 @@ int create_ust_event_context(struct ust_app_event *ua_event, DBG2("UST app context created successfully for event %s", ua_event->name); error: + health_code_update(&health_thread_cmd); + 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; + + health_code_update(&health_thread_cmd); + + if (!ua_event->filter) { + ret = 0; + goto error; + } + + 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: + health_code_update(&health_thread_cmd); return ret; } @@ -430,18 +476,21 @@ static int disable_ust_event(struct ust_app *app, { int ret; - ret = ustctl_disable(app->key.sock, ua_event->obj); + health_code_update(&health_thread_cmd); + + ret = ustctl_disable(app->sock, ua_event->obj); if (ret < 0) { ERR("UST app event %s disable failed for app (pid: %d) " "and session handle %d with ret %d", - ua_event->attr.name, app->key.pid, ua_sess->handle, ret); + ua_event->attr.name, app->pid, ua_sess->handle, ret); goto error; } DBG2("UST app event %s disabled successfully for app (pid: %d)", - ua_event->attr.name, app->key.pid); + ua_event->attr.name, app->pid); error: + health_code_update(&health_thread_cmd); return ret; } @@ -453,18 +502,21 @@ static int disable_ust_channel(struct ust_app *app, { int ret; - ret = ustctl_disable(app->key.sock, ua_chan->obj); + health_code_update(&health_thread_cmd); + + ret = ustctl_disable(app->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); + ua_chan->name, app->pid, ua_sess->handle, ret); goto error; } DBG2("UST app channel %s disabled successfully for app (pid: %d)", - ua_chan->name, app->key.pid); + ua_chan->name, app->pid); error: + health_code_update(&health_thread_cmd); return ret; } @@ -476,20 +528,23 @@ static int enable_ust_channel(struct ust_app *app, { int ret; - ret = ustctl_enable(app->key.sock, ua_chan->obj); + health_code_update(&health_thread_cmd); + + ret = ustctl_enable(app->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); + ua_chan->name, app->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); + ua_chan->name, app->pid); error: + health_code_update(&health_thread_cmd); return ret; } @@ -501,18 +556,21 @@ static int enable_ust_event(struct ust_app *app, { int ret; - ret = ustctl_enable(app->key.sock, ua_event->obj); + health_code_update(&health_thread_cmd); + + ret = ustctl_enable(app->sock, ua_event->obj); if (ret < 0) { ERR("UST app event %s enable failed for app (pid: %d) " "and session handle %d with ret %d", - ua_event->attr.name, app->key.pid, ua_sess->handle, ret); + ua_event->attr.name, app->pid, ua_sess->handle, ret); goto error; } DBG2("UST app event %s enabled successfully for app (pid: %d)", - ua_event->attr.name, app->key.pid); + ua_event->attr.name, app->pid); error: + health_code_update(&health_thread_cmd); return ret; } @@ -525,6 +583,8 @@ static int open_ust_metadata(struct ust_app *app, int ret; struct lttng_ust_channel_attr uattr; + health_code_update(&health_thread_cmd); + uattr.overwrite = ua_sess->metadata->attr.overwrite; uattr.subbuf_size = ua_sess->metadata->attr.subbuf_size; uattr.num_subbuf = ua_sess->metadata->attr.num_subbuf; @@ -534,18 +594,25 @@ static int open_ust_metadata(struct ust_app *app, ua_sess->metadata->attr.read_timer_interval; uattr.output = ua_sess->metadata->attr.output; + /* We are going to receive 2 fds, we need to reserve them. */ + ret = lttng_fd_get(LTTNG_FD_APPS, 2); + if (ret < 0) { + ERR("Exhausted number of available FD upon metadata open"); + goto error; + } /* UST tracer metadata creation */ - ret = ustctl_open_metadata(app->key.sock, ua_sess->handle, &uattr, + ret = ustctl_open_metadata(app->sock, ua_sess->handle, &uattr, &ua_sess->metadata->obj); if (ret < 0) { ERR("UST app open metadata failed for app pid:%d with ret %d", - app->key.pid, ret); + app->pid, ret); goto error; } ua_sess->metadata->handle = ua_sess->metadata->obj->handle; error: + health_code_update(&health_thread_cmd); return ret; } @@ -557,7 +624,15 @@ static int create_ust_stream(struct ust_app *app, { int ret; - ret = ustctl_create_stream(app->key.sock, ua_sess->metadata->obj, + health_code_update(&health_thread_cmd); + + /* We are going to receive 2 fds, we need to reserve them. */ + ret = lttng_fd_get(LTTNG_FD_APPS, 2); + if (ret < 0) { + ERR("Exhausted number of available FD upon metadata stream create"); + goto error; + } + ret = ustctl_create_stream(app->sock, ua_sess->metadata->obj, &ua_sess->metadata->stream_obj); if (ret < 0) { ERR("UST create metadata stream failed"); @@ -565,6 +640,7 @@ static int create_ust_stream(struct ust_app *app, } error: + health_code_update(&health_thread_cmd); return ret; } @@ -576,21 +652,36 @@ static int create_ust_channel(struct ust_app *app, { int ret; + health_code_update(&health_thread_cmd); + /* TODO: remove cast and use lttng-ust-abi.h */ - ret = ustctl_create_channel(app->key.sock, ua_sess->handle, + + /* We are going to receive 2 fds, we need to reserve them. */ + ret = lttng_fd_get(LTTNG_FD_APPS, 2); + if (ret < 0) { + ERR("Exhausted number of available FD upon create channel"); + goto error; + } + + health_code_update(&health_thread_cmd); + + ret = ustctl_create_channel(app->sock, ua_sess->handle, (struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj); if (ret < 0) { ERR("Creating channel %s for app (pid: %d, sock: %d) " "and session handle %d with ret %d", - ua_chan->name, app->key.pid, app->key.sock, + ua_chan->name, app->pid, app->sock, ua_sess->handle, ret); + lttng_fd_put(LTTNG_FD_APPS, 2); goto error; } ua_chan->handle = ua_chan->obj->handle; DBG2("UST app channel %s created successfully for pid:%d and sock:%d", - ua_chan->name, app->key.pid, app->key.sock); + ua_chan->name, app->pid, app->sock); + + health_code_update(&health_thread_cmd); /* If channel is not enabled, disable it on the tracer */ if (!ua_chan->enabled) { @@ -601,6 +692,7 @@ static int create_ust_channel(struct ust_app *app, } error: + health_code_update(&health_thread_cmd); return ret; } @@ -613,23 +705,27 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess, { int ret = 0; + health_code_update(&health_thread_cmd); + /* Create UST event on tracer */ - ret = ustctl_create_event(app->key.sock, &ua_event->attr, ua_chan->obj, + 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; } ERR("Error ustctl create event %s for app pid: %d with ret %d", - ua_event->attr.name, app->key.pid, ret); + ua_event->attr.name, app->pid, ret); goto error; } ua_event->handle = ua_event->obj->handle; DBG2("UST app event %s created successfully for pid:%d", - ua_event->attr.name, app->key.pid); + ua_event->attr.name, app->pid); + + health_code_update(&health_thread_cmd); /* If event not enabled, disable it on the tracer */ if (ua_event->enabled == 0) { @@ -656,6 +752,7 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess, } error: + health_code_update(&health_thread_cmd); return ret; } @@ -677,6 +774,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) { @@ -769,8 +876,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->key.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.. */ @@ -849,10 +956,12 @@ static struct ust_app_session *create_ust_app_session( int ret; struct ust_app_session *ua_sess; + health_code_update(&health_thread_cmd); + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { DBG2("UST app pid: %d session id %d not found, creating it", - app->key.pid, usess->id); + app->pid, usess->id); ua_sess = alloc_ust_app_session(); if (ua_sess == NULL) { /* Only malloc can failed so something is really wrong */ @@ -861,11 +970,16 @@ static struct ust_app_session *create_ust_app_session( shadow_copy_session(ua_sess, usess, app); } + health_code_update(&health_thread_cmd); + if (ua_sess->handle == -1) { - ret = ustctl_create_session(app->key.sock); + ret = ustctl_create_session(app->sock); if (ret < 0) { - ERR("Creating session for app pid %d", app->key.pid); - goto error; + ERR("Creating session for app pid %d", app->pid); + delete_ust_app_session(-1, ua_sess); + /* This means that the tracer is gone... */ + ua_sess = (void*) -1UL; + goto end; } ua_sess->handle = ret; @@ -878,11 +992,8 @@ static struct ust_app_session *create_ust_app_session( } end: + health_code_update(&health_thread_cmd); return ua_sess; - -error: - delete_ust_app_session(-1, ua_sess); - return NULL; } /* @@ -967,6 +1078,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. */ @@ -1093,7 +1233,7 @@ static struct ust_app_channel *create_ust_app_channel( lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node); DBG2("UST app create channel %s for PID %d completed", ua_chan->name, - app->key.pid); + app->pid); end: return ua_chan; @@ -1144,7 +1284,7 @@ int create_ust_app_event(struct ust_app_session *ua_sess, lttng_ht_add_unique_str(ua_chan->events, &ua_event->node); DBG2("UST app create event %s for PID %d completed", ua_event->name, - app->key.pid); + app->pid); end: return ret; @@ -1185,7 +1325,7 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess, goto error; } - DBG2("UST metadata opened for app pid %d", app->key.pid); + DBG2("UST metadata opened for app pid %d", app->pid); } /* Open UST metadata stream */ @@ -1195,13 +1335,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) { @@ -1210,7 +1343,7 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess, } DBG2("UST metadata stream object created for app pid %d", - app->key.pid); + app->pid); } else { ERR("Attempting to create stream without metadata opened"); goto error; @@ -1249,7 +1382,7 @@ struct ust_app *ust_app_find_by_pid(pid_t pid) DBG2("Found UST app by pid %d", pid); - return caa_container_of(node, struct ust_app, node); + return caa_container_of(node, struct ust_app, pid_n); error: rcu_read_unlock(); @@ -1266,13 +1399,31 @@ error: int ust_app_register(struct ust_register_msg *msg, int sock) { struct ust_app *lta; + int ret; - if ((msg->bits_per_long == 64 && ust_consumerd64_fd == -EINVAL) - || (msg->bits_per_long == 32 && ust_consumerd32_fd == -EINVAL)) { + if ((msg->bits_per_long == 64 && + (uatomic_read(&ust_consumerd64_fd) == -EINVAL)) + || (msg->bits_per_long == 32 && + (uatomic_read(&ust_consumerd32_fd) == -EINVAL))) { ERR("Registration failed: application \"%s\" (pid: %d) has " "%d-bit long, but no consumerd for this long size is available.\n", msg->name, msg->pid, msg->bits_per_long); - close(sock); + ret = close(sock); + if (ret) { + PERROR("close"); + } + lttng_fd_put(LTTNG_FD_APPS, 1); + return -EINVAL; + } + if (msg->major != LTTNG_UST_COMM_MAJOR) { + ERR("Registration failed: application \"%s\" (pid: %d) has " + "communication protocol version %u.%u, but sessiond supports 2.x.\n", + msg->name, msg->pid, msg->major, msg->minor); + ret = close(sock); + if (ret) { + PERROR("close"); + } + lttng_fd_put(LTTNG_FD_APPS, 1); return -EINVAL; } lta = zmalloc(sizeof(struct ust_app)); @@ -1292,20 +1443,31 @@ int ust_app_register(struct ust_register_msg *msg, int sock) lta->name[16] = '\0'; lta->sessions = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); - /* Set key map */ - lta->key.pid = msg->pid; - lttng_ht_node_init_ulong(<a->node, (unsigned long)lta->key.pid); - lta->key.sock = sock; - lttng_ht_node_init_ulong(<a->key.node, (unsigned long)lta->key.sock); + lta->pid = msg->pid; + lttng_ht_node_init_ulong(<a->pid_n, (unsigned long)lta->pid); + lta->sock = sock; + lttng_ht_node_init_ulong(<a->sock_n, (unsigned long)lta->sock); rcu_read_lock(); - lttng_ht_add_unique_ulong(ust_app_sock_key_map, <a->key.node); - lttng_ht_add_unique_ulong(ust_app_ht, <a->node); + + /* + * On a re-registration, we want to kick out the previous registration of + * that pid + */ + lttng_ht_add_replace_ulong(ust_app_ht, <a->pid_n); + + /* + * The socket _should_ be unique until _we_ call close. So, a add_unique + * for the ust_app_ht_by_sock is used which asserts fail if the entry was + * already in the table. + */ + lttng_ht_add_unique_ulong(ust_app_ht_by_sock, <a->sock_n); + rcu_read_unlock(); DBG("App registered with pid:%d ppid:%d uid:%d gid:%d sock:%d name:%s" - " (version %d.%d)", lta->key.pid, lta->ppid, lta->uid, lta->gid, - lta->key.sock, lta->name, lta->v_major, lta->v_minor); + " (version %d.%d)", lta->pid, lta->ppid, lta->uid, lta->gid, + lta->sock, lta->name, lta->v_major, lta->v_minor); return 0; } @@ -1324,31 +1486,32 @@ void ust_app_unregister(int sock) int ret; rcu_read_lock(); - lta = find_app_by_sock(sock); - if (lta == NULL) { - ERR("Unregister app sock %d not found!", sock); - goto error; - } - - DBG("PID %d unregistering with sock %d", lta->key.pid, sock); - - /* Remove application from socket hash table */ - lttng_ht_lookup(ust_app_sock_key_map, (void *)((unsigned long) sock), &iter); - ret = lttng_ht_del(ust_app_sock_key_map, &iter); - assert(!ret); /* Get the node reference for a call_rcu */ - lttng_ht_lookup(ust_app_ht, (void *)((unsigned long) lta->key.pid), &iter); + lttng_ht_lookup(ust_app_ht_by_sock, (void *)((unsigned long) sock), &iter); node = lttng_ht_iter_get_node_ulong(&iter); if (node == NULL) { - ERR("Unable to find app sock %d by pid %d", sock, lta->key.pid); + ERR("Unable to find app by sock %d", sock); goto error; } + lta = caa_container_of(node, struct ust_app, sock_n); + + DBG("PID %d unregistering with sock %d", lta->pid, sock); + /* Remove application from PID hash table */ + ret = lttng_ht_del(ust_app_ht_by_sock, &iter); + assert(!ret); + + /* Assign second node for deletion */ + iter.iter.node = <a->pid_n.node; + ret = lttng_ht_del(ust_app_ht, &iter); assert(!ret); - call_rcu(&node->head, delete_ust_app_rcu); + + /* Free memory */ + call_rcu(<a->pid_n.head, delete_ust_app_rcu); + error: rcu_read_unlock(); return; @@ -1389,9 +1552,11 @@ int ust_app_list_events(struct lttng_event **events) rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { struct lttng_ust_tracepoint_iter uiter; + health_code_update(&health_thread_cmd); + if (!app->compatible) { /* * TODO: In time, we should notice the caller of this error by @@ -1399,31 +1564,34 @@ int ust_app_list_events(struct lttng_event **events) */ continue; } - handle = ustctl_tracepoint_list(app->key.sock); + handle = ustctl_tracepoint_list(app->sock); if (handle < 0) { ERR("UST app list events getting handle failed for app pid %d", - app->key.pid); + app->pid); continue; } - while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle, + while ((ret = ustctl_tracepoint_list_get(app->sock, handle, &uiter)) != -ENOENT) { + health_code_update(&health_thread_cmd); if (count >= nbmem) { + /* In case the realloc fails, we free the memory */ + void *tmp_ptr = (void *) tmp; DBG2("Reallocating event list from %zu to %zu entries", nbmem, 2 * nbmem); nbmem *= 2; tmp = realloc(tmp, nbmem * sizeof(struct lttng_event)); if (tmp == NULL) { PERROR("realloc ust app events"); + free(tmp_ptr); ret = -ENOMEM; goto rcu_error; } } memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN); - memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN); - tmp[count].loglevel_value = uiter.loglevel_value; - tmp[count].type = LTTNG_UST_TRACEPOINT; - tmp[count].pid = app->key.pid; + tmp[count].loglevel = uiter.loglevel; + tmp[count].type = (enum lttng_event_type) LTTNG_UST_TRACEPOINT; + tmp[count].pid = app->pid; tmp[count].enabled = -1; count++; } @@ -1437,6 +1605,90 @@ int ust_app_list_events(struct lttng_event **events) rcu_error: rcu_read_unlock(); error: + health_code_update(&health_thread_cmd); + return ret; +} + +/* + * Fill events array with all events name of all registered apps. + */ +int ust_app_list_event_fields(struct lttng_event_field **fields) +{ + int ret, handle; + size_t nbmem, count = 0; + struct lttng_ht_iter iter; + struct ust_app *app; + struct lttng_event_field *tmp; + + nbmem = UST_APP_EVENT_LIST_SIZE; + tmp = zmalloc(nbmem * sizeof(struct lttng_event_field)); + if (tmp == NULL) { + PERROR("zmalloc ust app event fields"); + ret = -ENOMEM; + goto error; + } + + rcu_read_lock(); + + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { + struct lttng_ust_field_iter uiter; + + health_code_update(&health_thread_cmd); + + if (!app->compatible) { + /* + * TODO: In time, we should notice the caller of this error by + * telling him that this is a version error. + */ + continue; + } + handle = ustctl_tracepoint_field_list(app->sock); + if (handle < 0) { + ERR("UST app list event fields getting handle failed for app pid %d", + app->pid); + continue; + } + + while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle, + &uiter)) != -ENOENT) { + health_code_update(&health_thread_cmd); + if (count >= nbmem) { + /* In case the realloc fails, we free the memory */ + void *tmp_ptr = (void *) tmp; + DBG2("Reallocating event field list from %zu to %zu entries", nbmem, + 2 * nbmem); + nbmem *= 2; + tmp = realloc(tmp, nbmem * sizeof(struct lttng_event_field)); + if (tmp == NULL) { + PERROR("realloc ust app event fields"); + free(tmp_ptr); + ret = -ENOMEM; + goto rcu_error; + } + } + + memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN); + tmp[count].type = uiter.type; + tmp[count].nowrite = uiter.nowrite; + + memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN); + tmp[count].event.loglevel = uiter.loglevel; + tmp[count].event.type = LTTNG_UST_TRACEPOINT; + tmp[count].event.pid = app->pid; + tmp[count].event.enabled = -1; + count++; + } + } + + ret = count; + *fields = tmp; + + DBG2("UST app list event fields done (%zu events)", count); + +rcu_error: + rcu_read_unlock(); +error: + health_code_update(&health_thread_cmd); return ret; } @@ -1446,27 +1698,29 @@ error: void ust_app_clean_list(void) { int ret; + struct ust_app *app; struct lttng_ht_iter iter; - struct lttng_ht_node_ulong *node; DBG2("UST app cleaning registered apps hash table"); rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, node, node) { + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { ret = lttng_ht_del(ust_app_ht, &iter); assert(!ret); - call_rcu(&node->head, delete_ust_app_rcu); + call_rcu(&app->pid_n.head, delete_ust_app_rcu); } - /* Destroy is done only when the ht is empty */ - lttng_ht_destroy(ust_app_ht); - cds_lfht_for_each_entry(ust_app_sock_key_map->ht, &iter.iter, node, node) { - ret = lttng_ht_del(ust_app_sock_key_map, &iter); + /* Cleanup socket hash table */ + cds_lfht_for_each_entry(ust_app_ht_by_sock->ht, &iter.iter, app, + sock_n.node) { + ret = lttng_ht_del(ust_app_ht_by_sock, &iter); assert(!ret); } + /* Destroy is done only when the ht is empty */ - lttng_ht_destroy(ust_app_sock_key_map); + lttng_ht_destroy(ust_app_ht); + lttng_ht_destroy(ust_app_ht_by_sock); rcu_read_unlock(); } @@ -1477,7 +1731,7 @@ void ust_app_clean_list(void) void ust_app_ht_alloc(void) { ust_app_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); - ust_app_sock_key_map = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); + ust_app_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); } /* @@ -1505,7 +1759,7 @@ int ust_app_disable_channel_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For every registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { struct lttng_ht_iter uiter; if (!app->compatible) { /* @@ -1566,7 +1820,7 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For every registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -1613,7 +1867,7 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For all registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -1632,7 +1886,7 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, ua_chan_node = lttng_ht_iter_get_node_str(&uiter); if (ua_chan_node == NULL) { DBG2("Channel %s not found in session id %d for app pid %d." - "Skipping", uchan->name, usess->id, app->key.pid); + "Skipping", uchan->name, usess->id, app->pid); continue; } ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); @@ -1641,7 +1895,7 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, ua_event_node = lttng_ht_iter_get_node_str(&uiter); if (ua_event_node == NULL) { DBG2("Event %s not found in channel %s for app pid %d." - "Skipping", uevent->attr.name, uchan->name, app->key.pid); + "Skipping", uevent->attr.name, uchan->name, app->pid); continue; } ua_event = caa_container_of(ua_event_node, struct ust_app_event, node); @@ -1679,7 +1933,7 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For all registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -1736,7 +1990,7 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For every registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -1751,8 +2005,11 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, */ ua_sess = create_ust_app_session(usess, app); if (ua_sess == NULL) { - /* Major problem here and it's maybe the tracer or malloc() */ + /* The malloc() failed. */ goto error; + } else if (ua_sess == (void *) -1UL) { + /* The application's socket is not valid. Contiuing */ + continue; } /* Create channel onto application */ @@ -1797,7 +2054,7 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For all registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -1821,7 +2078,7 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, ua_event_node = lttng_ht_iter_get_node_str(&uiter); if (ua_event_node == NULL) { DBG3("UST app enable event %s not found for app PID %d." - "Skipping app", uevent->attr.name, app->key.pid); + "Skipping app", uevent->attr.name, app->pid); continue; } ua_event = caa_container_of(ua_event_node, struct ust_app_event, node); @@ -1857,7 +2114,7 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); /* For all registered applications */ - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -1884,7 +2141,7 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, break; } DBG2("UST app event %s already exist on app PID %d", - uevent->attr.name, app->key.pid); + uevent->attr.name, app->pid); continue; } } @@ -1904,9 +2161,9 @@ 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; + struct consumer_socket *socket; - DBG("Starting tracing for ust app pid %d", app->key.pid); + DBG("Starting tracing for ust app pid %d", app->pid); rcu_read_lock(); @@ -1924,8 +2181,26 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) goto skip_setup; } + /* Create directories if consumer is LOCAL and has a path defined. */ + if (usess->consumer->type == CONSUMER_DST_LOCAL && + strlen(usess->consumer->dst.trace_path) > 0) { + ret = run_as_mkdir_recursive(usess->consumer->dst.trace_path, + S_IRWXU | S_IRWXG, usess->uid, usess->gid); + if (ret < 0) { + if (ret != -EEXIST) { + ERR("Trace directory creation error"); + ret = -1; + goto error_rcu_unlock; + } + } + } + + /* Indicate that the session has been started once */ + ua_sess->started = 1; + ret = create_ust_app_metadata(ua_sess, usess->pathname, app); if (ret < 0) { + ret = LTTNG_ERR_UST_META_FAIL; goto error_rcu_unlock; } @@ -1941,34 +2216,63 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) goto error_rcu_unlock; } - ret = ustctl_create_stream(app->key.sock, ua_chan->obj, + /* We are going to receive 2 fds, we need to reserve them. */ + ret = lttng_fd_get(LTTNG_FD_APPS, 2); + if (ret < 0) { + ERR("Exhausted number of available FD upon stream create"); + free(ustream); + goto error_rcu_unlock; + } + + health_code_update(&health_thread_cmd); + + ret = ustctl_create_stream(app->sock, ua_chan->obj, &ustream->obj); if (ret < 0) { /* Got all streams */ + lttng_fd_put(LTTNG_FD_APPS, 2); + free(ustream); + ret = LTTNG_ERR_UST_STREAM_FAIL; break; } ustream->handle = ustream->obj->handle; + health_code_update(&health_thread_cmd); + /* 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); + ua_chan->streams.count++; if (ret < 0) { PERROR("asprintf UST create stream"); + /* + * XXX what should we do here with the + * stream ? + */ 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); } + + health_code_update(&health_thread_cmd); } switch (app->bits_per_long) { case 64: - consumerd_fd = ust_consumerd64_fd; + socket = consumer_find_socket(uatomic_read(&ust_consumerd64_fd), + usess->consumer); + if (socket == NULL) { + goto skip_setup; + } break; case 32: - consumerd_fd = ust_consumerd32_fd; + socket = consumer_find_socket(uatomic_read(&ust_consumerd32_fd), + usess->consumer); + if (socket == NULL) { + goto skip_setup; + } break; default: ret = -EINVAL; @@ -1976,29 +2280,34 @@ 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(ua_sess, usess->consumer, socket); if (ret < 0) { goto error_rcu_unlock; } - ua_sess->started = 1; + + health_code_update(&health_thread_cmd); skip_setup: /* This start the UST tracing */ - ret = ustctl_start_session(app->key.sock, ua_sess->handle); + ret = ustctl_start_session(app->sock, ua_sess->handle); if (ret < 0) { - ERR("Error starting tracing for app pid: %d", app->key.pid); + ERR("Error starting tracing for app pid: %d", app->pid); goto error_rcu_unlock; } + health_code_update(&health_thread_cmd); + /* Quiescent wait after starting trace */ - ustctl_wait_quiescent(app->key.sock); + ustctl_wait_quiescent(app->sock); end: rcu_read_unlock(); + health_code_update(&health_thread_cmd); return 0; error_rcu_unlock: rcu_read_unlock(); + health_code_update(&health_thread_cmd); return -1; } @@ -2012,7 +2321,7 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app) struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; - DBG("Stopping tracing for ust app pid %d", app->key.pid); + DBG("Stopping tracing for ust app pid %d", app->pid); rcu_read_lock(); @@ -2026,48 +2335,59 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app) goto error_rcu_unlock; } - /* Not started, continuing. */ - if (ua_sess->started == 0) { - goto end; - } + /* + * If started = 0, it means that stop trace has been called for a session + * that was never started. This is a code flow error and should never + * happen. + */ + assert(ua_sess->started == 1); + + health_code_update(&health_thread_cmd); /* This inhibits UST tracing */ - ret = ustctl_stop_session(app->key.sock, ua_sess->handle); + ret = ustctl_stop_session(app->sock, ua_sess->handle); if (ret < 0) { - ERR("Error stopping tracing for app pid: %d", app->key.pid); + ERR("Error stopping tracing for app pid: %d", app->pid); goto error_rcu_unlock; } + health_code_update(&health_thread_cmd); + /* Quiescent wait after stopping trace */ - ustctl_wait_quiescent(app->key.sock); + ustctl_wait_quiescent(app->sock); + + health_code_update(&health_thread_cmd); /* Flushing buffers */ cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan, node.node) { - ret = ustctl_sock_flush_buffer(app->key.sock, ua_chan->obj); + health_code_update(&health_thread_cmd); + ret = ustctl_sock_flush_buffer(app->sock, ua_chan->obj); if (ret < 0) { ERR("UST app PID %d channel %s flush failed with ret %d", - app->key.pid, ua_chan->name, ret); + app->pid, ua_chan->name, ret); /* Continuing flushing all buffers */ continue; } } + health_code_update(&health_thread_cmd); + /* Flush all buffers before stopping */ - ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj); + ret = ustctl_sock_flush_buffer(app->sock, ua_sess->metadata->obj); if (ret < 0) { - ERR("UST app PID %d metadata flush failed with ret %d", app->key.pid, + ERR("UST app PID %d metadata flush failed with ret %d", app->pid, ret); } - ua_sess->started = 0; - end: rcu_read_unlock(); + health_code_update(&health_thread_cmd); return 0; error_rcu_unlock: rcu_read_unlock(); + health_code_update(&health_thread_cmd); return -1; } @@ -2082,7 +2402,7 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) struct lttng_ht_node_ulong *node; int ret; - DBG("Destroy tracing for ust app pid %d", app->key.pid); + DBG("Destroy tracing for ust app pid %d", app->pid); rcu_read_lock(); @@ -2103,19 +2423,23 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) obj.shm_fd = -1; obj.wait_fd = -1; obj.memory_map_size = 0; - ustctl_release_object(app->key.sock, &obj); + health_code_update(&health_thread_cmd); + ustctl_release_object(app->sock, &obj); - delete_ust_app_session(app->key.sock, ua_sess); + health_code_update(&health_thread_cmd); + delete_ust_app_session(app->sock, ua_sess); /* Quiescent wait after stopping trace */ - ustctl_wait_quiescent(app->key.sock); + ustctl_wait_quiescent(app->sock); end: rcu_read_unlock(); + health_code_update(&health_thread_cmd); return 0; error_rcu_unlock: rcu_read_unlock(); + health_code_update(&health_thread_cmd); return -1; } @@ -2132,7 +2456,7 @@ int ust_app_start_trace_all(struct ltt_ust_session *usess) rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { ret = ust_app_start_trace(usess, app); if (ret < 0) { /* Continue to next apps even on error */ @@ -2158,7 +2482,7 @@ int ust_app_stop_trace_all(struct ltt_ust_session *usess) rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { ret = ust_app_stop_trace(usess, app); if (ret < 0) { /* Continue to next apps even on error */ @@ -2184,7 +2508,7 @@ int ust_app_destroy_trace_all(struct ltt_ust_session *usess) rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) { ret = ust_app_destroy_trace(usess, app); if (ret < 0) { /* Continue to next apps even on error */ @@ -2276,6 +2600,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; + } } } @@ -2285,7 +2614,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) goto error; } - DBG2("UST trace started for app pid %d", app->key.pid); + DBG2("UST trace started for app pid %d", app->pid); } error: @@ -2308,7 +2637,7 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -2357,7 +2686,7 @@ int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -2397,6 +2726,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. */ @@ -2534,29 +2920,33 @@ int ust_app_validate_version(int sock) app = find_app_by_sock(sock); assert(app); + health_code_update(&health_thread_cmd); + ret = ustctl_tracer_version(sock, &app->version); if (ret < 0) { goto error; } /* Validate version */ - if (app->version.major > UST_APP_MAJOR_VERSION) { + if (app->version.major != UST_APP_MAJOR_VERSION) { goto error; } - DBG2("UST app PID %d is compatible with major version %d " - "(supporting <= %d)", app->key.pid, app->version.major, + DBG2("UST app PID %d is compatible with internal major version %d " + "(supporting == %d)", app->pid, app->version.major, UST_APP_MAJOR_VERSION); app->compatible = 1; rcu_read_unlock(); + health_code_update(&health_thread_cmd); return 0; error: - DBG2("UST app PID %d is not compatible with major version %d " - "(supporting <= %d)", app->key.pid, app->version.major, + DBG2("UST app PID %d is not compatible with internal major version %d " + "(supporting == %d)", app->pid, app->version.major, UST_APP_MAJOR_VERSION); app->compatible = 0; rcu_read_unlock(); + health_code_update(&health_thread_cmd); return -1; } @@ -2571,7 +2961,7 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) rcu_read_lock(); - cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, node.node) { + 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 @@ -2580,7 +2970,9 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) continue; } - ret = ustctl_calibrate(app->key.sock, calibrate); + health_code_update(&health_thread_cmd); + + ret = ustctl_calibrate(app->sock, calibrate); if (ret < 0) { switch (ret) { case -ENOSYS: @@ -2590,7 +2982,7 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) default: /* TODO: Report error to user */ DBG2("Calibrate app PID %d returned with error %d", - app->key.pid, ret); + app->pid, ret); break; } } @@ -2600,5 +2992,7 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) rcu_read_unlock(); + health_code_update(&health_thread_cmd); + return ret; }