X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-app.c;h=6e25c5b3e13f907de0b08258c5ecb13dfe61cdf4;hp=7eb454a5e53222888e679a70a08f936f61deeacc;hb=3735745270b83fc911d8ee39c8437256b3af4e3d;hpb=36dc12ccfc6d008a6996a553c02c5823400c70b5 diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c index 7eb454a5e..6e25c5b3e 100644 --- a/lttng-sessiond/ust-app.c +++ b/lttng-sessiond/ust-app.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include @@ -29,57 +31,164 @@ #include "hashtable.h" #include "ust-app.h" -#include "../hashtable/hash.h" -#include "ust-ctl.h" #include "ust-consumer.h" +#include "ust-ctl.h" + +/* + * Delete ust app event safely. RCU read lock must be held before calling + * this function. + */ +static void delete_ust_app_event(int sock, struct ust_app_event *ua_event) +{ + /* TODO : remove context */ + //struct ust_app_ctx *ltctx; + //cds_lfht_for_each_entry(lte->ctx, &iter, ltctx, node) { + // delete_ust_app_ctx(sock, ltctx); + //} + + ustctl_release_object(sock, ua_event->obj); + free(ua_event); +} + +/* + * Delete ust app stream safely. RCU read lock must be held before calling + * this function. + */ +static void delete_ust_app_stream(int sock, struct ltt_ust_stream *stream) +{ + //TODO + //stream is used for passing to consumer. + //send_channel_streams is responsible for freeing the streams. + //note that this will not play well with flight recorder mode: + //we might need a criterion to discard the streams. +} /* - * Delete a traceable application structure from the global list. + * Delete ust app channel safely. RCU read lock must be held before calling + * this function. */ -static void delete_ust_app(struct ust_app *lta) +static void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan) { int ret; - struct cds_lfht_node *node; struct cds_lfht_iter iter; + struct ust_app_event *ua_event; + struct ltt_ust_stream *stream, *stmp; - rcu_read_lock(); + cds_list_for_each_entry_safe(stream, stmp, &ua_chan->streams.head, list) { + delete_ust_app_stream(sock, stream); + } - free(lta->sessions); - close(lta->key.sock); + /* TODO : remove channel context */ + //cds_lfht_for_each_entry(ltc->ctx, &iter, ltctx, node) { + // hashtable_del(ltc->ctx, &iter); + // delete_ust_app_ctx(sock, ltctx); + //} + //ret = hashtable_destroy(ltc->ctx); - /* Remove from apps hash table */ - node = hashtable_lookup(ust_app_ht, - (void *) ((unsigned long) lta->key.pid), sizeof(void *), &iter); - if (node == NULL) { - ERR("UST app pid %d not found in hash table", lta->key.pid); - } else { - ret = hashtable_del(ust_app_ht, &iter); - if (ret) { - ERR("UST app unable to delete app %d from hash table", - lta->key.pid); - } else { - DBG2("UST app pid %d deleted", lta->key.pid); - } + cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) { + hashtable_del(ua_chan->events, &iter); + delete_ust_app_event(sock, ua_event); + } + + ret = hashtable_destroy(ua_chan->events); + if (ret < 0) { + ERR("UST app destroy session hashtable failed"); + goto error; + } + +error: + return; +} + +/* + * Delete ust app session safely. RCU read lock must be held before calling + * this function. + */ +static void delete_ust_app_session(int sock, + struct ust_app_session *ua_sess) +{ + int ret; + struct cds_lfht_iter iter; + struct ust_app_channel *ua_chan; + + if (ua_sess->metadata) { + /* + * We do NOT release the stream object and metadata object since they + * are release when fds are sent to the consumer. + */ + } + + cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) { + hashtable_del(ua_sess->channels, &iter); + delete_ust_app_channel(sock, ua_chan); + } + + ret = hashtable_destroy(ua_sess->channels); + if (ret < 0) { + ERR("UST app destroy session hashtable failed"); + goto error; } +error: + return; +} + +/* + * Delete a traceable application structure from the global list. Never call + * this function outside of a call_rcu call. + */ +static void delete_ust_app(struct ust_app *app) +{ + int ret; + struct cds_lfht_node *node; + struct cds_lfht_iter iter; + struct ust_app_session *ua_sess; + + rcu_read_lock(); + /* Remove from key hash table */ node = hashtable_lookup(ust_app_sock_key_map, - (void *) ((unsigned long) lta->key.sock), sizeof(void *), &iter); + (void *) ((unsigned long) app->key.sock), sizeof(void *), &iter); if (node == NULL) { - ERR("UST app key %d not found in key hash table", lta->key.sock); + /* Not suppose to happen */ + ERR("UST app key %d not found in key hash table", app->key.sock); + goto end; + } + + ret = hashtable_del(ust_app_sock_key_map, &iter); + if (ret) { + ERR("UST app unable to delete app sock %d from key hash table", + app->key.sock); } else { - ret = hashtable_del(ust_app_sock_key_map, &iter); - if (ret) { - ERR("UST app unable to delete app sock %d from key hash table", - lta->key.sock); - } else { - DBG2("UST app pair sock %d key %d deleted", - lta->key.sock, lta->key.pid); - } + DBG2("UST app pair sock %d key %d deleted", + app->key.sock, app->key.pid); + } + + /* Socket is already closed at this point */ + + /* Delete ust app sessions info */ + if (app->sock_closed) { + app->key.sock = -1; + } + + cds_lfht_for_each_entry(app->sessions, &iter, ua_sess, node) { + hashtable_del(app->sessions, &iter); + delete_ust_app_session(app->key.sock, ua_sess); } - free(lta); + ret = hashtable_destroy(app->sessions); + if (ret < 0) { + ERR("UST app destroy session hashtable failed"); + goto end; + } + + if (!app->sock_closed) { + close(app->key.sock); + } + DBG2("UST app pid %d deleted", app->key.pid); + free(app); +end: rcu_read_unlock(); } @@ -97,7 +206,8 @@ static void delete_ust_app_rcu(struct rcu_head *head) } /* - * Find an ust_app using the sock and return it. + * Find an ust_app using the sock and return it. RCU read side lock must be + * held before calling this helper function. */ static struct ust_app *find_app_by_sock(int sock) { @@ -105,13 +215,10 @@ static struct ust_app *find_app_by_sock(int sock) struct ust_app_key *key; struct cds_lfht_iter iter; - rcu_read_lock(); - node = hashtable_lookup(ust_app_sock_key_map, (void *)((unsigned long) sock), sizeof(void *), &iter); if (node == NULL) { DBG2("UST app find by sock %d key not found", sock); - rcu_read_unlock(); goto error; } @@ -121,11 +228,8 @@ static struct ust_app *find_app_by_sock(int sock) (void *)((unsigned long) key->pid), sizeof(void *), &iter); if (node == NULL) { DBG2("UST app find by sock %d not found", sock); - rcu_read_unlock(); goto error; } - rcu_read_unlock(); - return caa_container_of(node, struct ust_app, node); error: @@ -152,7 +256,6 @@ struct ust_app *ust_app_find_by_pid(pid_t pid) node = hashtable_lookup(ust_app_ht, (void *)((unsigned long) pid), sizeof(void *), &iter); if (node == NULL) { - rcu_read_unlock(); DBG2("UST app no found with pid %d", pid); goto error; } @@ -163,6 +266,7 @@ struct ust_app *ust_app_find_by_pid(pid_t pid) return caa_container_of(node, struct ust_app, node); error: + rcu_read_unlock(); return NULL; } @@ -176,34 +280,32 @@ int ust_app_register(struct ust_register_msg *msg, int sock) { struct ust_app *lta; - lta = malloc(sizeof(struct ust_app)); + lta = zmalloc(sizeof(struct ust_app)); if (lta == NULL) { PERROR("malloc"); return -ENOMEM; } + lta->ppid = msg->ppid; lta->uid = msg->uid; lta->gid = msg->gid; - lta->key.pid = msg->pid; - lta->ppid = msg->ppid; lta->v_major = msg->major; lta->v_minor = msg->minor; - lta->key.sock = sock; strncpy(lta->name, msg->name, sizeof(lta->name)); lta->name[16] = '\0'; - hashtable_node_init(<a->node, (void *)((unsigned long)lta->key.pid), - sizeof(void *)); - - /* Session hashtable */ lta->sessions = hashtable_new(0); - /* Set sock key map */ + /* Set key map */ + lta->key.pid = msg->pid; + hashtable_node_init(<a->node, (void *)((unsigned long)lta->key.pid), + sizeof(void *)); + lta->key.sock = sock; hashtable_node_init(<a->key.node, (void *)((unsigned long)lta->key.sock), sizeof(void *)); rcu_read_lock(); - hashtable_add_unique(ust_app_ht, <a->node); hashtable_add_unique(ust_app_sock_key_map, <a->key.node); + hashtable_add_unique(ust_app_ht, <a->node); rcu_read_unlock(); DBG("App registered with pid:%d ppid:%d uid:%d gid:%d sock:%d name:%s" @@ -222,15 +324,35 @@ int ust_app_register(struct ust_register_msg *msg, int sock) void ust_app_unregister(int sock) { struct ust_app *lta; + struct cds_lfht_node *node; + struct cds_lfht_iter iter; - DBG2("UST app unregistering sock %d", sock); - + rcu_read_lock(); lta = find_app_by_sock(sock); - if (lta) { - DBG("PID %d unregistering with sock %d", lta->key.pid, sock); - /* FIXME: Better use a call_rcu here ? */ - delete_ust_app(lta); + if (lta == NULL) { + ERR("Unregister app sock %d not found!", sock); + goto error; + } + + DBG("PID %d unregistering with sock %d", lta->key.pid, sock); + + /* Get the node reference for a call_rcu */ + node = hashtable_lookup(ust_app_ht, + (void *)((unsigned long) lta->key.pid), sizeof(void *), &iter); + if (node == NULL) { + ERR("Unable to find app sock %d by pid %d", sock, lta->key.pid); + goto error; } + + /* We got called because the socket was closed on the remote end. */ + close(sock); + /* Using a flag because we still need "sock" as a key. */ + lta->sock_closed = 1; + hashtable_del(ust_app_ht, &iter); + call_rcu(&node->head, delete_ust_app_rcu); +error: + rcu_read_unlock(); + return; } /* @@ -247,6 +369,67 @@ unsigned long ust_app_list_count(void) return count; } +/* + * Fill events array with all events name of all registered apps. + */ +int ust_app_list_events(struct lttng_event **events) +{ + int ret, handle; + size_t nbmem, count = 0; + struct cds_lfht_iter iter; + struct ust_app *app; + struct lttng_event *tmp; + + nbmem = UST_APP_EVENT_LIST_SIZE; + tmp = zmalloc(nbmem * sizeof(struct lttng_event)); + if (tmp == NULL) { + PERROR("zmalloc ust app events"); + ret = -ENOMEM; + goto error; + } + + rcu_read_lock(); + + cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + handle = ustctl_tracepoint_list(app->key.sock); + if (handle < 0) { + ERR("UST app list events getting handle failed for app pid %d", + app->key.pid); + continue; + } + + while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle, + tmp[count].name)) != -ENOENT) { + if (count > nbmem) { + DBG2("Reallocating event list from %zu to %zu bytes", nbmem, + nbmem + UST_APP_EVENT_LIST_SIZE); + nbmem += UST_APP_EVENT_LIST_SIZE; + tmp = realloc(tmp, nbmem); + if (tmp == NULL) { + PERROR("realloc ust app events"); + ret = -ENOMEM; + goto rcu_error; + } + } + + tmp[count].type = LTTNG_UST_TRACEPOINT; + tmp[count].pid = app->key.pid; + tmp[count].enabled = -1; + count++; + } + } + + ret = count; + *events = tmp; + + DBG2("UST app list events done (%zu events)", count); + +rcu_error: + rcu_read_unlock(); +error: + return ret; +} + /* * Free and clean all traceable apps of the global list. */ @@ -255,20 +438,26 @@ void ust_app_clean_list(void) int ret; struct cds_lfht_node *node; struct cds_lfht_iter iter; + struct ust_app *app; - DBG2("UST app clean hash table"); + DBG2("UST app cleaning registered apps hash table"); rcu_read_lock(); - hashtable_get_first(ust_app_ht, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { + cds_lfht_for_each(ust_app_ht, &iter, node) { + app = caa_container_of(node, struct ust_app, node); + close(app->key.sock); + app->sock_closed = 1; + ret = hashtable_del(ust_app_ht, &iter); if (!ret) { call_rcu(&node->head, delete_ust_app_rcu); } - hashtable_get_next(ust_app_ht, &iter); } + hashtable_destroy(ust_app_ht); + hashtable_destroy(ust_app_sock_key_map); + rcu_read_unlock(); } @@ -284,21 +473,19 @@ void ust_app_ht_alloc(void) /* * Alloc new UST app session. */ -static struct ust_app_session *alloc_app_session(void) +static struct ust_app_session *alloc_ust_app_session(void) { struct ust_app_session *ua_sess; + /* Init most of the default value by allocating and zeroing */ ua_sess = zmalloc(sizeof(struct ust_app_session)); if (ua_sess == NULL) { PERROR("malloc"); goto error; } - ua_sess->enabled = 0; ua_sess->handle = -1; ua_sess->channels = hashtable_new_str(0); - ua_sess->metadata = NULL; - ua_sess->obj = NULL; return ua_sess; @@ -306,27 +493,38 @@ error: return NULL; } -static struct ust_app_channel *alloc_app_channel(char *name) +/* + * Alloc new UST app channel. + */ +static struct ust_app_channel *alloc_ust_app_channel(char *name, + struct lttng_ust_channel *attr) { struct ust_app_channel *ua_chan; + /* Init most of the default value by allocating and zeroing */ ua_chan = zmalloc(sizeof(struct ust_app_channel)); if (ua_chan == NULL) { PERROR("malloc"); goto error; } + /* Setup channel name */ strncpy(ua_chan->name, name, sizeof(ua_chan->name)); ua_chan->name[sizeof(ua_chan->name) - 1] = '\0'; - ua_chan->enabled = 0; + ua_chan->handle = -1; - ua_chan->obj = NULL; ua_chan->ctx = hashtable_new(0); - CDS_INIT_LIST_HEAD(&ua_chan->streams.head); ua_chan->events = hashtable_new_str(0); hashtable_node_init(&ua_chan->node, (void *) ua_chan->name, strlen(ua_chan->name)); + CDS_INIT_LIST_HEAD(&ua_chan->streams.head); + + /* Copy attributes */ + if (attr) { + memcpy(&ua_chan->attr, attr, sizeof(ua_chan->attr)); + } + DBG3("UST app channel %s allocated", ua_chan->name); return ua_chan; @@ -335,10 +533,15 @@ error: return NULL; } -static struct ust_app_event *alloc_app_event(char *name) +/* + * Alloc new UST app event. + */ +static struct ust_app_event *alloc_ust_app_event(char *name, + struct lttng_ust_event *attr) { struct ust_app_event *ua_event; + /* Init most of the default value by allocating and zeroing */ ua_event = zmalloc(sizeof(struct ust_app_event)); if (ua_event == NULL) { PERROR("malloc"); @@ -351,6 +554,11 @@ static struct ust_app_event *alloc_app_event(char *name) hashtable_node_init(&ua_event->node, (void *) ua_event->name, strlen(ua_event->name)); + /* Copy attributes */ + if (attr) { + memcpy(&ua_event->attr, attr, sizeof(ua_event->attr)); + } + DBG3("UST app event %s allocated", ua_event->name); return ua_event; @@ -359,7 +567,7 @@ error: return NULL; } -static void shallow_copy_event(struct ust_app_event *ua_event, +static void shadow_copy_event(struct ust_app_event *ua_event, struct ltt_ust_event *uevent) { strncpy(ua_event->name, uevent->attr.name, sizeof(ua_event->name)); @@ -368,7 +576,7 @@ static void shallow_copy_event(struct ust_app_event *ua_event, /* TODO: support copy context */ } -static void shallow_copy_channel(struct ust_app_channel *ua_chan, +static void shadow_copy_channel(struct ust_app_channel *ua_chan, struct ltt_ust_channel *uchan) { struct cds_lfht_iter iter; @@ -376,13 +584,14 @@ static void shallow_copy_channel(struct ust_app_channel *ua_chan, struct ltt_ust_event *uevent; struct ust_app_event *ua_event; - DBG2("Shallow copy of UST app channel %s", ua_chan->name); + DBG2("Shadow copy of UST app channel %s", ua_chan->name); strncpy(ua_chan->name, uchan->name, sizeof(ua_chan->name)); ua_chan->name[sizeof(ua_chan->name) - 1] = '\0'; /* TODO: support copy context */ + /* Copy all events from ltt ust channel to ust app channel */ hashtable_get_first(uchan->events, &iter); while ((node = hashtable_iter_get_node(&iter)) != NULL) { uevent = caa_container_of(node, struct ltt_ust_event, node); @@ -390,27 +599,25 @@ static void shallow_copy_channel(struct ust_app_channel *ua_chan, ua_event_node = hashtable_lookup(ua_chan->events, (void *) uevent->attr.name, strlen(uevent->attr.name), &iter); if (ua_event_node == NULL) { - DBG2("UST event %s not found on shallow copy channel", + DBG2("UST event %s not found on shadow copy channel", uevent->attr.name); - ua_event = alloc_app_event(uevent->attr.name); + ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr); if (ua_event == NULL) { - continue; + goto next; } + shadow_copy_event(ua_event, uevent); hashtable_add_unique(ua_chan->events, &ua_event->node); - } else { - ua_event = caa_container_of(node, struct ust_app_event, node); } - shallow_copy_event(ua_event, uevent); - +next: /* Get next UST events */ hashtable_get_next(uchan->events, &iter); } - DBG3("Shallow copy channel done"); + DBG3("Shadow copy channel done"); } -static void shallow_copy_session(struct ust_app_session *ua_sess, +static void shadow_copy_session(struct ust_app_session *ua_sess, struct ltt_ust_session *usess) { struct cds_lfht_node *node, *ua_chan_node; @@ -418,7 +625,7 @@ static void shallow_copy_session(struct ust_app_session *ua_sess, struct ltt_ust_channel *uchan; struct ust_app_channel *ua_chan; - DBG2("Shallow copy of session handle"); + DBG2("Shadow copy of session handle %d", ua_sess->handle); ua_sess->uid = usess->uid; @@ -430,27 +637,30 @@ static void shallow_copy_session(struct ust_app_session *ua_sess, uchan = caa_container_of(node, struct ltt_ust_channel, node); ua_chan_node = hashtable_lookup(ua_sess->channels, - (void *) uchan->name, strlen(uchan->name), &iter); + (void *)uchan->name, strlen(uchan->name), &iter); if (ua_chan_node == NULL) { - DBG2("Channel %s not found on shallow session copy, creating it", + DBG2("Channel %s not found on shadow session copy, creating it", uchan->name); - ua_chan = alloc_app_channel(uchan->name); + ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr); if (ua_chan == NULL) { /* malloc failed... continuing */ - continue; + goto next; } + + shadow_copy_channel(ua_chan, uchan); hashtable_add_unique(ua_sess->channels, &ua_chan->node); - } else { - ua_chan = caa_container_of(node, struct ust_app_channel, node); } - shallow_copy_channel(ua_chan, uchan); - +next: /* Next item in hash table */ hashtable_get_next(usess->domain_global.channels, &iter); } } +/* + * Return ust app session from the app session hashtable using the UST session + * uid. + */ static struct ust_app_session *lookup_session_by_app( struct ltt_ust_session *usess, struct ust_app *app) { @@ -459,8 +669,7 @@ static struct ust_app_session *lookup_session_by_app( /* Get right UST app session from app */ node = hashtable_lookup(app->sessions, - (void *) ((unsigned long) usess->uid), - sizeof(void *), &iter); + (void *) ((unsigned long) usess->uid), sizeof(void *), &iter); if (node == NULL) { goto error; } @@ -471,595 +680,540 @@ error: return NULL; } -int ust_app_add_channel(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan) +/* + * Create a UST session onto the tracer of app and add it the session + * hashtable. + * + * Return ust app session or NULL on error. + */ +static struct ust_app_session *create_ust_app_session( + struct ltt_ust_session *usess, struct ust_app *app) { - int ret = 0; - struct cds_lfht_iter iter; - struct cds_lfht_node *node, *ua_chan_node; - struct ust_app *app; + int ret; struct ust_app_session *ua_sess; - struct ust_app_channel *ua_chan; - - DBG2("UST app adding channel %s to global domain for session uid %d", - uchan->name, usess->uid); - - rcu_read_lock(); - hashtable_get_first(ust_app_ht, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - app = caa_container_of(node, struct ust_app, node); - ua_sess = lookup_session_by_app(usess, app); + ua_sess = lookup_session_by_app(usess, app); + if (ua_sess == NULL) { + DBG2("UST app pid: %d session uid %d not found, creating it", + app->key.pid, usess->uid); + ua_sess = alloc_ust_app_session(); if (ua_sess == NULL) { - DBG2("UST app pid: %d session uid %d not found, creating one", - app->key.pid, usess->uid); - ua_sess = alloc_app_session(); - if (ua_sess == NULL) { - /* Only malloc can failed so something is really wrong */ - goto next; - } - shallow_copy_session(ua_sess, usess); + /* Only malloc can failed so something is really wrong */ + goto error; } + shadow_copy_session(ua_sess, usess); + } - if (ua_sess->handle == -1) { - ret = ustctl_create_session(app->key.sock); - if (ret < 0) { - DBG("Error creating session for app pid %d, sock %d", - app->key.pid, app->key.sock); - /* TODO: free() ua_sess */ - goto next; - } + if (ua_sess->handle == -1) { + ret = ustctl_create_session(app->key.sock); + if (ret < 0) { + ERR("Error creating session for app pid %d, sock %d", + app->key.pid, app->key.sock); + /* TODO: free() ua_sess */ + goto error; + } - DBG2("UST app ustctl create session handle %d", ret); - ua_sess->handle = ret; + DBG2("UST app ustctl create session handle %d", ret); + ua_sess->handle = ret; - /* Add ust app session to app's HT */ - hashtable_node_init(&ua_sess->node, - (void *)((unsigned long) ua_sess->uid), sizeof(void *)); - hashtable_add_unique(app->sessions, &ua_sess->node); - } + /* Add ust app session to app's HT */ + hashtable_node_init(&ua_sess->node, + (void *)((unsigned long) ua_sess->uid), sizeof(void *)); + hashtable_add_unique(app->sessions, &ua_sess->node); - /* Lookup channel in the ust app session */ - ua_chan_node = hashtable_lookup(ua_sess->channels, - (void *) uchan->name, strlen(uchan->name), &iter); - if (ua_chan_node == NULL) { - ERR("Channel suppose to be present with the above shallow " - "session copy. Continuing..."); - goto next; - } + DBG2("UST app session created successfully with handle %d", ret); + } - ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); + return ua_sess; - /* TODO: remove cast and use lttng-ust-abi.h */ - ret = ustctl_create_channel(app->key.sock, ua_sess->handle, - (struct lttng_ust_channel_attr *)&uchan->attr, &ua_chan->obj); - if (ret < 0) { - DBG("Error creating channel %s for app (pid: %d, sock: %d) " - "and session handle %d with ret %d", - uchan->name, app->key.pid, app->key.sock, - ua_sess->handle, ret); - goto next; - } +error: + return NULL; +} - ua_chan->handle = ua_chan->obj->handle; - ua_chan->attr.shm_fd = ua_chan->obj->shm_fd; - ua_chan->attr.wait_fd = ua_chan->obj->wait_fd; - ua_chan->attr.memory_map_size = ua_chan->obj->memory_map_size; +/* + * Create the specified channel onto the UST tracer for a UST session. + */ +static int create_ust_channel(struct ust_app *app, + struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan) +{ + int ret; - DBG2("Channel %s UST create successfully for pid:%d and sock:%d", - uchan->name, app->key.pid, app->key.sock); + /* TODO: remove cast and use lttng-ust-abi.h */ + ret = ustctl_create_channel(app->key.sock, ua_sess->handle, + (struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj); + if (ret < 0) { + DBG("Error 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_sess->handle, ret); + goto error; + } -next: - /* Next applications */ - hashtable_get_next(ust_app_ht, &iter); + ua_chan->handle = ua_chan->obj->handle; + ua_chan->attr.shm_fd = ua_chan->obj->shm_fd; + ua_chan->attr.wait_fd = ua_chan->obj->wait_fd; + ua_chan->attr.memory_map_size = ua_chan->obj->memory_map_size; + + DBG2("UST app channel %s created successfully for pid:%d and sock:%d", + ua_chan->name, app->key.pid, app->key.sock); + +error: + return ret; +} + +/* + * Create the specified event onto the UST tracer for a UST session. + */ +static int create_ust_event(struct ust_app *app, + struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan, + struct ust_app_event *ua_event) +{ + int ret = 0; + + /* Create UST event on tracer */ + ret = ustctl_create_event(app->key.sock, &ua_event->attr, ua_chan->obj, + &ua_event->obj); + if (ret < 0) { + ERR("Error ustctl create event %s for app pid: %d with ret %d", + ua_event->attr.name, app->key.pid, ret); + goto error; } - rcu_read_unlock(); + ua_event->handle = ua_event->obj->handle; + ua_event->enabled = 1; + + DBG2("UST app event %s created successfully for pid:%d", + ua_event->attr.name, app->key.pid); + +error: return ret; } -int ust_app_add_event(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) +static struct ust_app_channel *create_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 *node, *ua_chan_node, *ua_event_node; - struct ust_app *app; - struct ust_app_session *ua_sess; + struct cds_lfht_node *ua_chan_node; struct ust_app_channel *ua_chan; - struct ust_app_event *ua_event; - struct lttng_ust_event ltt_uevent; - struct lttng_ust_object_data *obj_event; - DBG2("UST app adding event %s to global domain for session uid %d", - uevent->attr.name, usess->uid); + /* Lookup channel in the ust app session */ + 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); + ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr); + if (ua_chan == NULL) { + goto error; + } + shadow_copy_channel(ua_chan, uchan); - rcu_read_lock(); - hashtable_get_first(ust_app_ht, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - app = caa_container_of(node, struct ust_app, node); + hashtable_add_unique(ua_sess->channels, &ua_chan->node); + } else { + ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); + } - ua_sess = lookup_session_by_app(usess, app); - if (ua_sess == NULL) { - DBG2("UST app (pid: %d, sock: %d) session not found, creating one", - app->key.pid, app->key.sock); - ua_sess = alloc_app_session(); - if (ua_sess == NULL) { - /* Only malloc can failed so something is really wrong */ - goto next; - } - shallow_copy_session(ua_sess, usess); - } - - if (ua_sess->handle == -1) { - ret = ustctl_create_session(app->key.sock); - if (ret < 0) { - DBG("Error creating session for app pid %d, sock %d", - app->key.pid, app->key.sock); - /* TODO: free() ua_sess */ - goto next; - } - - DBG2("UST app ustctl create session handle %d", ret); - ua_sess->handle = ret; - /* Add ust app session to app's HT */ - hashtable_node_init(&ua_sess->node, - (void *)((unsigned long) ua_sess->uid), sizeof(void *)); - hashtable_add_unique(app->sessions, &ua_sess->node); - } - - /* Lookup channel in the ust app session */ - ua_chan_node = hashtable_lookup(ua_sess->channels, - (void *) uchan->name, strlen(uchan->name), &iter); - if (ua_chan_node == NULL) { - ERR("Channel suppose to be present with the above shallow " - "session copy. Continuing..."); - goto next; - } - - ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); + ret = create_ust_channel(app, ua_sess, ua_chan); + if (ret < 0) { + goto error; + } - /* Prepare lttng ust event */ - strncpy(ltt_uevent.name, uevent->attr.name, sizeof(ltt_uevent.name)); - ltt_uevent.name[sizeof(ltt_uevent.name) - 1] = '\0'; - /* TODO: adjust to other instrumentation types */ - ltt_uevent.instrumentation = LTTNG_UST_TRACEPOINT; + return ua_chan; - /* Get event node */ - ua_event_node = hashtable_lookup(ua_chan->events, - (void *) uevent->attr.name, strlen(uevent->attr.name), &iter); - if (ua_event_node == NULL) { - DBG2("UST app event %s not found, creating one", uevent->attr.name); - /* Does not exist so create one */ - ua_event = alloc_app_event(uevent->attr.name); - if (ua_event == NULL) { - /* Only malloc can failed so something is really wrong */ - goto next; - } +error: + return NULL; +} - shallow_copy_event(ua_event, uevent); +static struct ust_app_event *create_ust_app_event( + struct ust_app_session *ua_sess, struct ust_app_channel *ua_chan, + struct ltt_ust_event *uevent, struct ust_app *app) +{ + int ret; + struct cds_lfht_iter iter; + struct cds_lfht_node *ua_event_node; + struct ust_app_event *ua_event; - /* Create UST event on tracer */ - ret = ustctl_create_event(app->key.sock, <t_uevent, ua_chan->obj, - &obj_event); - if (ret < 0) { - ERR("Error ustctl create event %s for app pid: %d with ret %d", - uevent->attr.name, app->key.pid, ret); - /* TODO: free() ua_event and obj_event */ - goto next; - } - ua_event->obj = obj_event; - ua_event->handle = obj_event->handle; - ua_event->enabled = 1; - } else { - ua_event = caa_container_of(ua_event_node, - struct ust_app_event, node); - - if (ua_event->enabled == 0) { - ret = ustctl_enable(app->key.sock, ua_event->obj); - if (ret < 0) { - ERR("Error ustctl enable event %s for app " - "pid: %d with ret %d", uevent->attr.name, - app->key.pid, ret); - goto next; - } - ua_event->enabled = 1; - } + /* Get event node */ + ua_event_node = hashtable_lookup(ua_chan->events, + (void *)uevent->attr.name, strlen(uevent->attr.name), &iter); + if (ua_event_node == NULL) { + DBG2("UST app event %s not found, creating it", uevent->attr.name); + /* Does not exist so create one */ + ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr); + if (ua_event == NULL) { + /* Only malloc can failed so something is really wrong */ + goto error; } + shadow_copy_event(ua_event, uevent); hashtable_add_unique(ua_chan->events, &ua_event->node); + } else { + ua_event = caa_container_of(ua_event_node, struct ust_app_event, node); + } - DBG2("Event %s UST create successfully for pid:%d", uevent->attr.name, - app->key.pid); - -next: - /* Next applications */ - hashtable_get_next(ust_app_ht, &iter); + ret = create_ust_event(app, ua_sess, ua_chan, ua_event); + if (ret < 0) { + goto error; } - rcu_read_unlock(); - return ret; + return ua_event; + +error: + return NULL; } -int ust_app_start_trace(struct ltt_ust_session *usess) +static int create_ust_app_metadata(struct ust_app_session *ua_sess, + char *pathname, struct ust_app *app) { int ret = 0; - struct cds_lfht_iter iter; - struct cds_lfht_node *node, *ua_chan_node; - struct ust_app *app; - struct ust_app_session *ua_sess; - struct ust_app_channel *ua_chan; struct lttng_ust_channel_attr uattr; - struct ltt_ust_channel *uchan; - DBG("Starting all UST traces"); + if (ua_sess->metadata == NULL) { + /* Allocate UST metadata */ + ua_sess->metadata = trace_ust_create_metadata(pathname); + if (ua_sess->metadata == NULL) { + ERR("UST app session %d creating metadata failed", + ua_sess->handle); + goto error; + } - rcu_read_lock(); - hashtable_get_first(ust_app_ht, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - app = caa_container_of(node, struct ust_app, node); + 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; + uattr.switch_timer_interval = + ua_sess->metadata->attr.switch_timer_interval; + uattr.read_timer_interval = + ua_sess->metadata->attr.read_timer_interval; + uattr.output = ua_sess->metadata->attr.output; - ua_sess = lookup_session_by_app(usess, app); - if (ua_sess == NULL) { - /* Only malloc can failed so something is really wrong */ - goto next; + /* UST tracer metadata creation */ + ret = ustctl_open_metadata(app->key.sock, ua_sess->handle, &uattr, + &ua_sess->metadata->obj); + if (ret < 0) { + ERR("UST app open metadata failed for app pid:%d", + app->key.pid); + goto error; } - if (ua_sess->metadata == NULL) { - /* Allocate UST metadata */ - ua_sess->metadata = trace_ust_create_metadata(usess->pathname); - if (ua_sess->metadata == NULL) { - ERR("UST app session %d creating metadata failed", - ua_sess->handle); - goto next; - } - - 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; - uattr.switch_timer_interval = - ua_sess->metadata->attr.switch_timer_interval; - uattr.read_timer_interval = - ua_sess->metadata->attr.read_timer_interval; - uattr.output = ua_sess->metadata->attr.output; - - /* UST tracer metadata creation */ - ret = ustctl_open_metadata(app->key.sock, ua_sess->handle, &uattr, - &ua_sess->metadata->obj); - if (ret < 0) { - ERR("UST app open metadata failed for app pid:%d", - app->key.pid); - goto next; - } + DBG2("UST metadata opened for app pid %d", app->key.pid); + } - DBG2("UST metadata opened for app pid %d", app->key.pid); + /* Open UST metadata stream */ + if (ua_sess->metadata->stream_obj == NULL) { + ret = ustctl_create_stream(app->key.sock, ua_sess->metadata->obj, + &ua_sess->metadata->stream_obj); + if (ret < 0) { + ERR("UST create metadata stream failed"); + goto error; } - /* Open UST metadata stream */ - if (ua_sess->metadata->stream_obj == NULL) { - ret = ustctl_create_stream(app->key.sock, ua_sess->metadata->obj, - &ua_sess->metadata->stream_obj); - if (ret < 0) { - ERR("UST create metadata stream failed"); - goto next; - } + ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s-%d", + pathname, app->name, app->key.pid); + if (ret < 0) { + PERROR("asprintf UST create stream"); + goto error; + } - ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s", - usess->pathname, "metadata"); - if (ret < 0) { - PERROR("asprintf UST create stream"); - goto next; - } + ret = mkdir(ua_sess->metadata->pathname, S_IRWXU | S_IRWXG); + if (ret < 0) { + PERROR("mkdir UST metadata"); + goto error; + } - DBG2("UST metadata stream object created for app pid %d", - app->key.pid); + ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s-%d/metadata", + pathname, app->name, app->key.pid); + if (ret < 0) { + PERROR("asprintf UST create stream"); + goto error; } - /* For each channel */ - hashtable_get_first(usess->domain_global.channels, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - uchan = caa_container_of(node, struct ltt_ust_channel, node); - - /* Lookup channel in the ust app session */ - ua_chan_node = hashtable_lookup(ua_sess->channels, - (void *) uchan->name, strlen(uchan->name), &iter); - if (ua_chan_node == NULL) { - ERR("Channel suppose to be present with the above shallow " - "session copy. Continuing..."); - goto next; - } + DBG2("UST metadata stream object created for app pid %d", + app->key.pid); + } - ua_chan = caa_container_of(ua_chan_node, - struct ust_app_channel, node); + return 0; - for (;;) { - struct lttng_ust_object_data *obj; - struct ltt_ust_stream *ustream; +error: + return -1; +} - ret = ustctl_create_stream(app->key.sock, ua_chan->obj, - &obj); - if (ret < 0) { - /* Got all streams */ - goto next_chan; - } +/* + * Add channel to all ust app session. + */ +int ust_app_add_channel_all(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct cds_lfht_node *node; + struct ust_app *app; + struct ust_app_session *ua_sess; + struct ust_app_channel *ua_chan; - ustream = malloc(sizeof(*ustream)); - if (ustream == NULL) { - goto next_chan; - } - memset(ustream, 0, sizeof(struct ltt_ust_stream)); - ustream->obj = obj; - ustream->handle = ustream->obj->handle; - /* Order is important */ - cds_list_add_tail(&ustream->list, &ua_chan->streams.head); - ret = snprintf(ustream->pathname, PATH_MAX, "%s/%s_%u", - uchan->pathname, uchan->name, - ua_chan->streams.count++); - if (ret < 0) { - PERROR("asprintf UST create stream"); - goto next_chan; - } - } + if (usess == NULL || uchan == NULL) { + ERR("Adding UST global channel to NULL values"); + ret = -1; + goto error; + } -next_chan: - /* Next applications */ - hashtable_get_next(ua_sess->channels, &iter); - } + DBG2("UST app adding channel %s to global domain for session uid %d", + uchan->name, usess->uid); - /* Setup UST consumer socket and send fds to it */ - ret = ust_consumer_send_session(usess->consumer_fd, ua_sess); - if (ret < 0) { + rcu_read_lock(); + + /* For every UST applications registered */ + hashtable_get_first(ust_app_ht, &iter); + while ((node = hashtable_iter_get_node(&iter)) != NULL) { + app = caa_container_of(node, struct ust_app, node); + + /* Create session on the tracer side and add it to app session HT */ + ua_sess = create_ust_app_session(usess, app); + if (ua_sess == NULL) { goto next; } - /* This start the UST tracing */ - ret = ustctl_start_session(app->key.sock, ua_sess->handle); - if (ret < 0) { - ERR("Error starting tracing for app pid: %d", app->key.pid); + /* Create channel onto application */ + ua_chan = create_ust_app_channel(ua_sess, uchan, app); + if (ua_chan == NULL) { goto next; } - /* Quiescent wait after starting trace */ - ustctl_wait_quiescent(app->key.sock); next: /* Next applications */ hashtable_get_next(ust_app_ht, &iter); } rcu_read_unlock(); - return 0; +error: + return ret; } -void ust_app_global_update(struct ltt_ust_session *usess, int sock) +int ust_app_add_event_all(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) { int ret = 0; - int session_existed = 1; struct cds_lfht_iter iter; struct cds_lfht_node *node, *ua_chan_node; struct ust_app *app; struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; struct ust_app_event *ua_event; - struct lttng_ust_event ltt_uevent; - struct ltt_ust_channel *uchan; - struct lttng_ust_object_data *obj_event; - struct lttng_ust_channel_attr uattr; - DBG2("UST app global update for app sock %d for session uid %d", sock, - usess->uid); + DBG("UST app creating event %s for all apps for session uid %d", + uevent->attr.name, usess->uid); rcu_read_lock(); - app = find_app_by_sock(sock); - if (app == NULL) { - ERR("Failed to update app sock %d", sock); - goto error; - } - ua_sess = lookup_session_by_app(usess, app); - if (ua_sess == NULL) { - DBG2("UST app pid: %d session uid %d not found, creating one", - app->key.pid, usess->uid); - ua_sess = alloc_app_session(); - if (ua_sess == NULL) { - /* Only malloc can failed so something is really wrong */ - goto error; - } - shallow_copy_session(ua_sess, usess); - session_existed= 0; - } + /* For all registered applications */ + hashtable_get_first(ust_app_ht, &iter); + while ((node = hashtable_iter_get_node(&iter)) != NULL) { + app = caa_container_of(node, struct ust_app, node); - if (ua_sess->handle == -1) { - ret = ustctl_create_session(app->key.sock); - if (ret < 0) { - DBG("Error creating session for app pid %d, sock %d", - app->key.pid, app->key.sock); - /* TODO: free() ua_sess */ - goto error; + /* Create session on the tracer side and add it to app session HT */ + ua_sess = create_ust_app_session(usess, app); + if (ua_sess == NULL) { + goto next; } - DBG2("UST app ustctl create session handle %d", ret); - ua_sess->handle = ret; - - /* Add ust app session to app's HT */ - hashtable_node_init(&ua_sess->node, - (void *)((unsigned long) ua_sess->uid), sizeof(void *)); - hashtable_add_unique(app->sessions, &ua_sess->node); - } - - if (session_existed) { - goto error; - } - - /* Iterate over all channels */ - hashtable_get_first(usess->domain_global.channels, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - uchan = caa_container_of(node, struct ltt_ust_channel, node); - /* Lookup channel in the ust app session */ ua_chan_node = hashtable_lookup(ua_sess->channels, - (void *) uchan->name, strlen(uchan->name), &iter); + (void *)uchan->name, strlen(uchan->name), &iter); if (ua_chan_node == NULL) { - ERR("UST app channel not found for uchan %s", uchan->name); - goto next_chan; + ERR("Channel %s not found in session uid %d. Skipping", + uchan->name, usess->uid); + goto next; } - ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); - /* TODO: remove cast and use lttng-ust-abi.h */ - ret = ustctl_create_channel(app->key.sock, ua_sess->handle, - (struct lttng_ust_channel_attr *)&uchan->attr, &ua_chan->obj); - if (ret < 0) { - DBG("Error creating channel %s for app (pid: %d, sock: %d) " - "and session handle %d with ret %d", - uchan->name, app->key.pid, app->key.sock, - ua_sess->handle, ret); - goto next_chan; + ua_event = create_ust_app_event(ua_sess, ua_chan, uevent, app); + if (ua_event == NULL) { + goto next; } - ua_chan->handle = ua_chan->obj->handle; - ua_chan->attr.shm_fd = ua_chan->obj->shm_fd; - ua_chan->attr.wait_fd = ua_chan->obj->wait_fd; - ua_chan->attr.memory_map_size = ua_chan->obj->memory_map_size; - - DBG2("Channel %s UST create successfully for pid:%d and sock:%d", - uchan->name, app->key.pid, app->key.sock); +next: + /* Next applications */ + hashtable_get_next(ust_app_ht, &iter); + } + rcu_read_unlock(); - /* For each event(s) of that channel */ - hashtable_get_first(ua_chan->events, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - ua_event = caa_container_of(node, struct ust_app_event, node); + return ret; +} - /* Prepare lttng ust event */ - memset(<t_uevent, 0, sizeof(ltt_uevent)); - strncpy(ltt_uevent.name, ua_event->name, sizeof(ltt_uevent.name)); - ltt_uevent.name[sizeof(ltt_uevent.name) - 1] = '\0'; +int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct cds_lfht_node *node; + struct ust_app_session *ua_sess; + struct ust_app_channel *ua_chan; - /* TODO: adjust to other instrumentation types */ - ltt_uevent.instrumentation = LTTNG_UST_TRACEPOINT; + DBG("Starting tracing for ust app pid %d", app->key.pid); - /* Create UST event on tracer */ - ret = ustctl_create_event(app->key.sock, <t_uevent, ua_chan->obj, - &obj_event); - if (ret < 0) { - ERR("Error ustctl create event %s for app pid: %d with ret %d", - ua_event->name, app->key.pid, ret); - /* TODO: free() ua_event and obj_event */ - goto next_event; - } + rcu_read_lock(); - ua_event->obj = obj_event; - ua_event->handle = obj_event->handle; - ua_event->enabled = 1; + ua_sess = lookup_session_by_app(usess, app); + if (ua_sess == NULL) { + /* Only malloc can failed so something is really wrong */ + goto error_rcu_unlock; + } - DBG2("Event %s UST create successfully for pid:%d", - ua_event->name, app->key.pid); + ret = create_ust_app_metadata(ua_sess, usess->pathname, app); + if (ret < 0) { + goto error_rcu_unlock; + } -next_event: - hashtable_get_next(ua_chan->events, &iter); - } + /* For each channel */ + hashtable_get_first(ua_sess->channels, &iter); + while ((node = hashtable_iter_get_node(&iter)) != NULL) { + ua_chan = caa_container_of(node, struct ust_app_channel, node); - for (;;) { - struct lttng_ust_object_data *obj; + /* Create all streams */ + while (1) { struct ltt_ust_stream *ustream; - ret = ustctl_create_stream(app->key.sock, ua_chan->obj, &obj); - if (ret < 0) { - /* Got all streams */ - break; - } - ustream = zmalloc(sizeof(*ustream)); if (ustream == NULL) { PERROR("zmalloc ust stream"); - goto error; + goto error_rcu_unlock; } - ustream->obj = obj; + ret = ustctl_create_stream(app->key.sock, ua_chan->obj, + &ustream->obj); + if (ret < 0) { + /* Got all streams */ + break; + } ustream->handle = ustream->obj->handle; + /* Order is important */ cds_list_add_tail(&ustream->list, &ua_chan->streams.head); - - ret = snprintf(ustream->pathname, PATH_MAX, "%s/%s_%u", - uchan->pathname, uchan->name, ua_chan->streams.count++); + ret = snprintf(ustream->pathname, PATH_MAX, "%s/%s-%d/%s_%u", + usess->pathname, app->name, app->key.pid, + ua_chan->name, ua_chan->streams.count++); if (ret < 0) { PERROR("asprintf UST create stream"); - goto error; + continue; } + DBG2("UST stream %d ready at %s", ua_chan->streams.count, + ustream->pathname); } -next_chan: /* Next applications */ hashtable_get_next(ua_sess->channels, &iter); } - if (ua_sess->metadata == NULL) { - /* Allocate UST metadata */ - ua_sess->metadata = trace_ust_create_metadata(usess->pathname); - if (ua_sess->metadata == NULL) { - ERR("UST app session %d creating metadata failed", - ua_sess->handle); - goto error; - } + /* Setup UST consumer socket and send fds to it */ + ret = ust_consumer_send_session(usess->consumer_fd, ua_sess); + if (ret < 0) { + goto error_rcu_unlock; + } - 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; - uattr.switch_timer_interval = - ua_sess->metadata->attr.switch_timer_interval; - uattr.read_timer_interval = - ua_sess->metadata->attr.read_timer_interval; - uattr.output = ua_sess->metadata->attr.output; + /* This start the UST tracing */ + ret = ustctl_start_session(app->key.sock, ua_sess->handle); + if (ret < 0) { + ERR("Error starting tracing for app pid: %d", app->key.pid); + goto error_rcu_unlock; + } + rcu_read_unlock(); - /* UST tracer metadata creation */ - ret = ustctl_open_metadata(app->key.sock, ua_sess->handle, &uattr, - &ua_sess->metadata->obj); + /* Quiescent wait after starting trace */ + ustctl_wait_quiescent(app->key.sock); + + return 0; + +error_rcu_unlock: + rcu_read_unlock(); + return -1; +} + +int ust_app_start_trace_all(struct ltt_ust_session *usess) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct cds_lfht_node *node; + struct ust_app *app; + + DBG("Starting all UST traces"); + + rcu_read_lock(); + hashtable_get_first(ust_app_ht, &iter); + while ((node = hashtable_iter_get_node(&iter)) != NULL) { + app = caa_container_of(node, struct ust_app, node); + + ret = ust_app_start_trace(usess, app); if (ret < 0) { - ERR("UST app open metadata failed for app pid:%d", - app->key.pid); - goto error; + goto next; } - DBG2("UST metadata opened for app pid %d", app->key.pid); +next: + /* Next applications */ + hashtable_get_next(ust_app_ht, &iter); } + rcu_read_unlock(); - /* Open UST metadata stream */ - if (ua_sess->metadata->stream_obj == NULL) { - ret = ustctl_create_stream(app->key.sock, ua_sess->metadata->obj, - &ua_sess->metadata->stream_obj); - if (ret < 0) { - ERR("UST create metadata stream failed"); - goto error; - } + return 0; +} - ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, "%s/%s", - usess->pathname, "metadata"); - if (ret < 0) { - PERROR("asprintf UST create stream"); - goto error; - } +void ust_app_global_update(struct ltt_ust_session *usess, int sock) +{ + int ret = 0; + struct cds_lfht_iter iter; + struct ust_app *app; + struct ust_app_session *ua_sess; + struct ust_app_channel *ua_chan; + struct ust_app_event *ua_event; - DBG2("UST metadata stream object created for app pid %d", - app->key.pid); + if (usess == NULL) { + DBG2("No UST session on global update. Returning"); + goto error; } - if (usess->start_trace) { - /* Setup UST consumer socket and send fds to it */ - ret = ust_consumer_send_session(usess->consumer_fd, ua_sess); + DBG2("UST app global update for app sock %d for session uid %d", sock, + usess->uid); + + rcu_read_lock(); + + app = find_app_by_sock(sock); + if (app == NULL) { + ERR("Failed to update app sock %d", sock); + goto error; + } + + ua_sess = create_ust_app_session(usess, app); + if (ua_sess == NULL) { + goto error; + } + + /* + * We can iterate safely here over all UST app session sicne the create ust + * app session above made a shadow copy of the UST global domain from the + * ltt ust session. + */ + cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) { + ret = create_ust_channel(app, ua_sess, ua_chan); if (ret < 0) { - ERR("UST consumer send session failed"); - goto error; + /* FIXME: Should we quit here or continue... */ + continue; + } + + /* For each events */ + cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) { + ret = create_ust_event(app, ua_sess, ua_chan, ua_event); + if (ret < 0) { + /* FIXME: Should we quit here or continue... */ + continue; + } } + } - /* This start the UST tracing */ - ret = ustctl_start_session(app->key.sock, ua_sess->handle); + if (usess->start_trace) { + ret = ust_app_start_trace(usess, app); if (ret < 0) { - ERR("Error starting tracing for app pid: %d", app->key.pid); goto error; } - /* Quiescent wait after starting trace */ - ustctl_wait_quiescent(app->key.sock); - DBG2("UST trace started for app pid %d", app->key.pid); }