X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=6430c83f705494749c5b64a33305be1569e6e551;hp=fc0d53787dd6a5d0ff2d8fe9faf5714bc2362951;hb=3a24c121f0901ebeb6f91c7424da21f11b05d6e2;hpb=911a481190c7af4c043bb5482152a76e9787c5b5 diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index fc0d53787..6430c83f7 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -36,6 +36,90 @@ #include "ust-consumer.h" #include "ust-ctl.h" +/* + * Match function for the hash table lookup. + * + * It matches an ust app event based on three attributes which are the event + * name, the filter bytecode and the loglevel. + */ +static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key) +{ + struct ust_app_event *event; + const struct ust_app_ht_key *key; + + assert(node); + assert(_key); + + event = caa_container_of(node, struct ust_app_event, node.node); + key = _key; + + /* Match the 3 elements of the key: name, filter and loglevel. */ + + /* Event name */ + if (strncmp(event->attr.name, key->name, sizeof(event->attr.name)) != 0) { + goto no_match; + } + + /* Event loglevel. */ + if (event->attr.loglevel != key->loglevel) { + if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL + && key->loglevel == 0 && event->attr.loglevel == -1) { + /* + * Match is accepted. This is because on event creation, the + * loglevel is set to -1 if the event loglevel type is ALL so 0 and + * -1 are accepted for this loglevel type since 0 is the one set by + * the API when receiving an enable event. + */ + } else { + goto no_match; + } + } + + /* One of the filters is NULL, fail. */ + if ((key->filter && !event->filter) || (!key->filter && event->filter)) { + goto no_match; + } + + if (key->filter && event->filter) { + /* Both filters exists, check length followed by the bytecode. */ + if (event->filter->len != key->filter->len || + memcmp(event->filter->data, key->filter->data, + event->filter->len) != 0) { + goto no_match; + } + } + + /* Match. */ + return 1; + +no_match: + return 0; +} + +/* + * Unique add of an ust app event in the given ht. This uses the custom + * ht_match_ust_app_event match function and the event name as hash. + */ +static void add_unique_ust_app_event(struct lttng_ht *ht, + struct ust_app_event *event) +{ + struct cds_lfht_node *node_ptr; + struct ust_app_ht_key key; + + assert(ht); + assert(ht->ht); + assert(event); + + key.name = event->attr.name; + key.filter = event->filter; + key.loglevel = event->attr.loglevel; + + node_ptr = cds_lfht_add_unique(ht->ht, + ht->hash_fct(event->node.key, lttng_ht_seed), + ht_match_ust_app_event, &key, &event->node.node); + assert(node_ptr == &event->node.node); +} + /* * Delete ust context safely. RCU read lock must be held before calling * this function. @@ -57,19 +141,7 @@ void delete_ust_app_ctx(int sock, struct ust_app_ctx *ua_ctx) static void delete_ust_app_event(int sock, struct ust_app_event *ua_event) { - int ret; - struct lttng_ht_iter iter; - struct ust_app_ctx *ua_ctx; - - /* Destroy each context of event */ - cds_lfht_for_each_entry(ua_event->ctx->ht, &iter.iter, ua_ctx, - node.node) { - ret = lttng_ht_del(ua_event->ctx, &iter); - assert(!ret); - delete_ust_app_ctx(sock, ua_ctx); - } free(ua_event->filter); - lttng_ht_destroy(ua_event->ctx); if (ua_event->obj != NULL) { ustctl_release_object(sock, ua_event->obj); @@ -184,8 +256,7 @@ static void delete_ust_app(struct ust_app *app) { int ret, sock; - struct lttng_ht_iter iter; - struct ust_app_session *ua_sess; + struct ust_app_session *ua_sess, *tmp_ua_sess; rcu_read_lock(); @@ -193,14 +264,14 @@ void delete_ust_app(struct ust_app *app) sock = app->sock; app->sock = -1; + lttng_ht_destroy(app->sessions); + /* 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->sock, ua_sess); + cds_list_for_each_entry_safe(ua_sess, tmp_ua_sess, &app->teardown_head, + teardown_node) { + /* Free every object in the session and the session. */ + delete_ust_app_session(sock, ua_sess); } - lttng_ht_destroy(app->sessions); /* * Wait until we have deleted the application from the sock hash table @@ -326,7 +397,6 @@ struct ust_app_event *alloc_ust_app_event(char *name, ua_event->enabled = 1; strncpy(ua_event->name, name, sizeof(ua_event->name)); ua_event->name[sizeof(ua_event->name) - 1] = '\0'; - ua_event->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG); lttng_ht_node_init_str(&ua_event->node, ua_event->name); /* Copy attributes */ @@ -365,6 +435,29 @@ error: return ua_ctx; } +/* + * Allocate a filter and copy the given original filter. + * + * Return allocated filter or NULL on error. + */ +static struct lttng_ust_filter_bytecode *alloc_copy_ust_app_filter( + struct lttng_ust_filter_bytecode *orig_f) +{ + struct lttng_ust_filter_bytecode *filter = NULL; + + /* Copy filter bytecode */ + filter = zmalloc(sizeof(*filter) + orig_f->len); + if (!filter) { + PERROR("zmalloc alloc ust app filter"); + goto error; + } + + memcpy(filter, orig_f, sizeof(*filter) + orig_f->len); + +error: + return filter; +} + /* * Find an ust_app using the sock and return it. RCU read side lock must be * held before calling this helper function. @@ -389,36 +482,46 @@ error: } /* - * Create the channel context on the tracer. + * Lookup for an ust app event based on event name, filter bytecode and the + * event loglevel. + * + * Return an ust_app_event object or NULL on error. */ -static -int create_ust_channel_context(struct ust_app_channel *ua_chan, - struct ust_app_ctx *ua_ctx, struct ust_app *app) +static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht, + char *name, struct lttng_ust_filter_bytecode *filter, int loglevel) { - int ret; - - 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; + struct lttng_ht_iter iter; + struct lttng_ht_node_str *node; + struct ust_app_event *event = NULL; + struct ust_app_ht_key key; + + assert(name); + assert(ht); + + /* Setup key for event lookup. */ + key.name = name; + key.filter = filter; + key.loglevel = loglevel; + + /* Lookup using the event name as hash and a custom match fct. */ + cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed), + ht_match_ust_app_event, &key, &iter.iter); + node = lttng_ht_iter_get_node_str(&iter); + if (node == NULL) { + goto end; } - ua_ctx->handle = ua_ctx->obj->handle; - - DBG2("UST app context created successfully for channel %s", ua_chan->name); + event = caa_container_of(node, struct ust_app_event, node); -error: - health_code_update(&health_thread_cmd); - return ret; +end: + return event; } /* - * Create the event context on the tracer. + * Create the channel context on the tracer. */ static -int create_ust_event_context(struct ust_app_event *ua_event, +int create_ust_channel_context(struct ust_app_channel *ua_chan, struct ust_app_ctx *ua_ctx, struct ust_app *app) { int ret; @@ -426,14 +529,14 @@ int create_ust_event_context(struct ust_app_event *ua_event, health_code_update(&health_thread_cmd); ret = ustctl_add_context(app->sock, &ua_ctx->ctx, - ua_event->obj, &ua_ctx->obj); + ua_chan->obj, &ua_ctx->obj); if (ret < 0) { goto error; } ua_ctx->handle = ua_ctx->obj->handle; - DBG2("UST app context created successfully for event %s", ua_event->name); + DBG2("UST app context created successfully for channel %s", ua_chan->name); error: health_code_update(&health_thread_cmd); @@ -724,6 +827,14 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess, health_code_update(&health_thread_cmd); + /* Set filter if one is present. */ + if (ua_event->filter) { + ret = set_ust_event_filter(ua_event, app); + if (ret < 0) { + goto error; + } + } + /* If event not enabled, disable it on the tracer */ if (ua_event->enabled == 0) { ret = disable_ust_event(app, ua_sess, ua_event); @@ -734,10 +845,10 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess, * just created it. */ switch (ret) { - case -EPERM: + case -LTTNG_UST_ERR_PERM: /* Code flow problem */ assert(0); - case -EEXIST: + case -LTTNG_UST_ERR_EXIST: /* It's OK for our use case. */ ret = 0; break; @@ -759,10 +870,6 @@ error: static void shadow_copy_event(struct ust_app_event *ua_event, struct ltt_ust_event *uevent) { - struct lttng_ht_iter iter; - struct ltt_ust_context *uctx; - struct ust_app_ctx *ua_ctx; - strncpy(ua_event->name, uevent->attr.name, sizeof(ua_event->name)); ua_event->name[sizeof(ua_event->name) - 1] = '\0'; @@ -773,24 +880,8 @@ static void shadow_copy_event(struct ust_app_event *ua_event, /* 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) { - /* malloc() failed. We should simply stop */ - return; - } - - lttng_ht_node_init_ulong(&ua_ctx->node, - (unsigned long) ua_ctx->ctx.ctx); - lttng_ht_add_unique_ulong(ua_event->ctx, &ua_ctx->node); + ua_event->filter = alloc_copy_ust_app_filter(uevent->filter); + /* Filter might be NULL here in case of ENONEM. */ } } @@ -801,7 +892,6 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan, struct ltt_ust_channel *uchan) { struct lttng_ht_iter iter; - struct lttng_ht_node_str *ua_event_node; struct ltt_ust_event *uevent; struct ltt_ust_context *uctx; struct ust_app_event *ua_event; @@ -828,11 +918,9 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan, /* Copy all events from ltt ust channel to ust app channel */ cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) { - struct lttng_ht_iter uiter; - - 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) { + ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name, + uevent->filter, uevent->attr.loglevel); + if (ua_event == NULL) { DBG2("UST event %s not found on shadow copy channel", uevent->attr.name); ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr); @@ -840,7 +928,7 @@ static void shadow_copy_channel(struct ust_app_channel *ua_chan, continue; } shadow_copy_event(ua_event, uevent); - lttng_ht_add_unique_str(ua_chan->events, &ua_event->node); + add_unique_ust_app_event(ua_chan->events, ua_event); } } @@ -950,7 +1038,6 @@ error: static struct ust_app_session *create_ust_app_session( struct ltt_ust_session *usess, struct ust_app *app) { - int ret; struct ust_app_session *ua_sess; health_code_update(&health_thread_cmd); @@ -970,6 +1057,8 @@ static struct ust_app_session *create_ust_app_session( health_code_update(&health_thread_cmd); if (ua_sess->handle == -1) { + int ret; + ret = ustctl_create_session(app->sock); if (ret < 0) { ERR("Creating session for app pid %d", app->pid); @@ -1034,76 +1123,6 @@ error: return ret; } -/* - * Create an UST context and enable it for the event on the tracer. - */ -static -int create_ust_app_event_context(struct ust_app_session *ua_sess, - struct ust_app_event *ua_event, struct lttng_ust_context *uctx, - struct ust_app *app) -{ - int ret = 0; - struct lttng_ht_iter iter; - struct lttng_ht_node_ulong *node; - struct ust_app_ctx *ua_ctx; - - DBG2("UST app adding context to event %s", ua_event->name); - - lttng_ht_lookup(ua_event->ctx, (void *)((unsigned long)uctx->ctx), &iter); - node = lttng_ht_iter_get_node_ulong(&iter); - if (node != NULL) { - ret = -EEXIST; - goto error; - } - - ua_ctx = alloc_ust_app_ctx(uctx); - if (ua_ctx == NULL) { - /* malloc failed */ - ret = -1; - goto error; - } - - lttng_ht_node_init_ulong(&ua_ctx->node, (unsigned long) ua_ctx->ctx.ctx); - lttng_ht_add_unique_ulong(ua_event->ctx, &ua_ctx->node); - - ret = create_ust_event_context(ua_event, ua_ctx, app); - if (ret < 0) { - goto error; - } - -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. */ @@ -1194,11 +1213,12 @@ error: } /* - * Create UST app channel and create it on the tracer. + * Create UST app channel and create it on the tracer. Set ua_chanp of the + * newly created channel if not NULL. */ -static struct ust_app_channel *create_ust_app_channel( - struct ust_app_session *ua_sess, struct ltt_ust_channel *uchan, - struct ust_app *app) +static int create_ust_app_channel(struct ust_app_session *ua_sess, + struct ltt_ust_channel *uchan, struct ust_app *app, + struct ust_app_channel **ua_chanp) { int ret = 0; struct lttng_ht_iter iter; @@ -1216,6 +1236,7 @@ static struct ust_app_channel *create_ust_app_channel( ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr); if (ua_chan == NULL) { /* Only malloc can fail here */ + ret = -ENOMEM; goto error; } shadow_copy_channel(ua_chan, uchan); @@ -1223,21 +1244,27 @@ static struct ust_app_channel *create_ust_app_channel( ret = create_ust_channel(app, ua_sess, ua_chan); if (ret < 0) { /* Not found previously means that it does not exist on the tracer */ - assert(ret != -EEXIST); + assert(ret != -LTTNG_UST_ERR_EXIST); goto error; } + /* Only add the channel if successful on the tracer side. */ 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->pid); end: - return ua_chan; + if (ua_chanp) { + *ua_chanp = ua_chan; + } + + /* Everything went well. */ + return 0; error: delete_ust_app_channel(-1, ua_chan); - return NULL; + return ret; } /* @@ -1249,14 +1276,12 @@ int create_ust_app_event(struct ust_app_session *ua_sess, struct ust_app *app) { int ret = 0; - struct lttng_ht_iter iter; - struct lttng_ht_node_str *ua_event_node; struct ust_app_event *ua_event; /* Get event node */ - lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &iter); - ua_event_node = lttng_ht_iter_get_node_str(&iter); - if (ua_event_node != NULL) { + ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name, + uevent->filter, uevent->attr.loglevel); + if (ua_event != NULL) { ret = -EEXIST; goto end; } @@ -1274,11 +1299,11 @@ int create_ust_app_event(struct ust_app_session *ua_sess, ret = create_ust_event(app, ua_sess, ua_chan, ua_event); if (ret < 0) { /* Not found previously means that it does not exist on the tracer */ - assert(ret != -EEXIST); + assert(ret != -LTTNG_UST_ERR_EXIST); goto error; } - lttng_ht_add_unique_str(ua_chan->events, &ua_event->node); + add_unique_ust_app_event(ua_chan->events, ua_event); DBG2("UST app create event %s for PID %d completed", ua_event->name, app->pid); @@ -1445,6 +1470,8 @@ int ust_app_register(struct ust_register_msg *msg, int sock) lta->sock = sock; lttng_ht_node_init_ulong(<a->sock_n, (unsigned long)lta->sock); + CDS_INIT_LIST_HEAD(<a->teardown_head); + rcu_read_lock(); /* @@ -1480,6 +1507,7 @@ void ust_app_unregister(int sock) struct ust_app *lta; struct lttng_ht_node_ulong *node; struct lttng_ht_iter iter; + struct ust_app_session *ua_sess; int ret; rcu_read_lock(); @@ -1514,6 +1542,22 @@ void ust_app_unregister(int sock) lta->pid); } + /* Remove sessions so they are not visible during deletion.*/ + cds_lfht_for_each_entry(lta->sessions->ht, &iter.iter, ua_sess, + node.node) { + ret = lttng_ht_del(lta->sessions, &iter); + if (ret) { + /* The session was already removed so scheduled for teardown. */ + continue; + } + + /* + * Add session to list for teardown. This is safe since at this point we + * are the only one using this list. + */ + cds_list_add(&ua_sess->teardown_node, <a->teardown_head); + } + /* Free memory */ call_rcu(<a->pid_n.head, delete_ust_app_rcu); @@ -1545,11 +1589,11 @@ int ust_app_list_events(struct lttng_event **events) size_t nbmem, count = 0; struct lttng_ht_iter iter; struct ust_app *app; - struct lttng_event *tmp; + struct lttng_event *tmp_event; nbmem = UST_APP_EVENT_LIST_SIZE; - tmp = zmalloc(nbmem * sizeof(struct lttng_event)); - if (tmp == NULL) { + tmp_event = zmalloc(nbmem * sizeof(struct lttng_event)); + if (tmp_event == NULL) { PERROR("zmalloc ust app events"); ret = -ENOMEM; goto error; @@ -1581,29 +1625,31 @@ int ust_app_list_events(struct lttng_event **events) health_code_update(&health_thread_cmd); if (count >= nbmem) { /* In case the realloc fails, we free the memory */ - void *tmp_ptr = (void *) tmp; + void *ptr; + 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) { + ptr = realloc(tmp_event, nbmem * sizeof(struct lttng_event)); + if (ptr == NULL) { PERROR("realloc ust app events"); - free(tmp_ptr); + free(tmp_event); ret = -ENOMEM; goto rcu_error; } + tmp_event = ptr; } - memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN); - tmp[count].loglevel = uiter.loglevel; - tmp[count].type = (enum lttng_event_type) LTTNG_UST_TRACEPOINT; - tmp[count].pid = app->pid; - tmp[count].enabled = -1; + memcpy(tmp_event[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN); + tmp_event[count].loglevel = uiter.loglevel; + tmp_event[count].type = (enum lttng_event_type) LTTNG_UST_TRACEPOINT; + tmp_event[count].pid = app->pid; + tmp_event[count].enabled = -1; count++; } } ret = count; - *events = tmp; + *events = tmp_event; DBG2("UST app list events done (%zu events)", count); @@ -1623,11 +1669,11 @@ int ust_app_list_event_fields(struct lttng_event_field **fields) size_t nbmem, count = 0; struct lttng_ht_iter iter; struct ust_app *app; - struct lttng_event_field *tmp; + struct lttng_event_field *tmp_event; nbmem = UST_APP_EVENT_LIST_SIZE; - tmp = zmalloc(nbmem * sizeof(struct lttng_event_field)); - if (tmp == NULL) { + tmp_event = zmalloc(nbmem * sizeof(struct lttng_event_field)); + if (tmp_event == NULL) { PERROR("zmalloc ust app event fields"); ret = -ENOMEM; goto error; @@ -1659,34 +1705,36 @@ int ust_app_list_event_fields(struct lttng_event_field **fields) health_code_update(&health_thread_cmd); if (count >= nbmem) { /* In case the realloc fails, we free the memory */ - void *tmp_ptr = (void *) tmp; + void *ptr; + 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) { + ptr = realloc(tmp_event, nbmem * sizeof(struct lttng_event_field)); + if (ptr == NULL) { PERROR("realloc ust app event fields"); - free(tmp_ptr); + free(tmp_event); ret = -ENOMEM; goto rcu_error; } + tmp_event = ptr; } - 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_event[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN); + tmp_event[count].type = uiter.type; + tmp_event[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; + memcpy(tmp_event[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN); + tmp_event[count].event.loglevel = uiter.loglevel; + tmp_event[count].event.type = LTTNG_UST_TRACEPOINT; + tmp_event[count].event.pid = app->pid; + tmp_event[count].event.enabled = -1; count++; } } ret = count; - *fields = tmp; + *fields = tmp_event; DBG2("UST app list event fields done (%zu events)", count); @@ -1947,8 +1995,10 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, continue; } ua_sess = lookup_session_by_app(usess, app); - /* If ua_sess is NULL, there is a code flow error */ - assert(ua_sess); + if (!ua_sess) { + /* The application has problem or is probably dead. */ + continue; + } /* Lookup channel in the ust app session */ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter); @@ -1984,7 +2034,6 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, struct lttng_ht_iter iter; struct ust_app *app; struct ust_app_session *ua_sess; - struct ust_app_channel *ua_chan; /* Very wrong code flow */ assert(usess); @@ -2012,26 +2061,27 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, ua_sess = create_ust_app_session(usess, app); if (ua_sess == NULL) { /* The malloc() failed. */ - ret = -1; - goto error; + ret = -ENOMEM; + goto error_rcu_unlock; } else if (ua_sess == (void *) -1UL) { - /* The application's socket is not valid. Contiuing */ - ret = -1; + /* + * The application's socket is not valid. Either a bad socket or a + * timeout on it. We can't inform yet the caller that for a + * specific app, the session failed so we continue here. + */ continue; } - /* Create channel onto application */ - ua_chan = create_ust_app_channel(ua_sess, uchan, app); - if (ua_chan == NULL) { - /* Major problem here and it's maybe the tracer or malloc() */ - ret = -1; - goto error; + /* Create channel onto application. We don't need the chan ref. */ + ret = create_ust_app_channel(ua_sess, uchan, app, NULL); + if (ret < 0 && ret == -ENOMEM) { + /* No more memory is a fatal error. Stop right now. */ + goto error_rcu_unlock; } } +error_rcu_unlock: rcu_read_unlock(); - -error: return ret; } @@ -2043,7 +2093,7 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, { int ret = 0; struct lttng_ht_iter iter, uiter; - struct lttng_ht_node_str *ua_chan_node, *ua_event_node; + struct lttng_ht_node_str *ua_chan_node; struct ust_app *app; struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; @@ -2070,8 +2120,10 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, continue; } ua_sess = lookup_session_by_app(usess, app); - /* If ua_sess is NULL, there is a code flow error */ - assert(ua_sess); + if (!ua_sess) { + /* The application has problem or is probably dead. */ + continue; + } /* Lookup channel in the ust app session */ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter); @@ -2081,14 +2133,14 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, 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) { + /* Get event node */ + ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name, + uevent->filter, uevent->attr.loglevel); + if (ua_event == NULL) { DBG3("UST app enable event %s not found for app PID %d." "Skipping app", uevent->attr.name, app->pid); continue; } - ua_event = caa_container_of(ua_event_node, struct ust_app_event, node); ret = enable_ust_app_event(ua_sess, ua_event, app); if (ret < 0) { @@ -2130,8 +2182,10 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, continue; } ua_sess = lookup_session_by_app(usess, app); - /* If ua_sess is NULL, there is a code flow error */ - assert(ua_sess); + if (!ua_sess) { + /* The application has problem or is probably dead. */ + continue; + } /* Lookup channel in the ust app session */ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &uiter); @@ -2143,7 +2197,7 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, ret = create_ust_app_event(ua_sess, ua_chan, uevent, app); if (ret < 0) { - if (ret != -EEXIST) { + if (ret != -LTTNG_UST_ERR_EXIST) { /* Possible value at this point: -ENOMEM. If so, we stop! */ break; } @@ -2180,7 +2234,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { - goto error_rcu_unlock; + /* The session is in teardown process. Ignore and continue. */ + goto end; } /* Upon restart, we skip the setup, already done */ @@ -2202,9 +2257,6 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app) } } - /* 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; @@ -2298,10 +2350,13 @@ skip_setup: /* This start the UST tracing */ ret = ustctl_start_session(app->sock, ua_sess->handle); if (ret < 0) { - ERR("Error starting tracing for app pid: %d", app->pid); + ERR("Error starting tracing for app pid: %d (ret: %d)", app->pid, ret); goto error_rcu_unlock; } + /* Indicate that the session has been started once */ + ua_sess->started = 1; + health_code_update(&health_thread_cmd); /* Quiescent wait after starting trace */ @@ -2338,23 +2393,25 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app) 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; + 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. + * that was never started. It's possible since we can have a fail start + * from either the application manager thread or the command thread. Simply + * indicate that this is a stop error. */ - assert(ua_sess->started == 1); + if (!ua_sess->started) { + goto error_rcu_unlock; + } health_code_update(&health_thread_cmd); /* This inhibits UST tracing */ ret = ustctl_stop_session(app->sock, ua_sess->handle); if (ret < 0) { - ERR("Error stopping tracing for app pid: %d", app->pid); + ERR("Error stopping tracing for app pid: %d (ret: %d)", app->pid, ret); goto error_rcu_unlock; } @@ -2401,7 +2458,7 @@ error_rcu_unlock: /* * Destroy a specific UST session in apps. */ -int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) +static int destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) { struct ust_app_session *ua_sess; struct lttng_ust_object_data obj; @@ -2420,12 +2477,16 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app) __lookup_session_by_app(usess, app, &iter); node = lttng_ht_iter_get_node_ulong(&iter); if (node == NULL) { - /* Only malloc can failed so something is really wrong */ - goto error_rcu_unlock; + /* Session is being or is deleted. */ + goto end; } ua_sess = caa_container_of(node, struct ust_app_session, node); ret = lttng_ht_del(app->sessions, &iter); - assert(!ret); + if (ret) { + /* Already scheduled for teardown. */ + goto end; + } + obj.handle = ua_sess->handle; obj.shm_fd = -1; obj.wait_fd = -1; @@ -2443,11 +2504,6 @@ 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; } /* @@ -2516,7 +2572,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, pid_n.node) { - ret = ust_app_destroy_trace(usess, app); + ret = destroy_trace(usess, app); if (ret < 0) { /* Continue to next apps even on error */ continue; @@ -2541,10 +2597,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) struct ust_app_event *ua_event; struct ust_app_ctx *ua_ctx; - if (usess == NULL) { - ERR("No UST session on global update. Returning"); - goto error; - } + assert(usess); DBG2("UST app global update for app sock %d for session id %d", sock, usess->id); @@ -2598,21 +2651,6 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) /* FIXME: Should we quit here or continue... */ continue; } - - /* Add context on events. */ - cds_lfht_for_each_entry(ua_event->ctx->ht, &iter_ctx.iter, - ua_ctx, node.node) { - ret = create_ust_event_context(ua_event, ua_ctx, app); - if (ret < 0) { - /* FIXME: Should we quit here or continue... */ - continue; - } - } - ret = set_ust_event_filter(ua_event, app); - if (ret < 0) { - /* FIXME: Should we quit here or continue... */ - continue; - } } } @@ -2677,120 +2715,6 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, return ret; } -/* - * Add context to a specific event in a channel for global UST domain. - */ -int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, - struct ltt_ust_context *uctx) -{ - 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 = create_ust_app_event_context(ua_sess, ua_event, &uctx->ctx, app); - if (ret < 0) { - continue; - } - } - - rcu_read_unlock(); - 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. */ @@ -2799,7 +2723,7 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess, { int ret = 0; struct lttng_ht_iter iter; - struct lttng_ht_node_str *ua_chan_node, *ua_event_node; + struct lttng_ht_node_str *ua_chan_node; struct ust_app *app; struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; @@ -2822,8 +2746,10 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess, } ua_sess = lookup_session_by_app(usess, app); - /* If ua_sess is NULL, there is a code flow error */ - assert(ua_sess); + if (!ua_sess) { + /* The application has problem or is probably dead. */ + goto error; + } /* Lookup channel in the ust app session */ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter); @@ -2833,16 +2759,14 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess, ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); - lttng_ht_lookup(ua_chan->events, (void *)uevent->attr.name, &iter); - ua_event_node = lttng_ht_iter_get_node_str(&iter); - if (ua_event_node == NULL) { + ua_event = find_ust_app_event(ua_chan->events, uevent->attr.name, + uevent->filter, uevent->attr.loglevel); + if (ua_event == NULL) { ret = create_ust_app_event(ua_sess, ua_chan, uevent, app); if (ret < 0) { goto error; } } else { - ua_event = caa_container_of(ua_event_node, struct ust_app_event, node); - ret = enable_ust_app_event(ua_sess, ua_event, app); if (ret < 0) { goto error; @@ -2885,8 +2809,10 @@ int ust_app_disable_event_pid(struct ltt_ust_session *usess, } ua_sess = lookup_session_by_app(usess, app); - /* If ua_sess is NULL, there is a code flow error */ - assert(ua_sess); + if (!ua_sess) { + /* The application has problem or is probably dead. */ + goto error; + } /* Lookup channel in the ust app session */ lttng_ht_lookup(ua_sess->channels, (void *)uchan->name, &iter);