Add filter sequence number to UST

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

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index ed635f960501b672b047ffd245436cbf46b2c533..2dcc7c25d95f737c2da19f88e6406b6c23d591c7 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -109,18 +109,44 @@ struct ltt_ust_session *trace_ust_create_session(char *path,
        /* Alloc UST global domain channels' HT */
        lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
 
-       /* Set session path */
-       ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
-       if (ret < 0) {
-               PERROR("snprintf kernel traces path");
-               goto error_free_session;
+       lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+       if (lus->consumer == NULL) {
+               goto error_consumer;
+       }
+
+       /*
+        * The tmp_consumer stays NULL until a set_consumer_uri command is
+        * executed. At this point, the consumer should be nullify until an
+        * enable_consumer command. This assignment is symbolic since we've zmalloc
+        * the struct.
+        */
+       lus->tmp_consumer = NULL;
+
+       /* Use the default consumer output which is the tracing session path. */
+       if (path && strlen(path) > 0) {
+               ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
+                               "%s" DEFAULT_UST_TRACE_DIR, path);
+               if (ret < 0) {
+                       PERROR("snprintf UST consumer trace path");
+                       goto error_path;
+               }
+
+               /* Set session path */
+               ret = snprintf(lus->pathname, PATH_MAX, "%s" DEFAULT_UST_TRACE_DIR,
+                               path);
+               if (ret < 0) {
+                       PERROR("snprintf kernel traces path");
+                       goto error_path;
+               }
        }
 
        DBG2("UST trace session create successful");
 
        return lus;
 
-error_free_session:
+error_path:
+       consumer_destroy_output(lus->consumer);
+error_consumer:
        lttng_ht_destroy(lus->domain_global.channels);
        lttng_ht_destroy(lus->domain_exec);
        lttng_ht_destroy(lus->domain_pid);
@@ -285,7 +311,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 
        /* Set default attributes */
        lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-       lum->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+       lum->attr.subbuf_size = default_get_metadata_subbuf_size();
        lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
        lum->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
        lum->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
@@ -390,7 +416,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
        DBG2("Trace destroy UST event %s", event->attr.name);
        destroy_contexts(event->ctx);
-
+       free(event->filter);
        free(event);
 }
 
@@ -554,6 +580,9 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
        destroy_domain_pid(session->domain_pid);
        destroy_domain_exec(session->domain_exec);
 
+       consumer_destroy_output(session->consumer);
+       consumer_destroy_output(session->tmp_consumer);
+
        free(session);
 
        rcu_read_unlock();