Network streaming support

[lttng-tools.git] / src / bin / lttng-sessiond / ust-app.c

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 43caabf933f7ae747b96051ef11efe31f748dd8b..c8c653134f7528e2cea26f0d333fc655881fe9e0 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -645,7 +645,7 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
        ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj,
                        &ua_event->obj);
        if (ret < 0) {
-               if (ret == -EEXIST) {
+               if (ret == -EEXIST || ret == -EPERM) {
                        ret = 0;
                        goto error;
                }
@@ -797,8 +797,8 @@ static void shadow_copy_session(struct ust_app_session *ua_sess,
        ua_sess->uid = usess->uid;
        ua_sess->gid = usess->gid;
 
-       ret = snprintf(ua_sess->path, PATH_MAX, "%s/%s-%d-%s", usess->pathname,
-                       app->name, app->pid, datetime);
+       ret = snprintf(ua_sess->path, PATH_MAX, "%s-%d-%s/", app->name, app->pid,
+                       datetime);
        if (ret < 0) {
                PERROR("asprintf UST shadow copy session");
                /* TODO: We cannot return an error from here.. */
@@ -1225,13 +1225,6 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
                        goto error;
                }
 
-               ret = run_as_mkdir(ua_sess->path, S_IRWXU | S_IRWXG,
-                               ua_sess->uid, ua_sess->gid);
-               if (ret < 0) {
-                       PERROR("mkdir UST metadata");
-                       goto error;
-               }
-
                ret = snprintf(ua_sess->metadata->pathname, PATH_MAX,
                                "%s/metadata", ua_sess->path);
                if (ret < 0) {
@@ -1497,6 +1490,81 @@ error:
        return ret;
 }
 
+/*
+ * Fill events array with all events name of all registered apps.
+ */
+int ust_app_list_event_fields(struct lttng_event_field **fields)
+{
+       int ret, handle;
+       size_t nbmem, count = 0;
+       struct lttng_ht_iter iter;
+       struct ust_app *app;
+       struct lttng_event_field *tmp;
+
+       nbmem = UST_APP_EVENT_LIST_SIZE;
+       tmp = zmalloc(nbmem * sizeof(struct lttng_event_field));
+       if (tmp == NULL) {
+               PERROR("zmalloc ust app event fields");
+               ret = -ENOMEM;
+               goto error;
+       }
+
+       rcu_read_lock();
+
+       cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
+               struct lttng_ust_field_iter uiter;
+
+               if (!app->compatible) {
+                       /*
+                        * TODO: In time, we should notice the caller of this error by
+                        * telling him that this is a version error.
+                        */
+                       continue;
+               }
+               handle = ustctl_tracepoint_field_list(app->sock);
+               if (handle < 0) {
+                       ERR("UST app list event fields getting handle failed for app pid %d",
+                                       app->pid);
+                       continue;
+               }
+
+               while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle,
+                                               &uiter)) != -ENOENT) {
+                       if (count >= nbmem) {
+                               DBG2("Reallocating event field list from %zu to %zu entries", nbmem,
+                                               2 * nbmem);
+                               nbmem *= 2;
+                               tmp = realloc(tmp, nbmem * sizeof(struct lttng_event_field));
+                               if (tmp == NULL) {
+                                       PERROR("realloc ust app event fields");
+                                       ret = -ENOMEM;
+                                       goto rcu_error;
+                               }
+                       }
+
+                       memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
+                       tmp[count].type = uiter.type;
+
+                       memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
+                       tmp[count].event.loglevel = uiter.loglevel;
+                       tmp[count].event.type = LTTNG_UST_TRACEPOINT;
+                       tmp[count].event.pid = app->pid;
+                       tmp[count].event.enabled = -1;
+                       count++;
+               }
+       }
+
+       ret = count;
+       *fields = tmp;
+
+       DBG2("UST app list event fields done (%zu events)", count);
+
+rcu_error:
+       rcu_read_unlock();
+error:
+       return ret;
+}
+
 /*
  * Free and clean all traceable apps of the global list.
  */
@@ -2024,9 +2092,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 
                        /* Order is important */
                        cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
-                       ret = snprintf(ustream->pathname, PATH_MAX, "%s/%s_%u",
-                                       ua_sess->path, ua_chan->name,
-                                       ua_chan->streams.count++);
+                       ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u",
+                                       ua_chan->name, ua_chan->streams.count++);
                        if (ret < 0) {
                                PERROR("asprintf UST create stream");
                                /*
@@ -2035,8 +2102,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
                                 */
                                continue;
                        }
-                       DBG2("UST stream %d ready at %s", ua_chan->streams.count,
-                                       ustream->pathname);
+                       DBG2("UST stream %d ready (handle: %d)", ua_chan->streams.count,
+                                       ustream->handle);
                }
        }
 
@@ -2053,7 +2120,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
        }
 
        /* Setup UST consumer socket and send fds to it */
-       ret = ust_consumer_send_session(consumerd_fd, ua_sess);
+       ret = ust_consumer_send_session(consumerd_fd, ua_sess, usess->consumer);
        if (ret < 0) {
                goto error_rcu_unlock;
        }