Cleanup: wpipe already contain kernel_tracer_fd
[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c
index 95e371d7b66fe527da607a7c60d0c49b871a2e63..6722341bb4b1be79f11a88b96c8989a3cf15e734 100644 (file)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License, version 2 only, as
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
-#include <string.h>
 #include <inttypes.h>
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/relayd/relayd.h>
 #include <common/utils.h>
+#include <common/compat/string.h>
+#include <common/kernel-ctl/kernel-ctl.h>
+#include <common/dynamic-buffer.h>
+#include <common/buffer-view.h>
+#include <lttng/trigger/trigger-internal.h>
+#include <lttng/condition/condition.h>
+#include <lttng/action/action.h>
+#include <lttng/channel.h>
+#include <lttng/channel-internal.h>
+#include <lttng/rotate-internal.h>
+#include <common/string-utils/string-utils.h>
 
 #include "channel.h"
 #include "consumer.h"
 #include "kernel-consumer.h"
 #include "lttng-sessiond.h"
 #include "utils.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
+#include "agent.h"
+#include "buffer-registry.h"
+#include "notification-thread.h"
+#include "notification-thread-commands.h"
+#include "rotate.h"
+#include "rotation-thread.h"
+#include "sessiond-timer.h"
+#include "agent-thread.h"
 
 #include "cmd.h"
 
 static pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER;
 static uint64_t relayd_net_seq_idx;
 
+static int validate_ust_event_name(const char *);
+static int cmd_enable_event_internal(struct ltt_session *session,
+               struct lttng_domain *domain,
+               char *channel_name, struct lttng_event *event,
+               char *filter_expression,
+               struct lttng_filter_bytecode *filter,
+               struct lttng_event_exclusion *exclusion,
+               int wpipe);
+
 /*
  * Create a session path used by list_lttng_sessions for the case that the
  * session consumer is on the network.
@@ -128,13 +155,105 @@ error:
        return ret;
 }
 
+/*
+ * Get run-time attributes if the session has been started (discarded events,
+ * lost packets).
+ */
+static int get_kernel_runtime_stats(struct ltt_session *session,
+               struct ltt_kernel_channel *kchan, uint64_t *discarded_events,
+               uint64_t *lost_packets)
+{
+       int ret;
+
+       if (!session->has_been_started) {
+               ret = 0;
+               *discarded_events = 0;
+               *lost_packets = 0;
+               goto end;
+       }
+
+       ret = consumer_get_discarded_events(session->id, kchan->key,
+                       session->kernel_session->consumer,
+                       discarded_events);
+       if (ret < 0) {
+               goto end;
+       }
+
+       ret = consumer_get_lost_packets(session->id, kchan->key,
+                       session->kernel_session->consumer,
+                       lost_packets);
+       if (ret < 0) {
+               goto end;
+       }
+
+end:
+       return ret;
+}
+
+/*
+ * Get run-time attributes if the session has been started (discarded events,
+ * lost packets).
+ */
+static int get_ust_runtime_stats(struct ltt_session *session,
+               struct ltt_ust_channel *uchan, uint64_t *discarded_events,
+               uint64_t *lost_packets)
+{
+       int ret;
+       struct ltt_ust_session *usess;
+
+       if (!discarded_events || !lost_packets) {
+               ret = -1;
+               goto end;
+       }
+
+       usess = session->ust_session;
+       assert(discarded_events);
+       assert(lost_packets);
+
+       if (!usess || !session->has_been_started) {
+               *discarded_events = 0;
+               *lost_packets = 0;
+               ret = 0;
+               goto end;
+       }
+
+       if (usess->buffer_type == LTTNG_BUFFER_PER_UID) {
+               ret = ust_app_uid_get_channel_runtime_stats(usess->id,
+                               &usess->buffer_reg_uid_list,
+                               usess->consumer, uchan->id,
+                               uchan->attr.overwrite,
+                               discarded_events,
+                               lost_packets);
+       } else if (usess->buffer_type == LTTNG_BUFFER_PER_PID) {
+               ret = ust_app_pid_get_channel_runtime_stats(usess,
+                               uchan, usess->consumer,
+                               uchan->attr.overwrite,
+                               discarded_events,
+                               lost_packets);
+               if (ret < 0) {
+                       goto end;
+               }
+               *discarded_events += uchan->per_pid_closed_app_discarded;
+               *lost_packets += uchan->per_pid_closed_app_lost;
+       } else {
+               ERR("Unsupported buffer type");
+               assert(0);
+               ret = -1;
+               goto end;
+       }
+
+end:
+       return ret;
+}
+
 /*
  * Fill lttng_channel array of all channels.
  */
-static void list_lttng_channels(int domain, struct ltt_session *session,
-               struct lttng_channel *channels)
+static ssize_t list_lttng_channels(enum lttng_domain_type domain,
+               struct ltt_session *session, struct lttng_channel *channels,
+               struct lttng_channel_extended *chan_exts)
 {
-       int i = 0;
+       int i = 0, ret = 0;
        struct ltt_kernel_channel *kchan;
 
        DBG("Listing channels for session %s", session->name);
@@ -145,9 +264,26 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
                if (session->kernel_session != NULL) {
                        cds_list_for_each_entry(kchan,
                                        &session->kernel_session->channel_list.head, list) {
+                               uint64_t discarded_events, lost_packets;
+                               struct lttng_channel_extended *extended;
+
+                               extended = (struct lttng_channel_extended *)
+                                               kchan->channel->attr.extended.ptr;
+
+                               ret = get_kernel_runtime_stats(session, kchan,
+                                               &discarded_events, &lost_packets);
+                               if (ret < 0) {
+                                       goto end;
+                               }
                                /* Copy lttng_channel struct to array */
                                memcpy(&channels[i], kchan->channel, sizeof(struct lttng_channel));
                                channels[i].enabled = kchan->enabled;
+                               chan_exts[i].discarded_events =
+                                               discarded_events;
+                               chan_exts[i].lost_packets = lost_packets;
+                               chan_exts[i].monitor_timer_interval =
+                                               extended->monitor_timer_interval;
+                               chan_exts[i].blocking_timeout = 0;
                                i++;
                        }
                }
@@ -160,7 +296,12 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
                rcu_read_lock();
                cds_lfht_for_each_entry(session->ust_session->domain_global.channels->ht,
                                &iter.iter, uchan, node.node) {
-                       strncpy(channels[i].name, uchan->name, LTTNG_SYMBOL_NAME_LEN);
+                       uint64_t discarded_events = 0, lost_packets = 0;
+
+                       if (lttng_strncpy(channels[i].name, uchan->name,
+                                       LTTNG_SYMBOL_NAME_LEN)) {
+                               break;
+                       }
                        channels[i].attr.overwrite = uchan->attr.overwrite;
                        channels[i].attr.subbuf_size = uchan->attr.subbuf_size;
                        channels[i].attr.num_subbuf = uchan->attr.num_subbuf;
@@ -171,12 +312,35 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
                        channels[i].enabled = uchan->enabled;
                        channels[i].attr.tracefile_size = uchan->tracefile_size;
                        channels[i].attr.tracefile_count = uchan->tracefile_count;
+
+                       /*
+                        * Map enum lttng_ust_output to enum lttng_event_output.
+                        */
                        switch (uchan->attr.output) {
                        case LTTNG_UST_MMAP:
-                       default:
                                channels[i].attr.output = LTTNG_EVENT_MMAP;
                                break;
+                       default:
+                               /*
+                                * LTTNG_UST_MMAP is the only supported UST
+                                * output mode.
+                                */
+                               assert(0);
+                               break;
+                       }
+
+                       chan_exts[i].monitor_timer_interval =
+                                       uchan->monitor_timer_interval;
+                       chan_exts[i].blocking_timeout =
+                               uchan->attr.u.s.blocking_timeout;
+
+                       ret = get_ust_runtime_stats(session, uchan,
+                                       &discarded_events, &lost_packets);
+                       if (ret < 0) {
+                               break;
                        }
+                       chan_exts[i].discarded_events = discarded_events;
+                       chan_exts[i].lost_packets = lost_packets;
                        i++;
                }
                rcu_read_unlock();
@@ -185,6 +349,65 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
        default:
                break;
        }
+
+end:
+       if (ret < 0) {
+               return -LTTNG_ERR_FATAL;
+       } else {
+               return LTTNG_OK;
+       }
+}
+
+static void increment_extended_len(const char *filter_expression,
+               struct lttng_event_exclusion *exclusion, size_t *extended_len)
+{
+       *extended_len += sizeof(struct lttcomm_event_extended_header);
+
+       if (filter_expression) {
+               *extended_len += strlen(filter_expression) + 1;
+       }
+
+       if (exclusion) {
+               *extended_len += exclusion->count * LTTNG_SYMBOL_NAME_LEN;
+       }
+}
+
+static void append_extended_info(const char *filter_expression,
+               struct lttng_event_exclusion *exclusion, void **extended_at)
+{
+       struct lttcomm_event_extended_header extended_header;
+       size_t filter_len = 0;
+       size_t nb_exclusions = 0;
+
+       if (filter_expression) {
+               filter_len = strlen(filter_expression) + 1;
+       }
+
+       if (exclusion) {
+               nb_exclusions = exclusion->count;
+       }
+
+       /* Set header fields */
+       extended_header.filter_len = filter_len;
+       extended_header.nb_exclusions = nb_exclusions;
+
+       /* Copy header */
+       memcpy(*extended_at, &extended_header, sizeof(extended_header));
+       *extended_at += sizeof(extended_header);
+
+       /* Copy filter string */
+       if (filter_expression) {
+               memcpy(*extended_at, filter_expression, filter_len);
+               *extended_at += filter_len;
+       }
+
+       /* Copy exclusion names */
+       if (exclusion) {
+               size_t len = nb_exclusions * LTTNG_SYMBOL_NAME_LEN;
+
+               memcpy(*extended_at, &exclusion->names, len);
+               *extended_at += len;
+       }
 }
 
 /*
@@ -193,13 +416,15 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
  * Return number of events in list on success or else a negative value.
  */
 static int list_lttng_agent_events(struct agent *agt,
-               struct lttng_event **events)
+               struct lttng_event **events, size_t *total_size)
 {
        int i = 0, ret = 0;
        unsigned int nb_event = 0;
        struct agent_event *event;
        struct lttng_event *tmp_events;
        struct lttng_ht_iter iter;
+       size_t extended_len = 0;
+       void *extended_at;
 
        assert(agt);
        assert(events);
@@ -211,24 +436,47 @@ static int list_lttng_agent_events(struct agent *agt,
        rcu_read_unlock();
        if (nb_event == 0) {
                ret = nb_event;
+               *total_size = 0;
                goto error;
        }
 
-       tmp_events = zmalloc(nb_event * sizeof(*tmp_events));
+       /* Compute required extended infos size */
+       extended_len = nb_event * sizeof(struct lttcomm_event_extended_header);
+
+       /*
+        * This is only valid because the commands which add events are
+        * processed in the same thread as the listing.
+        */
+       rcu_read_lock();
+       cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
+               increment_extended_len(event->filter_expression, NULL,
+                               &extended_len);
+       }
+       rcu_read_unlock();
+
+       *total_size = nb_event * sizeof(*tmp_events) + extended_len;
+       tmp_events = zmalloc(*total_size);
        if (!tmp_events) {
                PERROR("zmalloc agent events session");
                ret = -LTTNG_ERR_FATAL;
                goto error;
        }
 
+       extended_at = ((uint8_t *) tmp_events) +
+               nb_event * sizeof(struct lttng_event);
+
        rcu_read_lock();
        cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
                strncpy(tmp_events[i].name, event->name, sizeof(tmp_events[i].name));
                tmp_events[i].name[sizeof(tmp_events[i].name) - 1] = '\0';
                tmp_events[i].enabled = event->enabled;
-               tmp_events[i].loglevel = event->loglevel;
+               tmp_events[i].loglevel = event->loglevel_value;
                tmp_events[i].loglevel_type = event->loglevel_type;
                i++;
+
+               /* Append extended info */
+               append_extended_info(event->filter_expression, NULL,
+                               &extended_at);
        }
        rcu_read_unlock();
 
@@ -244,7 +492,8 @@ error:
  * Create a list of ust global domain events.
  */
 static int list_lttng_ust_global_events(char *channel_name,
-               struct ltt_ust_domain_global *ust_global, struct lttng_event **events)
+               struct ltt_ust_domain_global *ust_global,
+               struct lttng_event **events, size_t *total_size)
 {
        int i = 0, ret = 0;
        unsigned int nb_event = 0;
@@ -253,6 +502,8 @@ static int list_lttng_ust_global_events(char *channel_name,
        struct ltt_ust_channel *uchan;
        struct ltt_ust_event *uevent;
        struct lttng_event *tmp;
+       size_t extended_len = 0;
+       void *extended_at;
 
        DBG("Listing UST global events for channel %s", channel_name);
 
@@ -262,27 +513,51 @@ static int list_lttng_ust_global_events(char *channel_name,
        node = lttng_ht_iter_get_node_str(&iter);
        if (node == NULL) {
                ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
-               goto error;
+               goto end;
        }
 
        uchan = caa_container_of(&node->node, struct ltt_ust_channel, node.node);
 
-       nb_event += lttng_ht_get_count(uchan->events);
-
+       nb_event = lttng_ht_get_count(uchan->events);
        if (nb_event == 0) {
                ret = nb_event;
-               goto error;
+               *total_size = 0;
+               goto end;
        }
 
        DBG3("Listing UST global %d events", nb_event);
 
-       tmp = zmalloc(nb_event * sizeof(struct lttng_event));
+       /* Compute required extended infos size */
+       cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
+               if (uevent->internal) {
+                       nb_event--;
+                       continue;
+               }
+
+               increment_extended_len(uevent->filter_expression,
+                       uevent->exclusion, &extended_len);
+       }
+       if (nb_event == 0) {
+               /* All events are internal, skip. */
+               ret = 0;
+               *total_size = 0;
+               goto end;
+       }
+
+       *total_size = nb_event * sizeof(struct lttng_event) + extended_len;
+       tmp = zmalloc(*total_size);
        if (tmp == NULL) {
-               ret = LTTNG_ERR_FATAL;
-               goto error;
+               ret = -LTTNG_ERR_FATAL;
+               goto end;
        }
 
+       extended_at = ((uint8_t *) tmp) + nb_event * sizeof(struct lttng_event);
+
        cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
+               if (uevent->internal) {
+                       /* This event should remain hidden from clients */
+                       continue;
+               }
                strncpy(tmp[i].name, uevent->attr.name, LTTNG_SYMBOL_NAME_LEN);
                tmp[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
                tmp[i].enabled = uevent->enabled;
@@ -318,12 +593,15 @@ static int list_lttng_ust_global_events(char *channel_name,
                        tmp[i].exclusion = 1;
                }
                i++;
+
+               /* Append extended info */
+               append_extended_info(uevent->filter_expression,
+                       uevent->exclusion, &extended_at);
        }
 
        ret = nb_event;
        *events = tmp;
-
-error:
+end:
        rcu_read_unlock();
        return ret;
 }
@@ -332,12 +610,15 @@ error:
  * Fill lttng_event array of all kernel events in the channel.
  */
 static int list_lttng_kernel_events(char *channel_name,
-               struct ltt_kernel_session *kernel_session, struct lttng_event **events)
+               struct ltt_kernel_session *kernel_session,
+               struct lttng_event **events, size_t *total_size)
 {
        int i = 0, ret;
        unsigned int nb_event;
        struct ltt_kernel_event *event;
        struct ltt_kernel_channel *kchan;
+       size_t extended_len = 0;
+       void *extended_at;
 
        kchan = trace_kernel_get_channel_by_name(channel_name, kernel_session);
        if (kchan == NULL) {
@@ -350,21 +631,34 @@ static int list_lttng_kernel_events(char *channel_name,
        DBG("Listing events for channel %s", kchan->channel->name);
 
        if (nb_event == 0) {
+               *total_size = 0;
                *events = NULL;
-               goto syscall;
+               goto end;
+       }
+
+       /* Compute required extended infos size */
+       cds_list_for_each_entry(event, &kchan->events_list.head, list) {
+               increment_extended_len(event->filter_expression, NULL,
+                       &extended_len);
        }
 
-       *events = zmalloc(nb_event * sizeof(struct lttng_event));
+       *total_size = nb_event * sizeof(struct lttng_event) + extended_len;
+       *events = zmalloc(*total_size);
        if (*events == NULL) {
                ret = LTTNG_ERR_FATAL;
                goto error;
        }
 
+       extended_at = ((void *) *events) +
+               nb_event * sizeof(struct lttng_event);
+
        /* Kernel channels */
        cds_list_for_each_entry(event, &kchan->events_list.head , list) {
                strncpy((*events)[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
                (*events)[i].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
                (*events)[i].enabled = event->enabled;
+               (*events)[i].filter =
+                               (unsigned char) !!event->filter_expression;
 
                switch (event->event->instrumentation) {
                case LTTNG_KERNEL_TRACEPOINT:
@@ -396,21 +690,13 @@ static int list_lttng_kernel_events(char *channel_name,
                        break;
                }
                i++;
-       }
-
-syscall:
-       if (syscall_table) {
-               ssize_t new_size;
 
-               new_size = syscall_list_channel(kchan, events, nb_event);
-               if (new_size < 0) {
-                       free(events);
-                       ret = -new_size;
-                       goto error;
-               }
-               nb_event = new_size;
+               /* Append extended info */
+               append_extended_info(event->filter_expression, NULL,
+                       &extended_at);
        }
 
+end:
        return nb_event;
 
 error:
@@ -423,7 +709,8 @@ error:
  * domain adding the default trace directory.
  */
 static int add_uri_to_consumer(struct consumer_output *consumer,
-               struct lttng_uri *uri, int domain, const char *session_name)
+               struct lttng_uri *uri, enum lttng_domain_type domain,
+               const char *session_name)
 {
        int ret = LTTNG_OK;
        const char *default_trace_dir;
@@ -502,14 +789,17 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
                break;
        case LTTNG_DST_PATH:
                DBG2("Setting trace directory path from URI to %s", uri->dst.path);
-               memset(consumer->dst.trace_path, 0,
-                               sizeof(consumer->dst.trace_path));
-               strncpy(consumer->dst.trace_path, uri->dst.path,
-                               sizeof(consumer->dst.trace_path));
+               memset(consumer->dst.session_root_path, 0,
+                               sizeof(consumer->dst.session_root_path));
+               /* Explicit length checks for strcpy and strcat. */
+               if (strlen(uri->dst.path) + strlen(default_trace_dir)
+                               >= sizeof(consumer->dst.session_root_path)) {
+                       ret = LTTNG_ERR_FATAL;
+                       goto error;
+               }
+               strcpy(consumer->dst.session_root_path, uri->dst.path);
                /* Append default trace dir */
-               strncat(consumer->dst.trace_path, default_trace_dir,
-                               sizeof(consumer->dst.trace_path) -
-                               strlen(consumer->dst.trace_path) - 1);
+               strcat(consumer->dst.session_root_path, default_trace_dir);
                /* Flag consumer as local. */
                consumer->type = CONSUMER_DST_LOCAL;
                break;
@@ -559,7 +849,8 @@ error:
  * Else, it's stays untouched and a lttcomm error code is returned.
  */
 static int create_connect_relayd(struct lttng_uri *uri,
-               struct lttcomm_relayd_sock **relayd_sock)
+               struct lttcomm_relayd_sock **relayd_sock,
+               struct consumer_output *consumer)
 {
        int ret;
        struct lttcomm_relayd_sock *rsock;
@@ -591,10 +882,15 @@ static int create_connect_relayd(struct lttng_uri *uri,
 
                /* Check relayd version */
                ret = relayd_version_check(rsock);
-               if (ret < 0) {
-                       ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
+               if (ret == LTTNG_ERR_RELAYD_VERSION_FAIL) {
+                       goto close_sock;
+               } else if (ret < 0) {
+                       ERR("Unable to reach lttng-relayd");
+                       ret = LTTNG_ERR_RELAYD_CONNECT_FAIL;
                        goto close_sock;
                }
+               consumer->relay_major_version = rsock->major;
+               consumer->relay_minor_version = rsock->minor;
        } else if (uri->stype == LTTNG_STREAM_DATA) {
                DBG3("Creating relayd data socket from URI");
        } else {
@@ -619,9 +915,12 @@ error:
 
 /*
  * Connect to the relayd using URI and send the socket to the right consumer.
+ *
+ * The consumer socket lock must be held by the caller.
  */
-static int send_consumer_relayd_socket(int domain, unsigned int session_id,
-               struct lttng_uri *relayd_uri, struct consumer_output *consumer,
+static int send_consumer_relayd_socket(unsigned int session_id,
+               struct lttng_uri *relayd_uri,
+               struct consumer_output *consumer,
                struct consumer_socket *consumer_sock,
                char *session_name, char *hostname, int session_live_timer)
 {
@@ -629,9 +928,9 @@ static int send_consumer_relayd_socket(int domain, unsigned int session_id,
        struct lttcomm_relayd_sock *rsock = NULL;
 
        /* Connect to relayd and make version check if uri is the control. */
-       ret = create_connect_relayd(relayd_uri, &rsock);
+       ret = create_connect_relayd(relayd_uri, &rsock, consumer);
        if (ret != LTTNG_OK) {
-               goto error;
+               goto relayd_comm_error;
        }
        assert(rsock);
 
@@ -671,10 +970,6 @@ static int send_consumer_relayd_socket(int domain, unsigned int session_id,
         */
 
 close_sock:
-       (void) relayd_close(rsock);
-       free(rsock);
-
-error:
        if (ret != LTTNG_OK) {
                /*
                 * The consumer output for this session should not be used anymore
@@ -683,6 +978,10 @@ error:
                 */
                consumer->enabled = 0;
        }
+       (void) relayd_close(rsock);
+       free(rsock);
+
+relayd_comm_error:
        return ret;
 }
 
@@ -690,10 +989,13 @@ error:
  * Send both relayd sockets to a specific consumer and domain.  This is a
  * helper function to facilitate sending the information to the consumer for a
  * session.
+ *
+ * The consumer socket lock must be held by the caller.
  */
-static int send_consumer_relayd_sockets(int domain, unsigned int session_id,
-               struct consumer_output *consumer, struct consumer_socket *sock,
-               char *session_name, char *hostname, int session_live_timer)
+static int send_consumer_relayd_sockets(enum lttng_domain_type domain,
+               unsigned int session_id, struct consumer_output *consumer,
+               struct consumer_socket *sock, char *session_name,
+               char *hostname, int session_live_timer)
 {
        int ret = LTTNG_OK;
 
@@ -702,7 +1004,7 @@ static int send_consumer_relayd_sockets(int domain, unsigned int session_id,
 
        /* Sending control relayd socket. */
        if (!sock->control_sock_sent) {
-               ret = send_consumer_relayd_socket(domain, session_id,
+               ret = send_consumer_relayd_socket(session_id,
                                &consumer->dst.net.control, consumer, sock,
                                session_name, hostname, session_live_timer);
                if (ret != LTTNG_OK) {
@@ -712,7 +1014,7 @@ static int send_consumer_relayd_sockets(int domain, unsigned int session_id,
 
        /* Sending data relayd socket. */
        if (!sock->data_sock_sent) {
-               ret = send_consumer_relayd_socket(domain, session_id,
+               ret = send_consumer_relayd_socket(session_id,
                                &consumer->dst.net.data, consumer, sock,
                                session_name, hostname, session_live_timer);
                if (ret != LTTNG_OK) {
@@ -763,6 +1065,10 @@ int cmd_setup_relayd(struct ltt_session *session)
                        /* Session is now ready for network streaming. */
                        session->net_handle = 1;
                }
+               session->consumer->relay_major_version =
+                       usess->consumer->relay_major_version;
+               session->consumer->relay_minor_version =
+                       usess->consumer->relay_minor_version;
        }
 
        if (ksess && ksess->consumer && ksess->consumer->type == CONSUMER_DST_NET
@@ -781,6 +1087,10 @@ int cmd_setup_relayd(struct ltt_session *session)
                        /* Session is now ready for network streaming. */
                        session->net_handle = 1;
                }
+               session->consumer->relay_major_version =
+                       ksess->consumer->relay_major_version;
+               session->consumer->relay_minor_version =
+                       ksess->consumer->relay_minor_version;
        }
 
 error:
@@ -843,7 +1153,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
        }
 
        /* Quiescent wait after starting trace */
-       kernel_wait_quiescent(kernel_tracer_fd);
+       kernel_wait_quiescent(wpipe);
 
        ksess->active = 1;
 
@@ -856,8 +1166,8 @@ error:
 /*
  * Command LTTNG_DISABLE_CHANNEL processed by the client thread.
  */
-int cmd_disable_channel(struct ltt_session *session, int domain,
-               char *channel_name)
+int cmd_disable_channel(struct ltt_session *session,
+               enum lttng_domain_type domain, char *channel_name)
 {
        int ret;
        struct ltt_ust_session *usess;
@@ -914,7 +1224,8 @@ error:
  *
  * Called with session lock held.
  */
-int cmd_track_pid(struct ltt_session *session, int domain, int pid)
+int cmd_track_pid(struct ltt_session *session, enum lttng_domain_type domain,
+               int pid)
 {
        int ret;
 
@@ -964,7 +1275,8 @@ error:
  *
  * Called with session lock held.
  */
-int cmd_untrack_pid(struct ltt_session *session, int domain, int pid)
+int cmd_untrack_pid(struct ltt_session *session, enum lttng_domain_type domain,
+               int pid)
 {
        int ret;
 
@@ -1026,7 +1338,7 @@ int cmd_enable_channel(struct ltt_session *session,
        assert(attr);
        assert(domain);
 
-       len = strnlen(attr->name, sizeof(attr->name));
+       len = lttng_strnlen(attr->name, sizeof(attr->name));
 
        /* Validate channel name */
        if (attr->name[0] == '.' ||
@@ -1058,13 +1370,33 @@ int cmd_enable_channel(struct ltt_session *session,
                attr->attr.switch_timer_interval = 0;
        }
 
-       /*
-        * The ringbuffer (both in user space and kernel) behave badly in overwrite
-        * mode and with less than 2 subbuf so block it right away and send back an
-        * invalid attribute error.
-        */
-       if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
-               ret = LTTNG_ERR_INVALID;
+       /* Check for feature support */
+       switch (domain->type) {
+       case LTTNG_DOMAIN_KERNEL:
+       {
+               if (kernel_supports_ring_buffer_snapshot_sample_positions(kernel_tracer_fd) != 1) {
+                       /* Sampling position of buffer is not supported */
+                       WARN("Kernel tracer does not support buffer monitoring. "
+                                       "Setting the monitor interval timer to 0 "
+                                       "(disabled) for channel '%s' of session '%s'",
+                                       attr-> name, session->name);
+                       lttng_channel_set_monitor_timer_interval(attr, 0);
+               }
+               break;
+       }
+       case LTTNG_DOMAIN_UST:
+               break;
+       case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
+       case LTTNG_DOMAIN_PYTHON:
+               if (!agent_tracing_is_enabled()) {
+                       DBG("Attempted to enable a channel in an agent domain but the agent thread is not running");
+                       ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+                       goto error;
+               }
+               break;
+       default:
+               ret = LTTNG_ERR_UNKNOWN_DOMAIN;
                goto error;
        }
 
@@ -1092,9 +1424,40 @@ int cmd_enable_channel(struct ltt_session *session,
                break;
        }
        case LTTNG_DOMAIN_UST:
+       case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
+       case LTTNG_DOMAIN_PYTHON:
        {
                struct ltt_ust_channel *uchan;
 
+               /*
+                * FIXME
+                *
+                * Current agent implementation limitations force us to allow
+                * only one channel at once in "agent" subdomains. Each
+                * subdomain has a default channel name which must be strictly
+                * adhered to.
+                */
+               if (domain->type == LTTNG_DOMAIN_JUL) {
+                       if (strncmp(attr->name, DEFAULT_JUL_CHANNEL_NAME,
+                                       LTTNG_SYMBOL_NAME_LEN)) {
+                               ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+                               goto error;
+                       }
+               } else if (domain->type == LTTNG_DOMAIN_LOG4J) {
+                       if (strncmp(attr->name, DEFAULT_LOG4J_CHANNEL_NAME,
+                                       LTTNG_SYMBOL_NAME_LEN)) {
+                               ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+                               goto error;
+                       }
+               } else if (domain->type == LTTNG_DOMAIN_PYTHON) {
+                       if (strncmp(attr->name, DEFAULT_PYTHON_CHANNEL_NAME,
+                                       LTTNG_SYMBOL_NAME_LEN)) {
+                               ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
+                               goto error;
+                       }
+               }
+
                chan_ht = usess->domain_global.channels;
 
                uchan = trace_ust_find_channel_by_name(chan_ht, attr->name);
@@ -1122,8 +1485,8 @@ end:
 /*
  * Command LTTNG_DISABLE_EVENT processed by the client thread.
  */
-int cmd_disable_event(struct ltt_session *session, int domain,
-               char *channel_name,
+int cmd_disable_event(struct ltt_session *session,
+               enum lttng_domain_type domain, char *channel_name,
                struct lttng_event *event)
 {
        int ret;
@@ -1136,7 +1499,8 @@ int cmd_disable_event(struct ltt_session *session, int domain,
        /* Error out on unhandled search criteria */
        if (event->loglevel_type || event->loglevel != -1 || event->enabled
                        || event->pid || event->filter || event->exclusion) {
-               return LTTNG_ERR_UNK;
+               ret = LTTNG_ERR_UNK;
+               goto error;
        }
 
        rcu_read_lock();
@@ -1156,46 +1520,36 @@ int cmd_disable_event(struct ltt_session *session, int domain,
                 */
                if (ksess->has_non_default_channel && channel_name[0] == '\0') {
                        ret = LTTNG_ERR_NEED_CHANNEL_NAME;
-                       goto error;
+                       goto error_unlock;
                }
 
                kchan = trace_kernel_get_channel_by_name(channel_name, ksess);
                if (kchan == NULL) {
                        ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
-                       goto error;
+                       goto error_unlock;
                }
 
                switch (event->type) {
                case LTTNG_EVENT_ALL:
-                       ret = event_kernel_disable_event_all(kchan);
-                       if (ret != LTTNG_OK) {
-                               goto error;
-                       }
-                       break;
-               case LTTNG_EVENT_TRACEPOINT:    /* fall-through */
+               case LTTNG_EVENT_TRACEPOINT:
                case LTTNG_EVENT_SYSCALL:
-                       if (!strcmp(event_name, "*")) {
-                               ret = event_kernel_disable_event_type(kchan,
-                                       event->type);
+               case LTTNG_EVENT_PROBE:
+               case LTTNG_EVENT_FUNCTION:
+               case LTTNG_EVENT_FUNCTION_ENTRY:/* fall-through */
+                       if (event_name[0] == '\0') {
+                               ret = event_kernel_disable_event(kchan,
+                                       NULL, event->type);
                        } else {
                                ret = event_kernel_disable_event(kchan,
-                                       event_name);
-                       }
-                       if (ret != LTTNG_OK) {
-                               goto error;
+                                       event_name, event->type);
                        }
-                       break;
-               case LTTNG_EVENT_PROBE:
-               case LTTNG_EVENT_FUNCTION:
-               case LTTNG_EVENT_FUNCTION_ENTRY:
-                       ret = event_kernel_disable_event(kchan, event_name);
                        if (ret != LTTNG_OK) {
-                               goto error;
+                               goto error_unlock;
                        }
                        break;
                default:
                        ret = LTTNG_ERR_UNK;
-                       goto error;
+                       goto error_unlock;
                }
 
                kernel_wait_quiescent(kernel_tracer_fd);
@@ -1208,33 +1562,47 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
                usess = session->ust_session;
 
+               if (validate_ust_event_name(event_name)) {
+                       ret = LTTNG_ERR_INVALID_EVENT_NAME;
+                       goto error_unlock;
+               }
+
                /*
                 * If a non-default channel has been created in the
-                * session, explicitely require that -c chan_name needs
+                * session, explicitly require that -c chan_name needs
                 * to be provided.
                 */
                if (usess->has_non_default_channel && channel_name[0] == '\0') {
                        ret = LTTNG_ERR_NEED_CHANNEL_NAME;
-                       goto error;
+                       goto error_unlock;
                }
 
                uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
                                channel_name);
                if (uchan == NULL) {
                        ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
-                       goto error;
+                       goto error_unlock;
                }
 
                switch (event->type) {
                case LTTNG_EVENT_ALL:
-                       ret = event_ust_disable_tracepoint(usess, uchan, event_name);
+                       /*
+                        * An empty event name means that everything
+                        * should be disabled.
+                        */
+                       if (event->name[0] == '\0') {
+                               ret = event_ust_disable_all_tracepoints(usess, uchan);
+                       } else {
+                               ret = event_ust_disable_tracepoint(usess, uchan,
+                                               event_name);
+                       }
                        if (ret != LTTNG_OK) {
-                               goto error;
+                               goto error_unlock;
                        }
                        break;
                default:
                        ret = LTTNG_ERR_UNK;
-                       goto error;
+                       goto error_unlock;
                }
 
                DBG3("Disable UST event %s in channel %s completed", event_name,
@@ -1255,45 +1623,65 @@ int cmd_disable_event(struct ltt_session *session, int domain,
                        break;
                default:
                        ret = LTTNG_ERR_UNK;
-                       goto error;
+                       goto error_unlock;
                }
 
                agt = trace_ust_find_agent(usess, domain);
                if (!agt) {
                        ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
-                       goto error;
+                       goto error_unlock;
                }
-               /* The wild card * means that everything should be disabled. */
-               if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
+               /*
+                * An empty event name means that everything
+                * should be disabled.
+                */
+               if (event->name[0] == '\0') {
                        ret = event_agent_disable_all(usess, agt);
                } else {
                        ret = event_agent_disable(usess, agt, event_name);
                }
                if (ret != LTTNG_OK) {
-                       goto error;
+                       goto error_unlock;
                }
 
                break;
        }
        default:
                ret = LTTNG_ERR_UND;
-               goto error;
+               goto error_unlock;
        }
 
        ret = LTTNG_OK;
 
-error:
+error_unlock:
        rcu_read_unlock();
+error:
        return ret;
 }
 
 /*
  * Command LTTNG_ADD_CONTEXT processed by the client thread.
  */
-int cmd_add_context(struct ltt_session *session, int domain,
+int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
                char *channel_name, struct lttng_event_context *ctx, int kwpipe)
 {
        int ret, chan_kern_created = 0, chan_ust_created = 0;
+       char *app_ctx_provider_name = NULL, *app_ctx_name = NULL;
+
+       /*
+        * Don't try to add a context if the session has been started at
+        * some point in time before. The tracer does not allow it and would
+        * result in a corrupted trace.
+        */
+       if (session->has_been_started) {
+               ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
+               goto end;
+       }
+
+       if (ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+               app_ctx_provider_name = ctx->u.app_ctx.provider_name;
+               app_ctx_name = ctx->u.app_ctx.ctx_name;
+       }
 
        switch (domain) {
        case LTTNG_DOMAIN_KERNEL:
@@ -1313,6 +1701,29 @@ int cmd_add_context(struct ltt_session *session, int domain,
                        goto error;
                }
                break;
+       case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
+       {
+               /*
+                * Validate channel name.
+                * If no channel name is given and the domain is JUL or LOG4J,
+                * set it to the appropriate domain-specific channel name. If
+                * a name is provided but does not match the expexted channel
+                * name, return an error.
+                */
+               if (domain == LTTNG_DOMAIN_JUL && *channel_name &&
+                               strcmp(channel_name,
+                               DEFAULT_JUL_CHANNEL_NAME)) {
+                       ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+                       goto error;
+               } else if (domain == LTTNG_DOMAIN_LOG4J && *channel_name &&
+                               strcmp(channel_name,
+                               DEFAULT_LOG4J_CHANNEL_NAME)) {
+                       ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+                       goto error;
+               }
+               /* break is _not_ missing here. */
+       }
        case LTTNG_DOMAIN_UST:
        {
                struct ltt_ust_session *usess = session->ust_session;
@@ -1335,11 +1746,15 @@ int cmd_add_context(struct ltt_session *session, int domain,
                                free(attr);
                                goto error;
                        }
-                       free(attr);
+                       channel_attr_destroy(attr);
                        chan_ust_created = 1;
                }
 
                ret = context_ust_add(usess, domain, ctx, channel_name);
+               free(app_ctx_provider_name);
+               free(app_ctx_name);
+               app_ctx_name = NULL;
+               app_ctx_provider_name = NULL;
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -1350,8 +1765,9 @@ int cmd_add_context(struct ltt_session *session, int domain,
                goto error;
        }
 
-       return LTTNG_OK;
-
+       ret = LTTNG_OK;
+       goto end;
+
 error:
        if (chan_kern_created) {
                struct ltt_kernel_channel *kchan =
@@ -1374,66 +1790,83 @@ error:
                                uchan);
                trace_ust_destroy_channel(uchan);
        }
+end:
+       free(app_ctx_provider_name);
+       free(app_ctx_name);
        return ret;
 }
 
-static int validate_event_name(const char *name)
+static inline bool name_starts_with(const char *name, const char *prefix)
+{
+       const size_t max_cmp_len = min(strlen(prefix), LTTNG_SYMBOL_NAME_LEN);
+
+       return !strncmp(name, prefix, max_cmp_len);
+}
+
+/* Perform userspace-specific event name validation */
+static int validate_ust_event_name(const char *name)
 {
        int ret = 0;
-       const char *c = name;
-       const char *event_name_end = c + LTTNG_SYMBOL_NAME_LEN;
+
+       if (!name) {
+               ret = -1;
+               goto end;
+       }
 
        /*
-        * Make sure that unescaped wildcards are only used as the last
-        * character of the event name.
+        * Check name against all internal UST event component namespaces used
+        * by the agents.
         */
-       while (c < event_name_end) {
-               switch (*c) {
-               case '\0':
-                       goto end;
-               case '\\':
-                       c++;
-                       break;
-               case '*':
-                       if ((c + 1) < event_name_end && *(c + 1)) {
-                               /* Wildcard is not the last character */
-                               ret = LTTNG_ERR_INVALID_EVENT_NAME;
-                               goto end;
-                       }
-               default:
-                       break;
-               }
-               c++;
+       if (name_starts_with(name, DEFAULT_JUL_EVENT_COMPONENT) ||
+               name_starts_with(name, DEFAULT_LOG4J_EVENT_COMPONENT) ||
+               name_starts_with(name, DEFAULT_PYTHON_EVENT_COMPONENT)) {
+               ret = -1;
        }
+
 end:
        return ret;
 }
 
 /*
- * Command LTTNG_ENABLE_EVENT processed by the client thread.
- * We own filter, exclusion, and filter_expression.
+ * Internal version of cmd_enable_event() with a supplemental
+ * "internal_event" flag which is used to enable internal events which should
+ * be hidden from clients. Such events are used in the agent implementation to
+ * enable the events through which all "agent" events are funeled.
  */
-int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
+static int _cmd_enable_event(struct ltt_session *session,
+               struct lttng_domain *domain,
                char *channel_name, struct lttng_event *event,
                char *filter_expression,
                struct lttng_filter_bytecode *filter,
                struct lttng_event_exclusion *exclusion,
-               int wpipe)
+               int wpipe, bool internal_event)
 {
-       int ret, channel_created = 0;
-       struct lttng_channel *attr;
+       int ret = 0, channel_created = 0;
+       struct lttng_channel *attr = NULL;
 
        assert(session);
        assert(event);
        assert(channel_name);
 
-       DBG("Enable event command for event \'%s\'", event->name);
+       /* If we have a filter, we must have its filter expression */
+       assert(!(!!filter_expression ^ !!filter));
 
-       ret = validate_event_name(event->name);
-       if (ret) {
-               goto error;
+       /* Normalize event name as a globbing pattern */
+       strutils_normalize_star_glob_pattern(event->name);
+
+       /* Normalize exclusion names as globbing patterns */
+       if (exclusion) {
+               size_t i;
+
+               for (i = 0; i < exclusion->count; i++) {
+                       char *name = LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, i);
+
+                       strutils_normalize_star_glob_pattern(name);
+               }
        }
 
+       DBG("Enable event command for event \'%s\'", event->name);
+
        rcu_read_lock();
 
        switch (domain->type) {
@@ -1461,15 +1894,16 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                                ret = LTTNG_ERR_FATAL;
                                goto error;
                        }
-                       strncpy(attr->name, channel_name, sizeof(attr->name));
+                       if (lttng_strncpy(attr->name, channel_name,
+                                       sizeof(attr->name))) {
+                               ret = LTTNG_ERR_INVALID;
+                               goto error;
+                       }
 
                        ret = cmd_enable_channel(session, domain, attr, wpipe);
                        if (ret != LTTNG_OK) {
-                               free(attr);
                                goto error;
                        }
-                       free(attr);
-
                        channel_created = 1;
                }
 
@@ -1512,6 +1946,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                        event->type = LTTNG_EVENT_TRACEPOINT;   /* Hack */
                        ret = event_kernel_enable_event(kchan, event,
                                filter_expression, filter);
+                       /* We have passed ownership */
+                       filter_expression = NULL;
+                       filter = NULL;
                        if (ret != LTTNG_OK) {
                                if (channel_created) {
                                        /* Let's not leak a useless channel. */
@@ -1524,9 +1961,10 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                        event->type = LTTNG_EVENT_SYSCALL;      /* Hack */
                        ret = event_kernel_enable_event(kchan, event,
                                filter_expression_a, filter_a);
+                       /* We have passed ownership */
+                       filter_expression_a = NULL;
+                       filter_a = NULL;
                        if (ret != LTTNG_OK) {
-                               free(filter_expression_a);
-                               free(filter_a);
                                goto error;
                        }
                        break;
@@ -1537,6 +1975,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                case LTTNG_EVENT_TRACEPOINT:
                        ret = event_kernel_enable_event(kchan, event,
                                filter_expression, filter);
+                       /* We have passed ownership */
+                       filter_expression = NULL;
+                       filter = NULL;
                        if (ret != LTTNG_OK) {
                                if (channel_created) {
                                        /* Let's not leak a useless channel. */
@@ -1548,6 +1989,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                case LTTNG_EVENT_SYSCALL:
                        ret = event_kernel_enable_event(kchan, event,
                                filter_expression, filter);
+                       /* We have passed ownership */
+                       filter_expression = NULL;
+                       filter = NULL;
                        if (ret != LTTNG_OK) {
                                goto error;
                        }
@@ -1588,14 +2032,16 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                                ret = LTTNG_ERR_FATAL;
                                goto error;
                        }
-                       strncpy(attr->name, channel_name, sizeof(attr->name));
+                       if (lttng_strncpy(attr->name, channel_name,
+                                       sizeof(attr->name))) {
+                               ret = LTTNG_ERR_INVALID;
+                               goto error;
+                       }
 
                        ret = cmd_enable_channel(session, domain, attr, wpipe);
                        if (ret != LTTNG_OK) {
-                               free(attr);
                                goto error;
                        }
-                       free(attr);
 
                        /* Get the newly created channel reference back */
                        uchan = trace_ust_find_channel_by_name(
@@ -1603,14 +2049,42 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                        assert(uchan);
                }
 
+               if (uchan->domain != LTTNG_DOMAIN_UST && !internal_event) {
+                       /*
+                        * Don't allow users to add UST events to channels which
+                        * are assigned to a userspace subdomain (JUL, Log4J,
+                        * Python, etc.).
+                        */
+                       ret = LTTNG_ERR_INVALID_CHANNEL_DOMAIN;
+                       goto error;
+               }
+
+               if (!internal_event) {
+                       /*
+                        * Ensure the event name is not reserved for internal
+                        * use.
+                        */
+                       ret = validate_ust_event_name(event->name);
+                       if (ret) {
+                               WARN("Userspace event name %s failed validation.",
+                                               event->name ?
+                                               event->name : "NULL");
+                               ret = LTTNG_ERR_INVALID_EVENT_NAME;
+                               goto error;
+                       }
+               }
+
                /* At this point, the session and channel exist on the tracer */
                ret = event_ust_enable_tracepoint(usess, uchan, event,
-                               filter_expression, filter, exclusion);
+                               filter_expression, filter, exclusion,
+                               internal_event);
                /* We have passed ownership */
                filter_expression = NULL;
                filter = NULL;
                exclusion = NULL;
-               if (ret != LTTNG_OK) {
+               if (ret == LTTNG_ERR_UST_EVENT_ENABLED) {
+                       goto already_enabled;
+               } else if (ret != LTTNG_OK) {
                        goto error;
                }
                break;
@@ -1627,11 +2101,17 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
                assert(usess);
 
+               if (!agent_tracing_is_enabled()) {
+                       DBG("Attempted to enable an event in an agent domain but the agent thread is not running");
+                       ret = LTTNG_ERR_AGENT_TRACING_DISABLED;
+                       goto error;
+               }
+
                agt = trace_ust_find_agent(usess, domain->type);
                if (!agt) {
                        agt = agent_create(domain->type);
                        if (!agt) {
-                               ret = -LTTNG_ERR_NOMEM;
+                               ret = LTTNG_ERR_NOMEM;
                                goto error;
                        }
                        agent_add(agt, usess->agents);
@@ -1641,9 +2121,10 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                memset(&uevent, 0, sizeof(uevent));
                uevent.type = LTTNG_EVENT_TRACEPOINT;
                uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-               default_event_name = event_get_default_agent_ust_name(domain->type);
+               default_event_name = event_get_default_agent_ust_name(
+                               domain->type);
                if (!default_event_name) {
-                       ret = -LTTNG_ERR_FATAL;
+                       ret = LTTNG_ERR_FATAL;
                        goto error;
                }
                strncpy(uevent.name, default_event_name, sizeof(uevent.name));
@@ -1668,46 +2149,61 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                        default_chan_name = DEFAULT_PYTHON_CHANNEL_NAME;
                        break;
                default:
-                       /* The switch/case we are in should avoid this else big problem */
+                       /* The switch/case we are in makes this impossible */
                        assert(0);
                }
 
                {
+                       char *filter_expression_copy = NULL;
                        struct lttng_filter_bytecode *filter_copy = NULL;
 
                        if (filter) {
-                               filter_copy = zmalloc(
-                                       sizeof(struct lttng_filter_bytecode)
-                                       + filter->len);
+                               const size_t filter_size = sizeof(
+                                               struct lttng_filter_bytecode)
+                                               + filter->len;
+
+                               filter_copy = zmalloc(filter_size);
                                if (!filter_copy) {
+                                       ret = LTTNG_ERR_NOMEM;
                                        goto error;
                                }
+                               memcpy(filter_copy, filter, filter_size);
+
+                               filter_expression_copy =
+                                               strdup(filter_expression);
+                               if (!filter_expression) {
+                                       ret = LTTNG_ERR_NOMEM;
+                               }
 
-                               memcpy(filter_copy, filter,
-                                       sizeof(struct lttng_filter_bytecode)
-                                       + filter->len);
+                               if (!filter_expression_copy || !filter_copy) {
+                                       free(filter_expression_copy);
+                                       free(filter_copy);
+                                       goto error;
+                               }
                        }
 
-                       ret = cmd_enable_event(session, &tmp_dom,
+                       ret = cmd_enable_event_internal(session, &tmp_dom,
                                        (char *) default_chan_name,
-                                       &uevent, filter_expression, filter_copy,
-                                       NULL, wpipe);
-                       /* We have passed ownership */
-                       filter_expression = NULL;
+                                       &uevent, filter_expression_copy,
+                                       filter_copy, NULL, wpipe);
                }
 
-               if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
+               if (ret == LTTNG_ERR_UST_EVENT_ENABLED) {
+                       goto already_enabled;
+               } else if (ret != LTTNG_OK) {
                        goto error;
                }
 
                /* The wild card * means that everything should be enabled. */
                if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-                       ret = event_agent_enable_all(usess, agt, event, filter);
-                       filter = NULL;
+                       ret = event_agent_enable_all(usess, agt, event, filter,
+                                       filter_expression);
                } else {
-                       ret = event_agent_enable(usess, agt, event, filter);
-                       filter = NULL;
+                       ret = event_agent_enable(usess, agt, event, filter,
+                                       filter_expression);
                }
+               filter = NULL;
+               filter_expression = NULL;
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -1721,18 +2217,53 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
        ret = LTTNG_OK;
 
+already_enabled:
 error:
        free(filter_expression);
        free(filter);
        free(exclusion);
+       channel_attr_destroy(attr);
        rcu_read_unlock();
        return ret;
 }
 
+/*
+ * Command LTTNG_ENABLE_EVENT processed by the client thread.
+ * We own filter, exclusion, and filter_expression.
+ */
+int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
+               char *channel_name, struct lttng_event *event,
+               char *filter_expression,
+               struct lttng_filter_bytecode *filter,
+               struct lttng_event_exclusion *exclusion,
+               int wpipe)
+{
+       return _cmd_enable_event(session, domain, channel_name, event,
+                       filter_expression, filter, exclusion, wpipe, false);
+}
+
+/*
+ * Enable an event which is internal to LTTng. An internal should
+ * never be made visible to clients and are immune to checks such as
+ * reserved names.
+ */
+static int cmd_enable_event_internal(struct ltt_session *session,
+               struct lttng_domain *domain,
+               char *channel_name, struct lttng_event *event,
+               char *filter_expression,
+               struct lttng_filter_bytecode *filter,
+               struct lttng_event_exclusion *exclusion,
+               int wpipe)
+{
+       return _cmd_enable_event(session, domain, channel_name, event,
+                       filter_expression, filter, exclusion, wpipe, true);
+}
+
 /*
  * Command LTTNG_LIST_TRACEPOINTS processed by the client thread.
  */
-ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
+ssize_t cmd_list_tracepoints(enum lttng_domain_type domain,
+               struct lttng_event **events)
 {
        int ret;
        ssize_t nb_events = 0;
@@ -1776,7 +2307,7 @@ error:
 /*
  * Command LTTNG_LIST_TRACEPOINT_FIELDS processed by the client thread.
  */
-ssize_t cmd_list_tracepoint_fields(int domain,
+ssize_t cmd_list_tracepoint_fields(enum lttng_domain_type domain,
                struct lttng_event_field **fields)
 {
        int ret;
@@ -1814,7 +2345,7 @@ ssize_t cmd_list_syscalls(struct lttng_event **events)
  * Called with session lock held.
  */
 ssize_t cmd_list_tracker_pids(struct ltt_session *session,
-               int domain, int32_t **pids)
+               enum lttng_domain_type domain, int32_t **pids)
 {
        int ret;
        ssize_t nr_pids = 0;
@@ -1859,6 +2390,113 @@ error:
        return -ret;
 }
 
+static
+int domain_mkdir(const struct consumer_output *output,
+               const struct ltt_session *session,
+               uid_t uid, gid_t gid)
+{
+       struct consumer_socket *socket;
+       struct lttng_ht_iter iter;
+       int ret;
+       char *path = NULL;
+
+       if (!output || !output->socks) {
+               ERR("No consumer output found");
+               ret = -1;
+               goto end;
+       }
+
+       path = zmalloc(LTTNG_PATH_MAX * sizeof(char));
+       if (!path) {
+               ERR("Cannot allocate mkdir path");
+               ret = -1;
+               goto end;
+       }
+
+       ret = snprintf(path, LTTNG_PATH_MAX, "%s%s%s",
+                       session_get_base_path(session),
+                       output->chunk_path, output->subdir);
+       if (ret < 0 || ret >= LTTNG_PATH_MAX) {
+               ERR("Format path");
+               ret = -1;
+               goto end;
+       }
+
+       DBG("Domain mkdir %s for session %" PRIu64, path, session->id);
+       rcu_read_lock();
+       /*
+        * We have to iterate to find a socket, but we only need to send the
+        * rename command to one consumer, so we break after the first one.
+        */
+       cds_lfht_for_each_entry(output->socks->ht, &iter.iter, socket, node.node) {
+               pthread_mutex_lock(socket->lock);
+               ret = consumer_mkdir(socket, session->id, output, path, uid, gid);
+               pthread_mutex_unlock(socket->lock);
+               if (ret) {
+                       ERR("Consumer mkdir");
+                       ret = -1;
+                       goto end_unlock;
+               }
+               break;
+       }
+
+       ret = 0;
+
+end_unlock:
+       rcu_read_unlock();
+end:
+       free(path);
+       return ret;
+}
+
+static
+int session_mkdir(const struct ltt_session *session)
+{
+       int ret;
+       struct consumer_output *output;
+       uid_t uid;
+       gid_t gid;
+
+       /*
+        * Unsupported feature in lttng-relayd before 2.11, not an error since it
+        * is only needed for session rotation and the user will get an error
+        * on rotate.
+        */
+       if (session->consumer->type == CONSUMER_DST_NET &&
+                       session->consumer->relay_major_version == 2 &&
+                       session->consumer->relay_minor_version < 11) {
+               ret = 0;
+               goto end;
+       }
+
+       if (session->kernel_session) {
+               output = session->kernel_session->consumer;
+               uid = session->kernel_session->uid;
+               gid = session->kernel_session->gid;
+               ret = domain_mkdir(output, session, uid, gid);
+               if (ret) {
+                       ERR("Mkdir kernel");
+                       goto end;
+               }
+       }
+
+       if (session->ust_session) {
+               output = session->ust_session->consumer;
+               uid = session->ust_session->uid;
+               gid = session->ust_session->gid;
+               ret = domain_mkdir(output, session, uid, gid);
+               if (ret) {
+                       ERR("Mkdir UST");
+                       goto end;
+               }
+       }
+
+       ret = 0;
+
+end:
+       return ret;
+}
+
 /*
  * Command LTTNG_START_TRACE processed by the client thread.
  *
@@ -1888,9 +2526,7 @@ int cmd_start_trace(struct ltt_session *session)
         * possible to enable channel thus inform the client.
         */
        if (usess && usess->domain_global.channels) {
-               rcu_read_lock();
                nb_chan += lttng_ht_get_count(usess->domain_global.channels);
-               rcu_read_unlock();
        }
        if (ksession) {
                nb_chan += ksession->channel_count;
@@ -1900,8 +2536,31 @@ int cmd_start_trace(struct ltt_session *session)
                goto error;
        }
 
+       /*
+        * Record the timestamp of the first time the session is started for
+        * an eventual session rotation call.
+        */
+       if (!session->has_been_started) {
+               session->current_chunk_start_ts = time(NULL);
+               if (session->current_chunk_start_ts == (time_t) -1) {
+                       PERROR("Failed to retrieve the \"%s\" session's start time",
+                                       session->name);
+                       ret = LTTNG_ERR_FATAL;
+                       goto error;
+               }
+               if (!session->snapshot_mode && session->output_traces) {
+                       ret = session_mkdir(session);
+                       if (ret) {
+                               ERR("Failed to create the session directories");
+                               ret = LTTNG_ERR_CREATE_DIR_FAIL;
+                               goto error;
+                       }
+               }
+       }
+
        /* Kernel tracing */
        if (ksession != NULL) {
+               DBG("Start kernel tracing session %s", session->name);
                ret = start_kernel_session(ksession, kernel_tracer_fd);
                if (ret != LTTNG_OK) {
                        goto error;
@@ -1927,12 +2586,70 @@ int cmd_start_trace(struct ltt_session *session)
        session->has_been_started = 1;
        session->active = 1;
 
+       /*
+        * Clear the flag that indicates that a rotation was done while the
+        * session was stopped.
+        */
+       session->rotated_after_last_stop = false;
+
+       if (session->rotate_timer_period) {
+               ret = sessiond_rotate_timer_start(session,
+                               session->rotate_timer_period);
+               if (ret < 0) {
+                       ERR("Failed to enable rotate timer");
+                       ret = LTTNG_ERR_UNK;
+                       goto error;
+               }
+       }
+
        ret = LTTNG_OK;
 
 error:
        return ret;
 }
 
+static
+int rename_active_chunk(struct ltt_session *session)
+{
+       int ret;
+
+       session->current_archive_id++;
+
+       /*
+        * The currently active tracing path is now the folder we
+        * want to rename.
+        */
+       ret = lttng_strncpy(session->rotation_chunk.current_rotate_path,
+                       session->rotation_chunk.active_tracing_path,
+                       sizeof(session->rotation_chunk.current_rotate_path));
+       if (ret) {
+               ERR("Failed to copy active tracing path");
+               goto end;
+       }
+
+       ret = rename_complete_chunk(session, time(NULL));
+       if (ret < 0) {
+               ERR("Failed to rename current rotate path");
+               goto end;
+       }
+
+       /*
+        * We just renamed, the folder, we didn't do an actual rotation, so
+        * the active tracing path is now the renamed folder and we have to
+        * restore the rotate count.
+        */
+       ret = lttng_strncpy(session->rotation_chunk.active_tracing_path,
+                       session->rotation_chunk.current_rotate_path,
+                       sizeof(session->rotation_chunk.active_tracing_path));
+       if (ret) {
+               ERR("Failed to rename active session chunk tracing path");
+               goto end;
+       }
+end:
+       session->current_archive_id--;
+       return ret;
+}
+
 /*
  * Command LTTNG_STOP_TRACE processed by the client thread.
  */
@@ -1942,9 +2659,11 @@ int cmd_stop_trace(struct ltt_session *session)
        struct ltt_kernel_channel *kchan;
        struct ltt_kernel_session *ksession;
        struct ltt_ust_session *usess;
+       bool error_occured = false;
 
        assert(session);
 
+       DBG("Begin stop session %s (id %" PRIu64 ")", session->name, session->id);
        /* Short cut */
        ksession = session->kernel_session;
        usess = session->ust_session;
@@ -1955,11 +2674,38 @@ int cmd_stop_trace(struct ltt_session *session)
                goto error;
        }
 
+       if (session->rotate_relay_pending_timer_enabled) {
+               sessiond_timer_rotate_pending_stop(session);
+       }
+
+       if (session->rotate_timer_enabled) {
+               sessiond_rotate_timer_stop(session);
+       }
+
+       if (session->current_archive_id > 0 && !session->rotate_pending) {
+               ret = rename_active_chunk(session);
+               if (ret) {
+                       /*
+                        * This error should not prevent the user from stopping
+                        * the session. However, it will be reported at the end.
+                        */
+                       error_occured = true;
+               }
+       }
+
        /* Kernel tracer */
        if (ksession && ksession->active) {
                DBG("Stop kernel tracing");
 
-               /* Flush metadata if exist */
+               ret = kernel_stop_session(ksession);
+               if (ret < 0) {
+                       ret = LTTNG_ERR_KERN_STOP_FAIL;
+                       goto error;
+               }
+
+               kernel_wait_quiescent(kernel_tracer_fd);
+
+               /* Flush metadata after stopping (if exists) */
                if (ksession->metadata_stream_fd >= 0) {
                        ret = kernel_metadata_flush_buffer(ksession->metadata_stream_fd);
                        if (ret < 0) {
@@ -1967,7 +2713,7 @@ int cmd_stop_trace(struct ltt_session *session)
                        }
                }
 
-               /* Flush all buffers before stopping */
+               /* Flush all buffers after stopping */
                cds_list_for_each_entry(kchan, &ksession->channel_list.head, list) {
                        ret = kernel_flush_buffer(kchan);
                        if (ret < 0) {
@@ -1975,15 +2721,9 @@ int cmd_stop_trace(struct ltt_session *session)
                        }
                }
 
-               ret = kernel_stop_session(ksession);
-               if (ret < 0) {
-                       ret = LTTNG_ERR_KERN_STOP_FAIL;
-                       goto error;
-               }
-
-               kernel_wait_quiescent(kernel_tracer_fd);
-
                ksession->active = 0;
+               DBG("Kernel session stopped %s (id %" PRIu64 ")", session->name,
+                               session->id);
        }
 
        if (usess && usess->active) {
@@ -2002,7 +2742,7 @@ int cmd_stop_trace(struct ltt_session *session)
 
        /* Flag inactive after a successful stop. */
        session->active = 0;
-       ret = LTTNG_OK;
+       ret = !error_occured ? LTTNG_OK : LTTNG_ERR_UNK;
 
 error:
        return ret;
@@ -2172,7 +2912,7 @@ int cmd_create_session_snapshot(char *name, struct lttng_uri *uris,
         * Create session in no output mode with URIs set to NULL. The uris we've
         * received are for a default snapshot output if one.
         */
-       ret = cmd_create_session_uri(name, NULL, 0, creds, -1);
+       ret = cmd_create_session_uri(name, NULL, 0, creds, 0);
        if (ret != LTTNG_OK) {
                goto error;
        }
@@ -2226,7 +2966,8 @@ error:
  *
  * Called with session lock held.
  */
-int cmd_destroy_session(struct ltt_session *session, int wpipe)
+int cmd_destroy_session(struct ltt_session *session, int wpipe,
+               struct notification_thread_handle *notification_thread_handle)
 {
        int ret;
        struct ltt_ust_session *usess;
@@ -2238,6 +2979,30 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
        usess = session->ust_session;
        ksess = session->kernel_session;
 
+       DBG("Begin destroy session %s (id %" PRIu64 ")", session->name, session->id);
+
+       if (session->rotate_relay_pending_timer_enabled) {
+               sessiond_timer_rotate_pending_stop(session);
+       }
+
+       if (session->rotate_timer_enabled) {
+               sessiond_rotate_timer_stop(session);
+       }
+
+       if (session->rotate_size) {
+               unsubscribe_session_consumed_size_rotation(session, notification_thread_handle);
+               session->rotate_size = 0;
+       }
+
+       /*
+        * The rename of the current chunk is performed at stop, but if we rotated
+        * the session after the previous stop command, we need to rename the
+        * new (and empty) chunk that was started in between.
+        */
+       if (session->rotated_after_last_stop) {
+               rename_active_chunk(session);
+       }
+
        /* Clean kernel session teardown */
        kernel_destroy_session(ksess);
 
@@ -2271,70 +3036,14 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
 }
 
 /*
- * Command LTTNG_CALIBRATE processed by the client thread.
+ * Command LTTNG_REGISTER_CONSUMER processed by the client thread.
  */
-int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
+int cmd_register_consumer(struct ltt_session *session,
+               enum lttng_domain_type domain, const char *sock_path,
+               struct consumer_data *cdata)
 {
-       int ret;
-
-       switch (domain) {
-       case LTTNG_DOMAIN_KERNEL:
-       {
-               struct lttng_kernel_calibrate kcalibrate;
-
-               switch (calibrate->type) {
-               case LTTNG_CALIBRATE_FUNCTION:
-               default:
-                       /* Default and only possible calibrate option. */
-                       kcalibrate.type = LTTNG_KERNEL_CALIBRATE_KRETPROBE;
-                       break;
-               }
-
-               ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate);
-               if (ret < 0) {
-                       ret = LTTNG_ERR_KERN_ENABLE_FAIL;
-                       goto error;
-               }
-               break;
-       }
-       case LTTNG_DOMAIN_UST:
-       {
-               struct lttng_ust_calibrate ucalibrate;
-
-               switch (calibrate->type) {
-               case LTTNG_CALIBRATE_FUNCTION:
-               default:
-                       /* Default and only possible calibrate option. */
-                       ucalibrate.type = LTTNG_UST_CALIBRATE_TRACEPOINT;
-                       break;
-               }
-
-               ret = ust_app_calibrate_glb(&ucalibrate);
-               if (ret < 0) {
-                       ret = LTTNG_ERR_UST_CALIBRATE_FAIL;
-                       goto error;
-               }
-               break;
-       }
-       default:
-               ret = LTTNG_ERR_UND;
-               goto error;
-       }
-
-       ret = LTTNG_OK;
-
-error:
-       return ret;
-}
-
-/*
- * Command LTTNG_REGISTER_CONSUMER processed by the client thread.
- */
-int cmd_register_consumer(struct ltt_session *session, int domain,
-               const char *sock_path, struct consumer_data *cdata)
-{
-       int ret, sock;
-       struct consumer_socket *socket = NULL;
+       int ret, sock;
+       struct consumer_socket *socket = NULL;
 
        assert(session);
        assert(cdata);
@@ -2447,6 +3156,10 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 
        if (session->kernel_session != NULL) {
                (*domains)[index].type = LTTNG_DOMAIN_KERNEL;
+
+               /* Kernel session buffer type is always GLOBAL */
+               (*domains)[index].buf_type = LTTNG_BUFFER_GLOBAL;
+
                index++;
        }
 
@@ -2478,11 +3191,10 @@ error:
 /*
  * Command LTTNG_LIST_CHANNELS processed by the client thread.
  */
-ssize_t cmd_list_channels(int domain, struct ltt_session *session,
-               struct lttng_channel **channels)
+ssize_t cmd_list_channels(enum lttng_domain_type domain,
+               struct ltt_session *session, struct lttng_channel **channels)
 {
-       int ret;
-       ssize_t nb_chan = 0;
+       ssize_t nb_chan = 0, payload_size = 0, ret;
 
        switch (domain) {
        case LTTNG_DOMAIN_KERNEL:
@@ -2491,7 +3203,8 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
                }
                DBG3("Number of kernel channels %zd", nb_chan);
                if (nb_chan <= 0) {
-                       ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+                       ret = -LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+                       goto end;
                }
                break;
        case LTTNG_DOMAIN_UST:
@@ -2503,37 +3216,50 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
                }
                DBG3("Number of UST global channels %zd", nb_chan);
                if (nb_chan < 0) {
-                       ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
-                       goto error;
+                       ret = -LTTNG_ERR_UST_CHAN_NOT_FOUND;
+                       goto end;
                }
                break;
        default:
-               ret = LTTNG_ERR_UND;
-               goto error;
+               ret = -LTTNG_ERR_UND;
+               goto end;
        }
 
        if (nb_chan > 0) {
-               *channels = zmalloc(nb_chan * sizeof(struct lttng_channel));
+               const size_t channel_size = sizeof(struct lttng_channel) +
+                       sizeof(struct lttng_channel_extended);
+               struct lttng_channel_extended *channel_exts;
+
+               payload_size = nb_chan * channel_size;
+               *channels = zmalloc(payload_size);
                if (*channels == NULL) {
-                       ret = LTTNG_ERR_FATAL;
-                       goto error;
+                       ret = -LTTNG_ERR_FATAL;
+                       goto end;
                }
 
-               list_lttng_channels(domain, session, *channels);
+               channel_exts = ((void *) *channels) +
+                               (nb_chan * sizeof(struct lttng_channel));
+               ret = list_lttng_channels(domain, session, *channels, channel_exts);
+               if (ret != LTTNG_OK) {
+                       free(*channels);
+                       *channels = NULL;
+                       goto end;
+               }
+       } else {
+               *channels = NULL;
        }
 
-       return nb_chan;
-
-error:
-       /* Return negative value to differentiate return code */
-       return -ret;
+       ret = payload_size;
+end:
+       return ret;
 }
 
 /*
  * Command LTTNG_LIST_EVENTS processed by the client thread.
  */
-ssize_t cmd_list_events(int domain, struct ltt_session *session,
-               char *channel_name, struct lttng_event **events)
+ssize_t cmd_list_events(enum lttng_domain_type domain,
+               struct ltt_session *session, char *channel_name,
+               struct lttng_event **events, size_t *total_size)
 {
        int ret = 0;
        ssize_t nb_event = 0;
@@ -2542,14 +3268,16 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
        case LTTNG_DOMAIN_KERNEL:
                if (session->kernel_session != NULL) {
                        nb_event = list_lttng_kernel_events(channel_name,
-                                       session->kernel_session, events);
+                                       session->kernel_session, events,
+                                       total_size);
                }
                break;
        case LTTNG_DOMAIN_UST:
        {
                if (session->ust_session != NULL) {
                        nb_event = list_lttng_ust_global_events(channel_name,
-                                       &session->ust_session->domain_global, events);
+                                       &session->ust_session->domain_global, events,
+                                       total_size);
                }
                break;
        }
@@ -2563,7 +3291,12 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
                        rcu_read_lock();
                        cds_lfht_for_each_entry(session->ust_session->agents->ht,
                                        &iter.iter, agt, node.node) {
-                               nb_event = list_lttng_agent_events(agt, events);
+                               if (agt->domain == domain) {
+                                       nb_event = list_lttng_agent_events(
+                                                       agt, events,
+                                                       total_size);
+                                       break;
+                               }
                        }
                        rcu_read_unlock();
                }
@@ -2619,7 +3352,7 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
                                        sizeof(sessions[i].path), session);
                } else {
                        ret = snprintf(sessions[i].path, sizeof(sessions[i].path), "%s",
-                                       session->consumer->dst.trace_path);
+                                       session->consumer->dst.session_root_path);
                }
                if (ret < 0) {
                        PERROR("snprintf session path");
@@ -2647,6 +3380,8 @@ int cmd_data_pending(struct ltt_session *session)
 
        assert(session);
 
+       DBG("Data pending for session %s", session->name);
+
        /* Session MUST be stopped to ask for data availability. */
        if (session->active) {
                ret = LTTNG_ERR_SESSION_STARTED;
@@ -2668,6 +3403,15 @@ int cmd_data_pending(struct ltt_session *session)
                }
        }
 
+       /*
+        * A rotation is still pending, we have to wait.
+        */
+       if (session->rotate_pending) {
+               DBG("Rotate still pending for session %s", session->name);
+               ret = 1;
+               goto error;
+       }
+
        if (ksess && ksess->consumer) {
                ret = consumer_is_data_pending(ksess->id, ksess->consumer);
                if (ret == 1) {
@@ -2708,11 +3452,10 @@ int cmd_snapshot_add_output(struct ltt_session *session,
        DBG("Cmd snapshot add output for session %s", session->name);
 
        /*
-        * Permission denied to create an output if the session is not
-        * set in no output mode.
+        * Can't create an output if the session is not set in no-output mode.
         */
        if (session->output_traces) {
-               ret = LTTNG_ERR_EPERM;
+               ret = LTTNG_ERR_NOT_SNAPSHOT_SESSION;
                goto error;
        }
 
@@ -2776,7 +3519,7 @@ int cmd_snapshot_del_output(struct ltt_session *session,
         * set in no output mode.
         */
        if (session->output_traces) {
-               ret = LTTNG_ERR_EPERM;
+               ret = LTTNG_ERR_NOT_SNAPSHOT_SESSION;
                goto error;
        }
 
@@ -2828,19 +3571,19 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
         * set in no output mode.
         */
        if (session->output_traces) {
-               ret = -LTTNG_ERR_EPERM;
-               goto error;
+               ret = -LTTNG_ERR_NOT_SNAPSHOT_SESSION;
+               goto end;
        }
 
        if (session->snapshot.nb_output == 0) {
                ret = 0;
-               goto error;
+               goto end;
        }
 
        list = zmalloc(session->snapshot.nb_output * sizeof(*list));
        if (!list) {
                ret = -LTTNG_ERR_NOMEM;
-               goto error;
+               goto end;
        }
 
        /* Copy list from session to the new list object. */
@@ -2850,10 +3593,18 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
                assert(output->consumer);
                list[idx].id = output->id;
                list[idx].max_size = output->max_size;
-               strncpy(list[idx].name, output->name, sizeof(list[idx].name));
+               if (lttng_strncpy(list[idx].name, output->name,
+                               sizeof(list[idx].name))) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto error;
+               }
                if (output->consumer->type == CONSUMER_DST_LOCAL) {
-                       strncpy(list[idx].ctrl_url, output->consumer->dst.trace_path,
-                                       sizeof(list[idx].ctrl_url));
+                       if (lttng_strncpy(list[idx].ctrl_url,
+                                       output->consumer->dst.session_root_path,
+                                       sizeof(list[idx].ctrl_url))) {
+                               ret = -LTTNG_ERR_INVALID;
+                               goto error;
+                       }
                } else {
                        /* Control URI. */
                        ret = uri_to_str_url(&output->consumer->dst.net.control,
@@ -2878,178 +3629,486 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
        list = NULL;
        ret = session->snapshot.nb_output;
 error:
-       free(list);
        rcu_read_unlock();
+       free(list);
+end:
        return ret;
 }
 
 /*
- * Send relayd sockets from snapshot output to consumer. Ignore request if the
- * snapshot output is *not* set with a remote destination.
+ * Check if we can regenerate the metadata for this session.
+ * Only kernel, UST per-uid and non-live sessions are supported.
  *
- * Return 0 on success or a LTTNG_ERR code.
+ * Return 0 if the metadata can be generated, a LTTNG_ERR code otherwise.
  */
-static int set_relayd_for_snapshot(struct consumer_output *consumer,
-               struct snapshot_output *snap_output, struct ltt_session *session)
+static
+int check_regenerate_metadata_support(struct ltt_session *session)
 {
-       int ret = LTTNG_OK;
-       struct lttng_ht_iter iter;
-       struct consumer_socket *socket;
+       int ret;
 
-       assert(consumer);
-       assert(snap_output);
        assert(session);
 
-       DBG2("Set relayd object from snapshot output");
-
-       /* Ignore if snapshot consumer output is not network. */
-       if (snap_output->consumer->type != CONSUMER_DST_NET) {
-               goto error;
+       if (session->live_timer != 0) {
+               ret = LTTNG_ERR_LIVE_SESSION;
+               goto end;
        }
-
-       /*
-        * For each consumer socket, create and send the relayd object of the
-        * snapshot output.
-        */
-       rcu_read_lock();
-       cds_lfht_for_each_entry(snap_output->consumer->socks->ht, &iter.iter,
-                       socket, node.node) {
-               ret = send_consumer_relayd_sockets(0, session->id,
-                               snap_output->consumer, socket,
-                               session->name, session->hostname,
-                               session->live_timer);
-               if (ret != LTTNG_OK) {
-                       rcu_read_unlock();
-                       goto error;
+       if (!session->active) {
+               ret = LTTNG_ERR_SESSION_NOT_STARTED;
+               goto end;
+       }
+       if (session->ust_session) {
+               switch (session->ust_session->buffer_type) {
+               case LTTNG_BUFFER_PER_UID:
+                       break;
+               case LTTNG_BUFFER_PER_PID:
+                       ret = LTTNG_ERR_PER_PID_SESSION;
+                       goto end;
+               default:
+                       assert(0);
+                       ret = LTTNG_ERR_UNK;
+                       goto end;
                }
        }
-       rcu_read_unlock();
+       if (session->consumer->type == CONSUMER_DST_NET &&
+                       session->consumer->relay_minor_version < 8) {
+               ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
+               goto end;
+       }
+       ret = 0;
 
-error:
+end:
        return ret;
 }
 
-/*
- * Record a kernel snapshot.
- *
- * Return LTTNG_OK on success or a LTTNG_ERR code.
- */
-static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
-               struct snapshot_output *output, struct ltt_session *session,
-               int wait, uint64_t nb_packets_per_stream)
+static
+int clear_metadata_file(int fd)
 {
        int ret;
+       off_t lseek_ret;
 
-       assert(ksess);
-       assert(output);
-       assert(session);
-
-       /* Get the datetime for the snapshot output directory. */
-       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
-                       sizeof(output->datetime));
-       if (!ret) {
-               ret = LTTNG_ERR_INVALID;
-               goto error;
+       lseek_ret = lseek(fd, 0, SEEK_SET);
+       if (lseek_ret < 0) {
+               PERROR("lseek");
+               ret = -1;
+               goto end;
        }
 
-       /*
-        * Copy kernel session sockets so we can communicate with the right
-        * consumer for the snapshot record command.
-        */
-       ret = consumer_copy_sockets(output->consumer, ksess->consumer);
+       ret = ftruncate(fd, 0);
        if (ret < 0) {
-               ret = LTTNG_ERR_NOMEM;
-               goto error;
+               PERROR("ftruncate");
+               goto end;
        }
 
-       ret = set_relayd_for_snapshot(ksess->consumer, output, session);
-       if (ret != LTTNG_OK) {
-               goto error_snapshot;
-       }
+end:
+       return ret;
+}
 
-       ret = kernel_snapshot_record(ksess, output, wait, nb_packets_per_stream);
-       if (ret != LTTNG_OK) {
-               goto error_snapshot;
-       }
+static
+int ust_regenerate_metadata(struct ltt_ust_session *usess)
+{
+       int ret = 0;
+       struct buffer_reg_uid *uid_reg = NULL;
+       struct buffer_reg_session *session_reg = NULL;
 
-       ret = LTTNG_OK;
-       goto end;
+       rcu_read_lock();
+       cds_list_for_each_entry(uid_reg, &usess->buffer_reg_uid_list, lnode) {
+               struct ust_registry_session *registry;
+               struct ust_registry_channel *chan;
+               struct lttng_ht_iter iter_chan;
+
+               session_reg = uid_reg->registry;
+               registry = session_reg->reg.ust;
+
+               pthread_mutex_lock(&registry->lock);
+               registry->metadata_len_sent = 0;
+               memset(registry->metadata, 0, registry->metadata_alloc_len);
+               registry->metadata_len = 0;
+               registry->metadata_version++;
+               if (registry->metadata_fd > 0) {
+                       /* Clear the metadata file's content. */
+                       ret = clear_metadata_file(registry->metadata_fd);
+                       if (ret) {
+                               pthread_mutex_unlock(&registry->lock);
+                               goto end;
+                       }
+               }
+
+               ret = ust_metadata_session_statedump(registry, NULL,
+                               registry->major, registry->minor);
+               if (ret) {
+                       pthread_mutex_unlock(&registry->lock);
+                       ERR("Failed to generate session metadata (err = %d)",
+                                       ret);
+                       goto end;
+               }
+               cds_lfht_for_each_entry(registry->channels->ht, &iter_chan.iter,
+                               chan, node.node) {
+                       struct ust_registry_event *event;
+                       struct lttng_ht_iter iter_event;
+
+                       ret = ust_metadata_channel_statedump(registry, chan);
+                       if (ret) {
+                               pthread_mutex_unlock(&registry->lock);
+                               ERR("Failed to generate channel metadata "
+                                               "(err = %d)", ret);
+                               goto end;
+                       }
+                       cds_lfht_for_each_entry(chan->ht->ht, &iter_event.iter,
+                                       event, node.node) {
+                               ret = ust_metadata_event_statedump(registry,
+                                               chan, event);
+                               if (ret) {
+                                       pthread_mutex_unlock(&registry->lock);
+                                       ERR("Failed to generate event metadata "
+                                                       "(err = %d)", ret);
+                                       goto end;
+                               }
+                       }
+               }
+               pthread_mutex_unlock(&registry->lock);
+       }
 
-error_snapshot:
-       /* Clean up copied sockets so this output can use some other later on. */
-       consumer_destroy_output_sockets(output->consumer);
-error:
 end:
+       rcu_read_unlock();
        return ret;
 }
 
 /*
- * Record a UST snapshot.
+ * Command LTTNG_REGENERATE_METADATA from the lttng-ctl library.
  *
- * Return 0 on success or a LTTNG_ERR error code.
+ * Ask the consumer to truncate the existing metadata file(s) and
+ * then regenerate the metadata. Live and per-pid sessions are not
+ * supported and return an error.
+ *
+ * Return 0 on success or else a LTTNG_ERR code.
  */
-static int record_ust_snapshot(struct ltt_ust_session *usess,
-               struct snapshot_output *output, struct ltt_session *session,
-               int wait, uint64_t nb_packets_per_stream)
+int cmd_regenerate_metadata(struct ltt_session *session)
 {
        int ret;
 
-       assert(usess);
-       assert(output);
        assert(session);
 
-       /* Get the datetime for the snapshot output directory. */
-       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
-                       sizeof(output->datetime));
-       if (!ret) {
-               ret = LTTNG_ERR_INVALID;
-               goto error;
-       }
-
-       /*
-        * Copy UST session sockets so we can communicate with the right
-        * consumer for the snapshot record command.
-        */
-       ret = consumer_copy_sockets(output->consumer, usess->consumer);
-       if (ret < 0) {
-               ret = LTTNG_ERR_NOMEM;
-               goto error;
+       ret = check_regenerate_metadata_support(session);
+       if (ret) {
+               goto end;
        }
 
-       ret = set_relayd_for_snapshot(usess->consumer, output, session);
-       if (ret != LTTNG_OK) {
-               goto error_snapshot;
+       if (session->kernel_session) {
+               ret = kernctl_session_regenerate_metadata(
+                               session->kernel_session->fd);
+               if (ret < 0) {
+                       ERR("Failed to regenerate the kernel metadata");
+                       goto end;
+               }
        }
 
-       ret = ust_app_snapshot_record(usess, output, wait, nb_packets_per_stream);
-       if (ret < 0) {
-               switch (-ret) {
-               case EINVAL:
-                       ret = LTTNG_ERR_INVALID;
-                       break;
-               case ENODATA:
-                       ret = LTTNG_ERR_SNAPSHOT_NODATA;
-                       break;
-               default:
-                       ret = LTTNG_ERR_SNAPSHOT_FAIL;
-                       break;
+       if (session->ust_session) {
+               ret = ust_regenerate_metadata(session->ust_session);
+               if (ret < 0) {
+                       ERR("Failed to regenerate the UST metadata");
+                       goto end;
                }
-               goto error_snapshot;
        }
-
+       DBG("Cmd metadata regenerate for session %s", session->name);
        ret = LTTNG_OK;
 
-error_snapshot:
-       /* Clean up copied sockets so this output can use some other later on. */
-       consumer_destroy_output_sockets(output->consumer);
-error:
+end:
        return ret;
 }
 
-static
-uint64_t get_session_size_one_more_packet_per_stream(struct ltt_session *session,
-       uint64_t cur_nr_packets)
-{
+/*
+ * Command LTTNG_REGENERATE_STATEDUMP from the lttng-ctl library.
+ *
+ * Ask the tracer to regenerate a new statedump.
+ *
+ * Return 0 on success or else a LTTNG_ERR code.
+ */
+int cmd_regenerate_statedump(struct ltt_session *session)
+{
+       int ret;
+
+       assert(session);
+
+       if (!session->active) {
+               ret = LTTNG_ERR_SESSION_NOT_STARTED;
+               goto end;
+       }
+
+       if (session->kernel_session) {
+               ret = kernctl_session_regenerate_statedump(
+                               session->kernel_session->fd);
+               /*
+                * Currently, the statedump in kernel can only fail if out
+                * of memory.
+                */
+               if (ret < 0) {
+                       if (ret == -ENOMEM) {
+                               ret = LTTNG_ERR_REGEN_STATEDUMP_NOMEM;
+                       } else {
+                               ret = LTTNG_ERR_REGEN_STATEDUMP_FAIL;
+                       }
+                       ERR("Failed to regenerate the kernel statedump");
+                       goto end;
+               }
+       }
+
+       if (session->ust_session) {
+               ret = ust_app_regenerate_statedump_all(session->ust_session);
+               /*
+                * Currently, the statedump in UST always returns 0.
+                */
+               if (ret < 0) {
+                       ret = LTTNG_ERR_REGEN_STATEDUMP_FAIL;
+                       ERR("Failed to regenerate the UST statedump");
+                       goto end;
+               }
+       }
+       DBG("Cmd regenerate statedump for session %s", session->name);
+       ret = LTTNG_OK;
+
+end:
+       return ret;
+}
+
+int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
+               struct notification_thread_handle *notification_thread)
+{
+       int ret;
+       size_t trigger_len;
+       ssize_t sock_recv_len;
+       struct lttng_trigger *trigger = NULL;
+       struct lttng_buffer_view view;
+       struct lttng_dynamic_buffer trigger_buffer;
+
+       lttng_dynamic_buffer_init(&trigger_buffer);
+       trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
+       ret = lttng_dynamic_buffer_set_size(&trigger_buffer, trigger_len);
+       if (ret) {
+               ret = LTTNG_ERR_NOMEM;
+               goto end;
+       }
+
+       sock_recv_len = lttcomm_recv_unix_sock(sock, trigger_buffer.data,
+                       trigger_len);
+       if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
+               ERR("Failed to receive \"register trigger\" command payload");
+               /* TODO: should this be a new error enum ? */
+               ret = LTTNG_ERR_INVALID_TRIGGER;
+               goto end;
+       }
+
+       view = lttng_buffer_view_from_dynamic_buffer(&trigger_buffer, 0, -1);
+       if (lttng_trigger_create_from_buffer(&view, &trigger) !=
+                       trigger_len) {
+               ERR("Invalid trigger payload received in \"register trigger\" command");
+               ret = LTTNG_ERR_INVALID_TRIGGER;
+               goto end;
+       }
+
+       ret = notification_thread_command_register_trigger(notification_thread,
+                       trigger);
+       /* Ownership of trigger was transferred. */
+       trigger = NULL;
+end:
+       lttng_trigger_destroy(trigger);
+       lttng_dynamic_buffer_reset(&trigger_buffer);
+       return ret;
+}
+
+int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
+               struct notification_thread_handle *notification_thread)
+{
+       int ret;
+       size_t trigger_len;
+       ssize_t sock_recv_len;
+       struct lttng_trigger *trigger = NULL;
+       struct lttng_buffer_view view;
+       struct lttng_dynamic_buffer trigger_buffer;
+
+       lttng_dynamic_buffer_init(&trigger_buffer);
+       trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
+       ret = lttng_dynamic_buffer_set_size(&trigger_buffer, trigger_len);
+       if (ret) {
+               ret = LTTNG_ERR_NOMEM;
+               goto end;
+       }
+
+       sock_recv_len = lttcomm_recv_unix_sock(sock, trigger_buffer.data,
+                       trigger_len);
+       if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
+               ERR("Failed to receive \"unregister trigger\" command payload");
+               /* TODO: should this be a new error enum ? */
+               ret = LTTNG_ERR_INVALID_TRIGGER;
+               goto end;
+       }
+
+       view = lttng_buffer_view_from_dynamic_buffer(&trigger_buffer, 0, -1);
+       if (lttng_trigger_create_from_buffer(&view, &trigger) !=
+                       trigger_len) {
+               ERR("Invalid trigger payload received in \"unregister trigger\" command");
+               ret = LTTNG_ERR_INVALID_TRIGGER;
+               goto end;
+       }
+
+       ret = notification_thread_command_unregister_trigger(notification_thread,
+                       trigger);
+end:
+       lttng_trigger_destroy(trigger);
+       lttng_dynamic_buffer_reset(&trigger_buffer);
+       return ret;
+}
+
+/*
+ * Send relayd sockets from snapshot output to consumer. Ignore request if the
+ * snapshot output is *not* set with a remote destination.
+ *
+ * Return 0 on success or a LTTNG_ERR code.
+ */
+static int set_relayd_for_snapshot(struct consumer_output *consumer,
+               struct snapshot_output *snap_output, struct ltt_session *session)
+{
+       int ret = LTTNG_OK;
+       struct lttng_ht_iter iter;
+       struct consumer_socket *socket;
+
+       assert(consumer);
+       assert(snap_output);
+       assert(session);
+
+       DBG2("Set relayd object from snapshot output");
+
+       /* Ignore if snapshot consumer output is not network. */
+       if (snap_output->consumer->type != CONSUMER_DST_NET) {
+               goto error;
+       }
+
+       /*
+        * For each consumer socket, create and send the relayd object of the
+        * snapshot output.
+        */
+       rcu_read_lock();
+       cds_lfht_for_each_entry(snap_output->consumer->socks->ht, &iter.iter,
+                       socket, node.node) {
+               pthread_mutex_lock(socket->lock);
+               ret = send_consumer_relayd_sockets(0, session->id,
+                               snap_output->consumer, socket,
+                               session->name, session->hostname,
+                               session->live_timer);
+               pthread_mutex_unlock(socket->lock);
+               if (ret != LTTNG_OK) {
+                       rcu_read_unlock();
+                       goto error;
+               }
+       }
+       rcu_read_unlock();
+
+error:
+       return ret;
+}
+
+/*
+ * Record a kernel snapshot.
+ *
+ * Return LTTNG_OK on success or a LTTNG_ERR code.
+ */
+static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
+               struct snapshot_output *output, struct ltt_session *session,
+               int wait, uint64_t nb_packets_per_stream)
+{
+       int ret;
+
+       assert(ksess);
+       assert(output);
+       assert(session);
+
+
+       /*
+        * Copy kernel session sockets so we can communicate with the right
+        * consumer for the snapshot record command.
+        */
+       ret = consumer_copy_sockets(output->consumer, ksess->consumer);
+       if (ret < 0) {
+               ret = LTTNG_ERR_NOMEM;
+               goto error;
+       }
+
+       ret = set_relayd_for_snapshot(ksess->consumer, output, session);
+       if (ret != LTTNG_OK) {
+               goto error_snapshot;
+       }
+
+       ret = kernel_snapshot_record(ksess, output, wait, nb_packets_per_stream);
+       if (ret != LTTNG_OK) {
+               goto error_snapshot;
+       }
+
+       ret = LTTNG_OK;
+       goto end;
+
+error_snapshot:
+       /* Clean up copied sockets so this output can use some other later on. */
+       consumer_destroy_output_sockets(output->consumer);
+error:
+end:
+       return ret;
+}
+
+/*
+ * Record a UST snapshot.
+ *
+ * Return 0 on success or a LTTNG_ERR error code.
+ */
+static int record_ust_snapshot(struct ltt_ust_session *usess,
+               struct snapshot_output *output, struct ltt_session *session,
+               int wait, uint64_t nb_packets_per_stream)
+{
+       int ret;
+
+       assert(usess);
+       assert(output);
+       assert(session);
+
+       /*
+        * Copy UST session sockets so we can communicate with the right
+        * consumer for the snapshot record command.
+        */
+       ret = consumer_copy_sockets(output->consumer, usess->consumer);
+       if (ret < 0) {
+               ret = LTTNG_ERR_NOMEM;
+               goto error;
+       }
+
+       ret = set_relayd_for_snapshot(usess->consumer, output, session);
+       if (ret != LTTNG_OK) {
+               goto error_snapshot;
+       }
+
+       ret = ust_app_snapshot_record(usess, output, wait, nb_packets_per_stream);
+       if (ret < 0) {
+               switch (-ret) {
+               case EINVAL:
+                       ret = LTTNG_ERR_INVALID;
+                       break;
+               default:
+                       ret = LTTNG_ERR_SNAPSHOT_FAIL;
+                       break;
+               }
+               goto error_snapshot;
+       }
+
+       ret = LTTNG_OK;
+
+error_snapshot:
+       /* Clean up copied sockets so this output can use some other later on. */
+       consumer_destroy_output_sockets(output->consumer);
+error:
+       return ret;
+}
+
+static
+uint64_t get_session_size_one_more_packet_per_stream(struct ltt_session *session,
+       uint64_t cur_nr_packets)
+{
        uint64_t tot_size = 0;
 
        if (session->kernel_session) {
@@ -3147,18 +4206,27 @@ int cmd_snapshot_record(struct ltt_session *session,
        unsigned int use_tmp_output = 0;
        struct snapshot_output tmp_output;
        unsigned int snapshot_success = 0;
+       char datetime[16];
 
        assert(session);
        assert(output);
 
        DBG("Cmd snapshot record for session %s", session->name);
 
+       /* Get the datetime for the snapshot output directory. */
+       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", datetime,
+                       sizeof(datetime));
+       if (!ret) {
+               ret = LTTNG_ERR_INVALID;
+               goto error;
+       }
+
        /*
         * Permission denied to create an output if the session is not
         * set in no output mode.
         */
        if (session->output_traces) {
-               ret = LTTNG_ERR_EPERM;
+               ret = LTTNG_ERR_NOT_SNAPSHOT_SESSION;
                goto error;
        }
 
@@ -3183,138 +4251,104 @@ int cmd_snapshot_record(struct ltt_session *session,
                }
                /* Use the global session count for the temporary snapshot. */
                tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
+
+               /* Use the global datetime */
+               memcpy(tmp_output.datetime, datetime, sizeof(datetime));
                use_tmp_output = 1;
        }
 
-       if (session->kernel_session) {
-               struct ltt_kernel_session *ksess = session->kernel_session;
+       if (use_tmp_output) {
+               int64_t nb_packets_per_stream;
 
-               if (use_tmp_output) {
-                       int64_t nb_packets_per_stream;
+               nb_packets_per_stream = get_session_nb_packets_per_stream(session,
+                               tmp_output.max_size);
+               if (nb_packets_per_stream < 0) {
+                       ret = LTTNG_ERR_MAX_SIZE_INVALID;
+                       goto error;
+               }
 
-                       nb_packets_per_stream = get_session_nb_packets_per_stream(session,
-                                       tmp_output.max_size);
-                       if (nb_packets_per_stream < 0) {
-                               ret = LTTNG_ERR_MAX_SIZE_INVALID;
+               if (session->kernel_session) {
+                       ret = record_kernel_snapshot(session->kernel_session,
+                                       &tmp_output, session,
+                                       wait, nb_packets_per_stream);
+                       if (ret != LTTNG_OK) {
                                goto error;
                        }
-                       ret = record_kernel_snapshot(ksess, &tmp_output, session,
+               }
+
+               if (session->ust_session) {
+                       ret = record_ust_snapshot(session->ust_session,
+                                       &tmp_output, session,
                                        wait, nb_packets_per_stream);
                        if (ret != LTTNG_OK) {
                                goto error;
                        }
-                       snapshot_success = 1;
-               } else {
-                       struct snapshot_output *sout;
-                       struct lttng_ht_iter iter;
+               }
 
-                       rcu_read_lock();
-                       cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
-                                       &iter.iter, sout, node.node) {
-                               int64_t nb_packets_per_stream;
+               snapshot_success = 1;
+       } else {
+               struct snapshot_output *sout;
+               struct lttng_ht_iter iter;
 
-                               /*
-                                * Make a local copy of the output and assign the possible
-                                * temporary value given by the caller.
-                                */
-                               memset(&tmp_output, 0, sizeof(tmp_output));
-                               memcpy(&tmp_output, sout, sizeof(tmp_output));
+               rcu_read_lock();
+               cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
+                               &iter.iter, sout, node.node) {
+                       int64_t nb_packets_per_stream;
 
-                               if (output->max_size != (uint64_t) -1ULL) {
-                                       tmp_output.max_size = output->max_size;
-                               }
+                       /*
+                        * Make a local copy of the output and assign the possible
+                        * temporary value given by the caller.
+                        */
+                       memset(&tmp_output, 0, sizeof(tmp_output));
+                       memcpy(&tmp_output, sout, sizeof(tmp_output));
 
-                               nb_packets_per_stream = get_session_nb_packets_per_stream(session,
-                                               tmp_output.max_size);
-                               if (nb_packets_per_stream < 0) {
-                                       ret = LTTNG_ERR_MAX_SIZE_INVALID;
-                                       goto error;
-                               }
-
-                               /* Use temporary name. */
-                               if (*output->name != '\0') {
-                                       strncpy(tmp_output.name, output->name,
-                                                       sizeof(tmp_output.name));
-                               }
-
-                               tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
-
-                               ret = record_kernel_snapshot(ksess, &tmp_output,
-                                               session, wait, nb_packets_per_stream);
-                               if (ret != LTTNG_OK) {
-                                       rcu_read_unlock();
-                                       goto error;
-                               }
-                               snapshot_success = 1;
+                       if (output->max_size != (uint64_t) -1ULL) {
+                               tmp_output.max_size = output->max_size;
                        }
-                       rcu_read_unlock();
-               }
-       }
-
-       if (session->ust_session) {
-               struct ltt_ust_session *usess = session->ust_session;
-
-               if (use_tmp_output) {
-                       int64_t nb_packets_per_stream;
 
                        nb_packets_per_stream = get_session_nb_packets_per_stream(session,
                                        tmp_output.max_size);
                        if (nb_packets_per_stream < 0) {
                                ret = LTTNG_ERR_MAX_SIZE_INVALID;
+                               rcu_read_unlock();
                                goto error;
                        }
-                       ret = record_ust_snapshot(usess, &tmp_output, session,
-                                       wait, nb_packets_per_stream);
-                       if (ret != LTTNG_OK) {
-                               goto error;
-                       }
-                       snapshot_success = 1;
-               } else {
-                       struct snapshot_output *sout;
-                       struct lttng_ht_iter iter;
-
-                       rcu_read_lock();
-                       cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
-                                       &iter.iter, sout, node.node) {
-                               int64_t nb_packets_per_stream;
-
-                               /*
-                                * Make a local copy of the output and assign the possible
-                                * temporary value given by the caller.
-                                */
-                               memset(&tmp_output, 0, sizeof(tmp_output));
-                               memcpy(&tmp_output, sout, sizeof(tmp_output));
 
-                               if (output->max_size != (uint64_t) -1ULL) {
-                                       tmp_output.max_size = output->max_size;
-                               }
-
-                               nb_packets_per_stream = get_session_nb_packets_per_stream(session,
-                                               tmp_output.max_size);
-                               if (nb_packets_per_stream < 0) {
-                                       ret = LTTNG_ERR_MAX_SIZE_INVALID;
+                       /* Use temporary name. */
+                       if (*output->name != '\0') {
+                               if (lttng_strncpy(tmp_output.name, output->name,
+                                               sizeof(tmp_output.name))) {
+                                       ret = LTTNG_ERR_INVALID;
                                        rcu_read_unlock();
                                        goto error;
                                }
+                       }
 
-                               /* Use temporary name. */
-                               if (*output->name != '\0') {
-                                       strncpy(tmp_output.name, output->name,
-                                                       sizeof(tmp_output.name));
-                               }
+                       tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
+                       memcpy(tmp_output.datetime, datetime, sizeof(datetime));
 
-                               tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
+                       if (session->kernel_session) {
+                               ret = record_kernel_snapshot(session->kernel_session,
+                                               &tmp_output, session,
+                                               wait, nb_packets_per_stream);
+                               if (ret != LTTNG_OK) {
+                                       rcu_read_unlock();
+                                       goto error;
+                               }
+                       }
 
-                               ret = record_ust_snapshot(usess, &tmp_output, session,
+                       if (session->ust_session) {
+                               ret = record_ust_snapshot(session->ust_session,
+                                               &tmp_output, session,
                                                wait, nb_packets_per_stream);
                                if (ret != LTTNG_OK) {
                                        rcu_read_unlock();
                                        goto error;
                                }
-                               snapshot_success = 1;
                        }
-                       rcu_read_unlock();
+                       snapshot_success = 1;
                }
+               rcu_read_unlock();
        }
 
        if (snapshot_success) {
@@ -3350,6 +4384,486 @@ int cmd_set_session_shm_path(struct ltt_session *session,
        return 0;
 }
 
+/*
+ * Command LTTNG_ROTATE_SESSION from the lttng-ctl library.
+ *
+ * Ask the consumer to rotate the session output directory.
+ * The session lock must be held.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR code.
+ */
+int cmd_rotate_session(struct ltt_session *session,
+               struct lttng_rotate_session_return *rotate_return)
+{
+       int ret;
+       size_t strf_ret;
+       struct tm *timeinfo;
+       char datetime[21];
+       time_t now;
+       bool ust_active = false;
+
+       assert(session);
+
+       if (!session->has_been_started) {
+               ret = -LTTNG_ERR_START_SESSION_ONCE;
+               goto end;
+       }
+
+       if (session->live_timer || session->snapshot_mode ||
+                       !session->output_traces) {
+               ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE;
+               goto end;
+       }
+
+       /*
+        * Unsupported feature in lttng-relayd before 2.11.
+        */
+       if (session->consumer->type == CONSUMER_DST_NET &&
+                       (session->consumer->relay_major_version == 2 &&
+                       session->consumer->relay_minor_version < 11)) {
+               ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE_RELAY;
+               goto end;
+       }
+
+       if (session->rotate_pending || session->rotate_pending_relay) {
+               ret = -LTTNG_ERR_ROTATION_PENDING;
+               DBG("Rotate already in progress");
+               goto end;
+       }
+
+       /*
+        * After a stop, we only allow one rotation to occur, the other ones are
+        * useless until a new start.
+        */
+       if (session->rotated_after_last_stop) {
+               DBG("Session \"%s\" was already rotated after stop, refusing rotation",
+                               session->name);
+               ret = -LTTNG_ERR_ROTATION_MULTIPLE_AFTER_STOP;
+               goto end;
+       }
+
+       /* Special case for the first rotation. */
+       if (session->current_archive_id == 0) {
+               const char *base_path = NULL;
+
+               /* Either one of the two sessions is enough to get the root path. */
+               if (session->kernel_session) {
+                       base_path = session_get_base_path(session);
+               } else if (session->ust_session) {
+                       base_path = session_get_base_path(session);
+               } else {
+                       assert(0);
+               }
+               assert(base_path);
+               ret = lttng_strncpy(session->rotation_chunk.current_rotate_path,
+                               base_path,
+                               sizeof(session->rotation_chunk.current_rotate_path));
+               if (ret) {
+                       ERR("Failed to copy session base path to current rotation chunk path");
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+       } else {
+               /*
+                * The currently active tracing path is now the folder we
+                * want to rotate.
+                */
+               ret = lttng_strncpy(session->rotation_chunk.current_rotate_path,
+                               session->rotation_chunk.active_tracing_path,
+                               sizeof(session->rotation_chunk.current_rotate_path));
+               if (ret) {
+                       ERR("Failed to copy the active tracing path to the current rotate path");
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+       }
+       DBG("Current rotate path %s", session->rotation_chunk.current_rotate_path);
+
+       session->current_archive_id++;
+       session->rotate_pending = true;
+       session->rotation_state = LTTNG_ROTATION_STATE_ONGOING;
+
+       /*
+        * Create the path name for the next chunk.
+        */
+       now = time(NULL);
+       if (now == (time_t) -1) {
+               ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE;
+               goto end;
+       }
+       session->last_chunk_start_ts = session->current_chunk_start_ts;
+       session->current_chunk_start_ts = now;
+
+       timeinfo = localtime(&now);
+       if (!timeinfo) {
+               PERROR("Failed to sample local time in rotate session command");
+               ret = -LTTNG_ERR_UNK;
+               goto end;
+       }
+       strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%dT%H%M%S%z",
+                       timeinfo);
+       if (!strf_ret) {
+               ERR("Failed to format local time timestamp in rotate session command");
+               ret = -LTTNG_ERR_UNK;
+               goto end;
+       }
+       if (session->kernel_session) {
+               /*
+                * The active path for the next rotation/destroy.
+                * Ex: ~/lttng-traces/auto-20170922-111748/20170922-111754-42
+                */
+               ret = snprintf(session->rotation_chunk.active_tracing_path,
+                               sizeof(session->rotation_chunk.active_tracing_path),
+                               "%s/%s-%" PRIu64,
+                               session_get_base_path(session),
+                               datetime, session->current_archive_id + 1);
+               if (ret < 0 || ret == sizeof(session->rotation_chunk.active_tracing_path)) {
+                       ERR("Failed to format active kernel tracing path in rotate session command");
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+               /*
+                * The sub-directory for the consumer
+                * Ex: /20170922-111754-42/kernel
+                */
+               ret = snprintf(session->kernel_session->consumer->chunk_path,
+                               sizeof(session->kernel_session->consumer->chunk_path),
+                               "/%s-%" PRIu64, datetime,
+                               session->current_archive_id + 1);
+               if (ret < 0 || ret == sizeof(session->kernel_session->consumer->chunk_path)) {
+                       ERR("Failed to format the kernel consumer's sub-directory in rotate session command");
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+               /*
+                * Create the new chunk folder, before the rotation begins so we don't
+                * race with the consumer/tracer activity.
+                */
+               ret = domain_mkdir(session->kernel_session->consumer, session,
+                               session->kernel_session->uid,
+                               session->kernel_session->gid);
+               if (ret) {
+                       ERR("Failed to create kernel session tracing path at %s",
+                                       session->kernel_session->consumer->chunk_path);
+                       ret = -LTTNG_ERR_CREATE_DIR_FAIL;
+                       goto end;
+               }
+               ret = kernel_rotate_session(session);
+               if (ret != LTTNG_OK) {
+                       ret = -ret;
+                       goto end;
+               }
+       }
+       if (session->ust_session) {
+               ret = snprintf(session->rotation_chunk.active_tracing_path,
+                               PATH_MAX, "%s/%s-%" PRIu64,
+                               session_get_base_path(session),
+                               datetime, session->current_archive_id + 1);
+               if (ret < 0) {
+                       ERR("Failed to format active UST tracing path in rotate session command");
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+               ret = snprintf(session->ust_session->consumer->chunk_path,
+                               PATH_MAX, "/%s-%" PRIu64, datetime,
+                               session->current_archive_id + 1);
+               if (ret < 0) {
+                       ERR("Failed to format the UST consumer's sub-directory in rotate session command");
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+               /*
+                * Create the new chunk folder, before the rotation begins so we don't
+                * race with the consumer/tracer activity.
+                */
+               ret = domain_mkdir(session->ust_session->consumer, session,
+                               session->ust_session->uid,
+                               session->ust_session->gid);
+               if (ret) {
+                       ret = -LTTNG_ERR_CREATE_DIR_FAIL;
+                       goto end;
+               }
+               ret = ust_app_rotate_session(session, &ust_active);
+               if (ret != LTTNG_OK) {
+                       goto end;
+               }
+               /*
+                * Handle the case where we did not start a rotation on any channel.
+                * The consumer will never wake up the rotation thread to perform the
+                * rename, so we have to do it here while we hold the session and
+                * session_list locks.
+                */
+               if (!session->kernel_session && !ust_active) {
+                       ret = rename_complete_chunk(session, now);
+                       if (ret < 0) {
+                               ERR("Failed to rename completed rotation chunk");
+                               goto end;
+                       }
+                       session->rotate_pending = false;
+                       session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
+               }
+       }
+
+       if (!session->active) {
+               session->rotated_after_last_stop = true;
+       }
+
+       if (rotate_return) {
+               rotate_return->rotation_id = session->current_archive_id;
+       }
+
+       DBG("Cmd rotate session %s, current_archive_id %" PRIu64 " sent",
+                       session->name, session->current_archive_id);
+       ret = LTTNG_OK;
+
+end:
+       return ret;
+}
+
+/*
+ * Command LTTNG_ROTATION_GET_INFO from the lttng-ctl library.
+ *
+ * Check if the session has finished its rotation.
+ *
+ * Return 0 on success or else a LTTNG_ERR code.
+ */
+int cmd_rotate_get_info(struct ltt_session *session,
+               struct lttng_rotation_get_info_return *info_return,
+               uint64_t rotation_id)
+{
+       int ret;
+
+       assert(session);
+
+       DBG("Cmd rotate_get_info session %s, rotation id %" PRIu64, session->name,
+                       session->current_archive_id);
+
+       if (session->current_archive_id != rotation_id) {
+               info_return->status = (int32_t) LTTNG_ROTATION_STATE_EXPIRED;
+               ret = LTTNG_OK;
+               goto end;
+       }
+
+       switch (session->rotation_state) {
+       case LTTNG_ROTATION_STATE_ONGOING:
+               DBG("Reporting that rotation id %" PRIu64 " of session %s is still pending",
+                               rotation_id, session->name);
+               break;
+       case LTTNG_ROTATION_STATE_COMPLETED:
+       {
+               char *current_tracing_path_reply;
+               size_t current_tracing_path_reply_len;
+
+               switch (session_get_consumer_destination_type(session)) {
+               case CONSUMER_DST_LOCAL:
+                       current_tracing_path_reply =
+                                       info_return->location.local.absolute_path;
+                       current_tracing_path_reply_len =
+                                       sizeof(info_return->location.local.absolute_path);
+                       info_return->location_type =
+                                       (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL;
+                       break;
+               case CONSUMER_DST_NET:
+                       current_tracing_path_reply =
+                                       info_return->location.relay.relative_path;
+                       current_tracing_path_reply_len =
+                                       sizeof(info_return->location.relay.relative_path);
+                       /* Currently the only supported relay protocol. */
+                       info_return->location.relay.protocol =
+                                       (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP;
+
+                       ret = lttng_strncpy(info_return->location.relay.host,
+                                       session_get_net_consumer_hostname(session),
+                                       sizeof(info_return->location.relay.host));
+                       if (ret) {
+                               ERR("Failed to host name to rotate_get_info reply");
+                               info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+                               ret = -LTTNG_ERR_UNK;
+                               goto end;
+                       }
+
+                       session_get_net_consumer_ports(session,
+                                       &info_return->location.relay.ports.control,
+                                       &info_return->location.relay.ports.data);
+                       info_return->location_type =
+                                       (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY;
+                       break;
+               default:
+                       abort();
+               }
+               ret = lttng_strncpy(current_tracing_path_reply,
+                               session->rotation_chunk.current_rotate_path,
+                               current_tracing_path_reply_len);
+               if (ret) {
+                       ERR("Failed to copy current tracing path to rotate_get_info reply");
+                       info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
+
+               break;
+       }
+       case LTTNG_ROTATION_STATE_ERROR:
+               DBG("Reporting that an error occurred during rotation %" PRIu64 " of session %s",
+                               rotation_id, session->name);
+               break;
+       default:
+               abort();
+       }
+
+       info_return->status = (int32_t) session->rotation_state;
+       ret = LTTNG_OK;
+end:
+       return ret;
+}
+
+/*
+ * Command LTTNG_ROTATION_SET_SCHEDULE from the lttng-ctl library.
+ *
+ * Configure the automatic rotation parameters.
+ * Set to -1ULL to disable them.
+ *
+ * Return 0 on success or else an LTTNG_ERR code.
+ */
+int cmd_rotation_set_schedule(struct ltt_session *session,
+               uint64_t timer_us, uint64_t size,
+               struct notification_thread_handle *notification_thread_handle)
+{
+       int ret;
+
+       assert(session);
+
+       DBG("Cmd rotate set schedule session %s", session->name);
+
+       if (session->live_timer || session->snapshot_mode ||
+                       !session->output_traces) {
+               ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
+               goto end;
+       }
+
+       /* Trying to override an already active timer. */
+       if (timer_us && timer_us != -1ULL && session->rotate_timer_period) {
+               ret = LTTNG_ERR_ROTATION_TIMER_SET;
+               goto end;
+       /* Trying to disable an inactive timer. */
+       } else if (timer_us == -1ULL && !session->rotate_timer_period) {
+               ret = LTTNG_ERR_ROTATION_NO_TIMER_SET;
+               goto end;
+       }
+
+       if (size && size != -1ULL && session->rotate_size) {
+               ret = LTTNG_ERR_ROTATION_SIZE_SET;
+               goto end;
+       } else if (size == -1ULL && !session->rotate_size) {
+               ret = LTTNG_ERR_ROTATION_NO_SIZE_SET;
+               goto end;
+       }
+
+       if (timer_us && !session->rotate_timer_period) {
+               if (timer_us > UINT_MAX) {
+                       ret = LTTNG_ERR_INVALID;
+                       goto end;
+               }
+
+               session->rotate_timer_period = timer_us;
+               /*
+                * Only start the timer if the session is active, otherwise
+                * it will be started when the session starts.
+                */
+               if (session->active) {
+                       ret = sessiond_rotate_timer_start(session, timer_us);
+                       if (ret) {
+                               ERR("Failed to enable rotate timer");
+                               ret = LTTNG_ERR_UNK;
+                               goto end;
+                       }
+               }
+       } else if (timer_us == -1ULL && session->rotate_timer_period > 0) {
+               sessiond_rotate_timer_stop(session);
+               session->rotate_timer_period = 0;
+       }
+
+       if (size > 0) {
+               if (size == -1ULL) {
+                       ret = unsubscribe_session_consumed_size_rotation(session,
+                                       notification_thread_handle);
+                       if (ret) {
+                               ret = LTTNG_ERR_UNK;
+                               goto end;
+                       }
+                       session->rotate_size = 0;
+               } else {
+                       ret = subscribe_session_consumed_size_rotation(session,
+                                       size, notification_thread_handle);
+                       if (ret) {
+                               PERROR("Subscribe to session usage");
+                               ret = LTTNG_ERR_UNK;
+                               goto end;
+                       }
+                       session->rotate_size = size;
+               }
+       }
+
+       ret = LTTNG_OK;
+
+       goto end;
+
+end:
+       return ret;
+}
+
+/*
+ * Command ROTATE_GET_CURRENT_PATH from the lttng-ctl library.
+ *
+ * Configure the automatic rotation parameters.
+ * Set to -1ULL to disable them.
+ *
+ * Return LTTNG_OK on success or else a LTTNG_ERR code.
+ */
+int cmd_session_get_current_output(struct ltt_session *session,
+               struct lttng_session_get_current_output_return *output_return)
+{
+       int ret;
+       const char *path;
+
+       if (!session->snapshot_mode) {
+               if (session->current_archive_id == 0) {
+                       if (session->kernel_session) {
+                               path = session_get_base_path(session);
+                       } else if (session->ust_session) {
+                               path = session_get_base_path(session);
+                       } else {
+                               abort();
+                       }
+                       assert(path);
+               } else {
+                       path = session->rotation_chunk.active_tracing_path;
+               }
+       } else {
+               /*
+                * A snapshot session does not have a "current" trace archive
+                * location.
+                */
+               path = "";
+       }
+
+       DBG("Cmd get current output for session %s, returning %s",
+                       session->name, path);
+
+       ret = lttng_strncpy(output_return->path,
+                       path,
+                       sizeof(output_return->path));
+       if (ret) {
+               ERR("Failed to copy trace output path to session get current output command reply");
+               ret = -LTTNG_ERR_UNK;
+               goto end;
+       }
+
+       ret = LTTNG_OK;
+end:
+       return ret;
+}
+
 /*
  * Init command subsystem.
  */
This page took 0.097116 seconds and 4 git commands to generate.