Use default value for metadata file name

[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 c1e7e3935d52a4594989f0dce261919d730d6568..f46183bd36da99afabc8dbd66eea619539f59e24 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -155,7 +155,7 @@ void delete_ust_app_event(int sock, struct ust_app_event *ua_event)
  * this function.
  */
 static
-void delete_ust_app_stream(int sock, struct ltt_ust_stream *stream)
+void delete_ust_app_stream(int sock, struct ust_app_stream *stream)
 {
        if (stream->obj) {
                ustctl_release_object(sock, stream->obj);
@@ -176,7 +176,7 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan)
        struct lttng_ht_iter iter;
        struct ust_app_event *ua_event;
        struct ust_app_ctx *ua_ctx;
-       struct ltt_ust_stream *stream, *stmp;
+       struct ust_app_stream *stream, *stmp;
 
        /* Wipe stream */
        cds_list_for_each_entry_safe(stream, stmp, &ua_chan->streams.head, list) {
@@ -367,7 +367,13 @@ struct ust_app_channel *alloc_ust_app_channel(char *name,
 
        /* Copy attributes */
        if (attr) {
-               memcpy(&ua_chan->attr, attr, sizeof(ua_chan->attr));
+               /* Translate from lttng_ust_channel to lttng_ust_channel_attr.*/
+               ua_chan->attr.subbuf_size = attr->subbuf_size;
+               ua_chan->attr.num_subbuf = attr->num_subbuf;
+               ua_chan->attr.overwrite = attr->overwrite;
+               ua_chan->attr.switch_timer_interval = attr->switch_timer_interval;
+               ua_chan->attr.read_timer_interval = attr->read_timer_interval;
+               ua_chan->attr.output = attr->output;
        }
 
        DBG3("UST app channel %s allocated", ua_chan->name);
@@ -378,6 +384,28 @@ error:
        return NULL;
 }
 
+/*
+ * Allocate and initialize a UST app stream.
+ *
+ * Return newly allocated stream pointer or NULL on error.
+ */
+static struct ust_app_stream *alloc_ust_app_stream(void)
+{
+       struct ust_app_stream *stream = NULL;
+
+       stream = zmalloc(sizeof(*stream));
+       if (stream == NULL) {
+               PERROR("zmalloc ust app stream");
+               goto error;
+       }
+
+       /* Zero could be a valid value for a handle so flag it to -1. */
+       stream->handle = -1;
+
+error:
+       return stream;
+}
+
 /*
  * Alloc new UST app event.
  */
@@ -757,7 +785,7 @@ error:
  * On error, return a negative value.
  */
 static int create_ust_stream(struct ust_app *app,
-               struct ust_app_channel *ua_chan, struct ltt_ust_stream *stream)
+               struct ust_app_channel *ua_chan, struct ust_app_stream *stream)
 {
        int ret;
 
@@ -777,6 +805,20 @@ static int create_ust_stream(struct ust_app *app,
                goto error;
        }
 
+       /*
+        * Set the stream name before creating it. On error, we don't have to
+        * delete it on the tracer side.
+        */
+       ret = snprintf(stream->name, sizeof(stream->name), "%s_%u",
+                       ua_chan->name, ua_chan->streams.count);
+       if (ret < 0) {
+               /* Without the stream name we can't continue using it. */
+               PERROR("snprintf UST create stream");
+               /* Just to make sure we never return -ENOENT. */
+               ret = -1;
+               goto error;
+       }
+
        ret = ustctl_create_stream(app->sock, ua_chan->obj, &stream->obj);
        if (ret < 0) {
                lttng_fd_put(LTTNG_FD_APPS, 2);
@@ -805,8 +847,6 @@ static int create_ust_channel(struct ust_app *app,
 
        health_code_update(&health_thread_cmd);
 
-       /* TODO: remove cast and use lttng-ust-abi.h */
-
        /* We are going to receive 2 fds, we need to reserve them. */
        ret = lttng_fd_get(LTTNG_FD_APPS, 2);
        if (ret < 0) {
@@ -816,8 +856,8 @@ static int create_ust_channel(struct ust_app *app,
 
        health_code_update(&health_thread_cmd);
 
-       ret = ustctl_create_channel(app->sock, ua_sess->handle,
-                       (struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj);
+       ret = ustctl_create_channel(app->sock, ua_sess->handle, &ua_chan->attr,
+                       &ua_chan->obj);
        if (ret < 0) {
                ERR("Creating channel %s for app (pid: %d, sock: %d) "
                                "and session handle %d with ret %d",
@@ -1428,7 +1468,7 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
                }
 
                ret = snprintf(ua_sess->metadata->pathname, PATH_MAX,
-                               "%s/metadata", ua_sess->path);
+                               "%s/" DEFAULT_METADATA_NAME, ua_sess->path);
                if (ret < 0) {
                        PERROR("asprintf UST create stream");
                        goto error;
@@ -2300,7 +2340,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
        struct lttng_ht_iter iter;
        struct ust_app_session *ua_sess;
        struct ust_app_channel *ua_chan;
-       struct ltt_ust_stream *ustream;
+       struct ust_app_stream *ustream;
        struct consumer_socket *socket;
 
        DBG("Starting tracing for ust app pid %d", app->pid);
@@ -2348,9 +2388,8 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
                /* Create all streams */
                while (1) {
                        /* Create UST stream */
-                       ustream = zmalloc(sizeof(*ustream));
+                       ustream = alloc_ust_app_stream();
                        if (ustream == NULL) {
-                               PERROR("zmalloc ust stream");
                                goto error_rcu_unlock;
                        }
 
@@ -2371,19 +2410,10 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 
                        health_code_update(&health_thread_cmd);
 
-                       /* Order is important */
+                       /* Order is important this is why a list is used. */
                        cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
-                       ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u",
-                                       ua_chan->name, ua_chan->streams.count);
                        ua_chan->streams.count++;
-                       if (ret < 0) {
-                               PERROR("asprintf UST create stream");
-                               /*
-                                * XXX what should we do here with the
-                                * stream ?
-                                */
-                               continue;
-                       }
+
                        DBG2("UST stream %d ready (handle: %d)", ua_chan->streams.count,
                                        ustream->handle);
                }