X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-app.c;h=77dcc71a6fee77bbcc28d1298eb90355566fb630;hp=e8dc32733492f39d012b2a3a34fd542d14969471;hb=6df2e2c977b698cc6b8f15c90b649516674028f9;hpb=aee6bafd6ea002e75bc69d0c476543b9f807fd0b diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c index e8dc32733..77dcc71a6 100644 --- a/lttng-sessiond/ust-app.c +++ b/lttng-sessiond/ust-app.c @@ -769,7 +769,9 @@ static void shadow_copy_session(struct ust_app_session *ua_sess, DBG2("Shadow copy of session handle %d", ua_sess->handle); + ua_sess->id = usess->id; ua_sess->uid = usess->uid; + ua_sess->gid = usess->gid; ret = snprintf(ua_sess->path, PATH_MAX, "%s/%s-%d-%s", @@ -817,13 +819,13 @@ void __lookup_session_by_app(struct ltt_ust_session *usess, { /* Get right UST app session from app */ (void) hashtable_lookup(app->sessions, - (void *) ((unsigned long) usess->uid), sizeof(void *), + (void *) ((unsigned long) usess->id), sizeof(void *), iter); } /* * Return ust app session from the app session hashtable using the UST session - * uid. + * id. */ static struct ust_app_session *lookup_session_by_app( struct ltt_ust_session *usess, struct ust_app *app) @@ -857,8 +859,8 @@ static struct ust_app_session *create_ust_app_session( 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); + DBG2("UST app pid: %d session id %d not found, creating it", + app->key.pid, usess->id); ua_sess = alloc_ust_app_session(); if (ua_sess == NULL) { /* Only malloc can failed so something is really wrong */ @@ -881,7 +883,7 @@ static struct ust_app_session *create_ust_app_session( /* Add ust app session to app's HT */ hashtable_node_init(&ua_sess->node, - (void *)((unsigned long) ua_sess->uid), sizeof(void *)); + (void *)((unsigned long) ua_sess->id), sizeof(void *)); hashtable_add_unique(app->sessions, &ua_sess->node); DBG2("UST app session created successfully with handle %d", ret); @@ -1050,8 +1052,8 @@ static int enable_ust_app_channel(struct ust_app_session *ua_sess, 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); + DBG2("Unable to find channel %s in ust session id %u", + uchan->name, ua_sess->id); goto error; } @@ -1082,8 +1084,8 @@ static struct ust_app_channel *create_ust_app_channel( 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); + DBG2("Unable to find channel %s in ust session id %u", + uchan->name, ua_sess->id); ua_chan = alloc_ust_app_channel(uchan->name, &uchan->attr); if (ua_chan == NULL) { goto error; @@ -1197,6 +1199,11 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess, PERROR("mkdir UST metadata"); goto error; } + ret = chown(ua_sess->path, ua_sess->uid, ua_sess->gid); + if (ret < 0) { + ERR("Unable to change owner of %s", ua_sess->path); + perror("chown"); + } umask(old_umask); ret = snprintf(ua_sess->metadata->pathname, PATH_MAX, @@ -1382,7 +1389,7 @@ int ust_app_list_events(struct lttng_event **events) rcu_read_lock(); cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { - struct lttng_ust_tracepoint_iter iter; + struct lttng_ust_tracepoint_iter uiter; handle = ustctl_tracepoint_list(app->key.sock); if (handle < 0) { @@ -1392,7 +1399,7 @@ int ust_app_list_events(struct lttng_event **events) } while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle, - &iter)) != -ENOENT) { + &uiter)) != -ENOENT) { if (count >= nbmem) { DBG2("Reallocating event list from %zu to %zu entries", nbmem, 2 * nbmem); @@ -1404,9 +1411,9 @@ int ust_app_list_events(struct lttng_event **events) goto rcu_error; } } - memcpy(tmp[count].name, iter.name, LTTNG_UST_SYM_NAME_LEN); - memcpy(tmp[count].loglevel, iter.loglevel, LTTNG_UST_SYM_NAME_LEN); - tmp[count].loglevel_value = iter.loglevel_value; + 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].enabled = -1; @@ -1478,13 +1485,15 @@ int ust_app_disable_channel_glb(struct ltt_ust_session *usess, goto error; } - DBG2("UST app disabling channel %s from global domain for session uid %d", - uchan->name, usess->uid); + DBG2("UST app disabling channel %s from global domain for session id %d", + uchan->name, usess->id); rcu_read_lock(); /* For every registered applications */ cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue; @@ -1492,7 +1501,7 @@ int ust_app_disable_channel_glb(struct ltt_ust_session *usess, /* Get channel */ ua_chan_node = hashtable_lookup(ua_sess->channels, - (void *)uchan->name, strlen(uchan->name), &iter); + (void *)uchan->name, strlen(uchan->name), &uiter); /* If the session if found for the app, the channel must be there */ assert(ua_chan_node); @@ -1531,8 +1540,8 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess, goto error; } - DBG2("UST app enabling channel %s to global domain for session uid %d", - uchan->name, usess->uid); + DBG2("UST app enabling channel %s to global domain for session id %d", + uchan->name, usess->id); rcu_read_lock(); @@ -1564,7 +1573,7 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) { int ret = 0; - struct cds_lfht_iter iter, uiter; + struct cds_lfht_iter iter; struct cds_lfht_node *ua_chan_node, *ua_event_node; struct ust_app *app; struct ust_app_session *ua_sess; @@ -1572,12 +1581,14 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, struct ust_app_event *ua_event; DBG("UST app disabling event %s for all apps in channel " - "%s for session uid %d", uevent->attr.name, uchan->name, usess->uid); + "%s for session id %d", uevent->attr.name, uchan->name, usess->id); rcu_read_lock(); /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { /* Next app */ @@ -1588,8 +1599,8 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess, ua_chan_node = hashtable_lookup(ua_sess->channels, (void *)uchan->name, strlen(uchan->name), &uiter); if (ua_chan_node == NULL) { - DBG2("Channel %s not found in session uid %d for app pid %d." - "Skipping", uchan->name, usess->uid, app->key.pid); + DBG2("Channel %s not found in session id %d for app pid %d." + "Skipping", uchan->name, usess->id, app->key.pid); continue; } ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node); @@ -1623,7 +1634,7 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { int ret = 0; - struct cds_lfht_iter iter, uiter; + struct cds_lfht_iter iter; struct cds_lfht_node *ua_chan_node; struct ust_app *app; struct ust_app_session *ua_sess; @@ -1631,12 +1642,14 @@ int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, struct ust_app_event *ua_event; DBG("UST app disabling all event for all apps in channel " - "%s for session uid %d", uchan->name, usess->uid); + "%s for session id %d", uchan->name, usess->id); rcu_read_lock(); /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -1682,8 +1695,8 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, goto error; } - DBG2("UST app adding channel %s to global domain for session uid %d", - uchan->name, usess->uid); + DBG2("UST app adding channel %s to global domain for session id %d", + uchan->name, usess->id); rcu_read_lock(); @@ -1719,15 +1732,15 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) { int ret = 0; - struct cds_lfht_iter iter, uiter; + struct cds_lfht_iter iter; struct cds_lfht_node *ua_chan_node, *ua_event_node; struct ust_app *app; struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; struct ust_app_event *ua_event; - DBG("UST app enabling event %s for all apps for session uid %d", - uevent->attr.name, usess->uid); + DBG("UST app enabling event %s for all apps for session id %d", + uevent->attr.name, usess->id); /* * NOTE: At this point, this function is called only if the session and @@ -1739,6 +1752,8 @@ int ust_app_enable_event_glb(struct ltt_ust_session *usess, /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -1779,14 +1794,14 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) { int ret = 0; - struct cds_lfht_iter iter, uiter; + struct cds_lfht_iter iter; struct cds_lfht_node *ua_chan_node; struct ust_app *app; struct ust_app_session *ua_sess; struct ust_app_channel *ua_chan; - DBG("UST app creating event %s for all apps for session uid %d", - uevent->attr.name, usess->uid); + DBG("UST app creating event %s for all apps for session id %d", + uevent->attr.name, usess->id); /* * NOTE: At this point, this function is called only if the session and @@ -1798,6 +1813,8 @@ int ust_app_create_event_glb(struct ltt_ust_session *usess, /* For all registered applications */ cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); /* If ua_sess is NULL, there is a code flow error */ assert(ua_sess); @@ -1944,13 +1961,17 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app) goto error_rcu_unlock; } - /* Flush all buffers before stopping */ - ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj); + /* This inhibits UST tracing */ + ret = ustctl_stop_session(app->key.sock, ua_sess->handle); if (ret < 0) { - ERR("UST app PID %d metadata flush failed", app->key.pid); - ERR("Ended with ret %d", ret); + ERR("Error stopping tracing for app pid: %d", app->key.pid); + goto error_rcu_unlock; } + /* Quiescent wait after stopping trace */ + ustctl_wait_quiescent(app->key.sock); + + /* Flushing buffers */ cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) { ret = ustctl_sock_flush_buffer(app->key.sock, ua_chan->obj); if (ret < 0) { @@ -1962,18 +1983,15 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app) } } - /* This inhibits UST tracing */ - ret = ustctl_stop_session(app->key.sock, ua_sess->handle); + /* Flush all buffers before stopping */ + ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj); if (ret < 0) { - ERR("Error stopping tracing for app pid: %d", app->key.pid); - goto error_rcu_unlock; + ERR("UST app PID %d metadata flush failed", app->key.pid); + ERR("Ended with ret %d", ret); } rcu_read_unlock(); - /* Quiescent wait after stopping trace */ - ustctl_wait_quiescent(app->key.sock); - return 0; error_rcu_unlock: @@ -2119,8 +2137,8 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) goto error; } - DBG2("UST app global update for app sock %d for session uid %d", sock, - usess->uid); + DBG2("UST app global update for app sock %d for session id %d", sock, + usess->id); rcu_read_lock(); @@ -2141,6 +2159,8 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) * ltt ust session. */ cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) { + struct cds_lfht_iter uiter; + ret = create_ust_channel(app, ua_sess, ua_chan); if (ret < 0) { /* FIXME: Should we quit here or continue... */ @@ -2148,7 +2168,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock) } /* For each events */ - cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) { + cds_lfht_for_each_entry(ua_chan->events, &uiter, ua_event, node) { ret = create_ust_event(app, ua_sess, ua_chan, ua_event); if (ret < 0) { /* FIXME: Should we quit here or continue... */ @@ -2179,7 +2199,7 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, { int ret = 0; struct cds_lfht_node *ua_chan_node; - struct cds_lfht_iter iter, uiter; + struct cds_lfht_iter iter; struct ust_app_channel *ua_chan = NULL; struct ust_app_session *ua_sess; struct ust_app *app; @@ -2187,6 +2207,8 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, rcu_read_lock(); cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue; @@ -2220,7 +2242,7 @@ int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, { int ret = 0; struct cds_lfht_node *ua_chan_node, *ua_event_node; - struct cds_lfht_iter iter, uiter; + struct cds_lfht_iter iter; struct ust_app_session *ua_sess; struct ust_app_event *ua_event; struct ust_app_channel *ua_chan = NULL; @@ -2229,6 +2251,8 @@ int ust_app_add_ctx_event_glb(struct ltt_ust_session *usess, rcu_read_lock(); cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) { + struct cds_lfht_iter uiter; + ua_sess = lookup_session_by_app(usess, app); if (ua_sess == NULL) { continue;