Fix: initialize var_data to NULL
[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c
index b57be223a73afce55723c858c66a5aedfa245b24..95515007c8f6aae576a4dd38246b207cc9f55c3a 100644 (file)
 #include <lttng/channel-internal.h>
 #include <lttng/event-internal.h>
 #include <lttng/userspace-probe-internal.h>
+#include <lttng/session-internal.h>
+#include <lttng/session-descriptor-internal.h>
+#include <lttng/destruction-handle.h>
+#include <lttng/tracker-internal.h>
 
 #include "filter/filter-ast.h"
 #include "filter/filter-parser.h"
@@ -64,9 +68,16 @@ do {                                                         \
 } while (0)
 #endif
 
+#define COPY_DOMAIN_PACKED(dst, src)                           \
+do {                                                           \
+       struct lttng_domain _tmp_domain;                        \
+                                                               \
+       lttng_ctl_copy_lttng_domain(&_tmp_domain, &src);        \
+       dst = _tmp_domain;                                      \
+} while (0)
 
 /* Socket to session daemon for communication */
-static int sessiond_socket;
+static int sessiond_socket = -1;
 static char sessiond_sock_path[PATH_MAX];
 
 /* Variables */
@@ -241,15 +252,13 @@ end:
 LTTNG_HIDDEN
 int lttng_check_tracing_group(void)
 {
-       struct group *grp_tracing;      /* no free(). See getgrnam(3) */
-       gid_t *grp_list;
+       gid_t *grp_list, tracing_gid;
        int grp_list_size, grp_id, i;
        int ret = -1;
        const char *grp_name = tracing_group;
 
        /* Get GID of group 'tracing' */
-       grp_tracing = getgrnam(grp_name);
-       if (!grp_tracing) {
+       if (utils_get_group_id(grp_name, false, &tracing_gid)) {
                /* If grp_tracing is NULL, the group does not exist. */
                goto end;
        }
@@ -274,7 +283,7 @@ int lttng_check_tracing_group(void)
        }
 
        for (i = 0; i < grp_list_size; i++) {
-               if (grp_list[i] == grp_tracing->gr_gid) {
+               if (grp_list[i] == tracing_gid) {
                        ret = 1;
                        break;
                }
@@ -287,6 +296,50 @@ end:
        return ret;
 }
 
+static int check_enough_available_memory(size_t num_bytes_requested_per_cpu)
+{
+       int ret;
+       long num_cpu;
+       size_t best_mem_info;
+       size_t num_bytes_requested_total;
+
+       /*
+        * Get the number of CPU currently online to compute the amount of
+        * memory needed to create a buffer for every CPU.
+        */
+       num_cpu = sysconf(_SC_NPROCESSORS_ONLN);
+       if (num_cpu == -1) {
+               goto error;
+       }
+
+       num_bytes_requested_total = num_bytes_requested_per_cpu * num_cpu;
+
+       /*
+        * Try to get the `MemAvail` field of `/proc/meminfo`. This is the most
+        * reliable estimate we can get but it is only exposed by the kernel
+        * since 3.14. (See Linux kernel commit:
+        * 34e431b0ae398fc54ea69ff85ec700722c9da773)
+        */
+       ret = utils_get_memory_available(&best_mem_info);
+       if (ret >= 0) {
+               goto success;
+       }
+
+       /*
+        * As a backup plan, use `MemTotal` field of `/proc/meminfo`. This
+        * is a sanity check for obvious user error.
+        */
+       ret = utils_get_memory_total(&best_mem_info);
+       if (ret >= 0) {
+               goto success;
+       }
+
+error:
+       return -1;
+success:
+       return best_mem_info >= num_bytes_requested_total;
+}
+
 /*
  * Try connect to session daemon with sock_path.
  *
@@ -379,17 +432,12 @@ error:
 /*
  * Connect to the LTTng session daemon.
  *
- * On success, return 0. On error, return -1.
+ * On success, return the socket's file descriptor. On error, return -1.
  */
-static int connect_sessiond(void)
+LTTNG_HIDDEN int connect_sessiond(void)
 {
        int ret;
 
-       /* Don't try to connect if already connected. */
-       if (connected) {
-               return 0;
-       }
-
        ret = set_session_daemon_path();
        if (ret < 0) {
                goto error;
@@ -401,15 +449,18 @@ static int connect_sessiond(void)
                goto error;
        }
 
-       sessiond_socket = ret;
-       connected = 1;
-
-       return 0;
+       return ret;
 
 error:
        return -1;
 }
 
+static void reset_global_sessiond_connection_state(void)
+{
+       sessiond_socket = -1;
+       connected = 0;
+}
+
 /*
  *  Clean disconnect from the session daemon.
  *
@@ -421,8 +472,7 @@ static int disconnect_sessiond(void)
 
        if (connected) {
                ret = lttcomm_close_unix_sock(sessiond_socket);
-               sessiond_socket = 0;
-               connected = 0;
+               reset_global_sessiond_connection_state();
        }
 
        return ret;
@@ -497,6 +547,9 @@ int lttng_ctl_ask_sessiond_fds_varlen(struct lttcomm_session_msg *lsm,
        if (ret < 0) {
                ret = -LTTNG_ERR_NO_SESSIOND;
                goto end;
+       } else {
+               sessiond_socket = ret;
+               connected = 1;
        }
 
        /* Send command to session daemon */
@@ -608,7 +661,7 @@ int lttng_register_consumer(struct lttng_handle *handle,
        lsm.cmd_type = LTTNG_REGISTER_CONSUMER;
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
                        sizeof(lsm.session.name));
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        lttng_ctl_copy_string(lsm.u.reg.path, socket_path,
                        sizeof(lsm.u.reg.path));
@@ -679,7 +732,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
                 * call returned value indicates availability.
                 */
                if (data_ret) {
-                       usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+                       usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US);
                }
        } while (data_ret != 0);
 
@@ -739,7 +792,7 @@ int lttng_add_context(struct lttng_handle *handle,
                                sizeof(lsm.u.context.channel_name));
        }
 
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
                        sizeof(lsm.session.name));
 
@@ -1034,7 +1087,11 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
        unsigned int free_filter_expression = 0;
        struct filter_parser_ctx *ctx = NULL;
 
-       memset(&send_buffer, 0, sizeof(send_buffer));
+       /*
+        * We have either a filter or some exclusions, so we need to set up
+        * a variable-length memory block from where to send the data.
+        */
+       lttng_dynamic_buffer_init(&send_buffer);
 
        /*
         * Cast as non-const since we may replace the filter expression
@@ -1075,8 +1132,7 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
                lttng_ctl_copy_string(ev->name, "*", sizeof(ev->name));
        }
 
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-       /* FIXME: copying non-packed struct to packed struct. */
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
        memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
@@ -1084,12 +1140,6 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
        lsm.u.enable.exclusion_count = exclusion_count;
        lsm.u.enable.bytecode_len = 0;
 
-       /*
-        * We have either a filter or some exclusions, so we need to set up
-        * a variable-length memory block from where to send the data.
-        */
-       lttng_dynamic_buffer_init(&send_buffer);
-
        /* Parse filter expression. */
        if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
                        || handle->domain.type == LTTNG_DOMAIN_LOG4J
@@ -1275,8 +1325,7 @@ int lttng_disable_event_ext(struct lttng_handle *handle,
 
        lsm.cmd_type = LTTNG_DISABLE_EVENT;
 
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-       /* FIXME: copying non-packed struct to packed struct. */
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
        memcpy(&lsm.u.disable.event, ev, sizeof(lsm.u.disable.event));
 
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
@@ -1475,6 +1524,7 @@ int lttng_enable_channel(struct lttng_handle *handle,
                struct lttng_channel *in_chan)
 {
        struct lttcomm_session_msg lsm;
+       size_t total_buffer_size_needed_per_cpu = 0;
 
        /* NULL arguments are forbidden. No default values. */
        if (handle == NULL || in_chan == NULL) {
@@ -1510,8 +1560,18 @@ int lttng_enable_channel(struct lttng_handle *handle,
                memcpy(&lsm.u.channel.extended, extended, sizeof(*extended));
        }
 
+       /*
+        * Verify that the amount of memory required to create the requested
+        * buffer is available on the system at the moment.
+        */
+       total_buffer_size_needed_per_cpu = lsm.u.channel.chan.attr.num_subbuf *
+               lsm.u.channel.chan.attr.subbuf_size;
+       if (!check_enough_available_memory(total_buffer_size_needed_per_cpu)) {
+               return -LTTNG_ERR_NOMEM;
+       }
+
        lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
                        sizeof(lsm.session.name));
@@ -1539,59 +1599,7 @@ int lttng_disable_channel(struct lttng_handle *handle, const char *name)
        lttng_ctl_copy_string(lsm.u.disable.channel_name, name,
                        sizeof(lsm.u.disable.channel_name));
 
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-
-       lttng_ctl_copy_string(lsm.session.name, handle->session_name,
-                       sizeof(lsm.session.name));
-
-       return lttng_ctl_ask_sessiond(&lsm, NULL);
-}
-
-/*
- * Add PID to session tracker.
- * Return 0 on success else a negative LTTng error code.
- */
-int lttng_track_pid(struct lttng_handle *handle, int pid)
-{
-       struct lttcomm_session_msg lsm;
-
-       /* NULL arguments are forbidden. No default values. */
-       if (handle == NULL) {
-               return -LTTNG_ERR_INVALID;
-       }
-
-       memset(&lsm, 0, sizeof(lsm));
-
-       lsm.cmd_type = LTTNG_TRACK_PID;
-       lsm.u.pid_tracker.pid = pid;
-
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-
-       lttng_ctl_copy_string(lsm.session.name, handle->session_name,
-                       sizeof(lsm.session.name));
-
-       return lttng_ctl_ask_sessiond(&lsm, NULL);
-}
-
-/*
- * Remove PID from session tracker.
- * Return 0 on success else a negative LTTng error code.
- */
-int lttng_untrack_pid(struct lttng_handle *handle, int pid)
-{
-       struct lttcomm_session_msg lsm;
-
-       /* NULL arguments are forbidden. No default values. */
-       if (handle == NULL) {
-               return -LTTNG_ERR_INVALID;
-       }
-
-       memset(&lsm, 0, sizeof(lsm));
-
-       lsm.cmd_type = LTTNG_UNTRACK_PID;
-       lsm.u.pid_tracker.pid = pid;
-
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
                        sizeof(lsm.session.name));
@@ -1617,7 +1625,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 
        memset(&lsm, 0, sizeof(lsm));
        lsm.cmd_type = LTTNG_LIST_TRACEPOINTS;
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        ret = lttng_ctl_ask_sessiond(&lsm, (void **) events);
        if (ret < 0) {
@@ -1645,7 +1653,7 @@ int lttng_list_tracepoint_fields(struct lttng_handle *handle,
 
        memset(&lsm, 0, sizeof(lsm));
        lsm.cmd_type = LTTNG_LIST_TRACEPOINT_FIELDS;
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        ret = lttng_ctl_ask_sessiond(&lsm, (void **) fields);
        if (ret < 0) {
@@ -1693,81 +1701,296 @@ const char *lttng_strerror(int code)
        return error_get_str(code);
 }
 
+enum lttng_error_code lttng_create_session_ext(
+               struct lttng_session_descriptor *session_descriptor)
+{
+       enum lttng_error_code ret_code;
+       struct lttcomm_session_msg lsm = {
+               .cmd_type = LTTNG_CREATE_SESSION_EXT,
+       };
+       void *reply = NULL;
+       struct lttng_buffer_view reply_view;
+       int reply_ret;
+       bool sessiond_must_generate_ouput;
+       struct lttng_dynamic_buffer payload;
+       int ret;
+       size_t descriptor_size;
+       struct lttng_session_descriptor *descriptor_reply = NULL;
+
+       lttng_dynamic_buffer_init(&payload);
+       if (!session_descriptor) {
+               ret_code = LTTNG_ERR_INVALID;
+               goto end;
+       }
+
+       sessiond_must_generate_ouput =
+                       !lttng_session_descriptor_is_output_destination_initialized(
+                               session_descriptor);
+       if (sessiond_must_generate_ouput) {
+               const char *home_dir = utils_get_home_dir();
+               size_t home_dir_len = home_dir ? strlen(home_dir) + 1 : 0;
+
+               if (!home_dir || home_dir_len > LTTNG_PATH_MAX) {
+                       ret_code = LTTNG_ERR_FATAL;
+                       goto end;
+               }
+
+               lsm.u.create_session.home_dir_size = (uint16_t) home_dir_len;
+               ret = lttng_dynamic_buffer_append(&payload, home_dir,
+                               home_dir_len);
+               if (ret) {
+                       ret_code = LTTNG_ERR_NOMEM;
+                       goto end;
+               }
+       }
+
+       descriptor_size = payload.size;
+       ret = lttng_session_descriptor_serialize(session_descriptor,
+                       &payload);
+       if (ret) {
+               ret_code = LTTNG_ERR_INVALID;
+               goto end;
+       }
+       descriptor_size = payload.size - descriptor_size;
+       lsm.u.create_session.session_descriptor_size = descriptor_size;
+
+       /* Command returns a session descriptor on success. */
+       reply_ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, payload.data,
+                       payload.size, &reply);
+       if (reply_ret < 0) {
+               ret_code = -reply_ret;
+               goto end;
+       } else if (reply_ret == 0) {
+               /* Socket unexpectedly closed by the session daemon. */
+               ret_code = LTTNG_ERR_FATAL;
+               goto end;
+       }
+
+       reply_view = lttng_buffer_view_init(reply, 0, reply_ret);
+       ret = lttng_session_descriptor_create_from_buffer(&reply_view,
+                       &descriptor_reply);
+       if (ret < 0) {
+               ret_code = LTTNG_ERR_FATAL;
+               goto end;
+       }
+       ret_code = LTTNG_OK;
+       lttng_session_descriptor_assign(session_descriptor, descriptor_reply);
+end:
+       free(reply);
+       lttng_dynamic_buffer_reset(&payload);
+       lttng_session_descriptor_destroy(descriptor_reply);
+       return ret_code;
+}
+
 /*
- * Create a brand new session using name and url for destination.
+ * Create a new session using name and url for destination.
  *
- * Returns LTTNG_OK on success or a negative error code.
+ * Return 0 on success else a negative LTTng error code.
  */
 int lttng_create_session(const char *name, const char *url)
 {
        int ret;
        ssize_t size;
-       struct lttcomm_session_msg lsm;
        struct lttng_uri *uris = NULL;
+       struct lttng_session_descriptor *descriptor = NULL;
+       enum lttng_error_code ret_code;
 
-       if (name == NULL) {
-               return -LTTNG_ERR_INVALID;
+       if (!name) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
        }
 
-       memset(&lsm, 0, sizeof(lsm));
-
-       lsm.cmd_type = LTTNG_CREATE_SESSION;
-       lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
-
-       /* There should never be a data URL */
        size = uri_parse_str_urls(url, NULL, &uris);
        if (size < 0) {
-               return -LTTNG_ERR_INVALID;
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
        }
+       switch (size) {
+       case 0:
+               descriptor = lttng_session_descriptor_create(name);
+               break;
+       case 1:
+               if (uris[0].dtype != LTTNG_DST_PATH) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto end;
+               }
+               descriptor = lttng_session_descriptor_local_create(name,
+                               uris[0].dst.path);
+               break;
+       case 2:
+               descriptor = lttng_session_descriptor_network_create(name, url,
+                               NULL);
+               break;
+       default:
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+       if (!descriptor) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+       ret_code = lttng_create_session_ext(descriptor);
+       ret = ret_code == LTTNG_OK ? 0 : -ret_code;
+end:
+       lttng_session_descriptor_destroy(descriptor);
+       free(uris);
+       return ret;
+}
 
-       lsm.u.uri.size = size;
+/*
+ * Create a session exclusively used for snapshot.
+ *
+ * Return 0 on success else a negative LTTng error code.
+ */
+int lttng_create_session_snapshot(const char *name, const char *snapshot_url)
+{
+       int ret;
+       enum lttng_error_code ret_code;
+       ssize_t size;
+       struct lttng_uri *uris = NULL;
+       struct lttng_session_descriptor *descriptor = NULL;
 
-       ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, uris,
-                       sizeof(struct lttng_uri) * size, NULL);
+       if (!name) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
 
+       size = uri_parse_str_urls(snapshot_url, NULL, &uris);
+       if (size < 0) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+       /*
+        * If the user does not specify a custom subdir, use the session name.
+        */
+       if (size > 0 && uris[0].dtype != LTTNG_DST_PATH &&
+                       strlen(uris[0].subdir) == 0) {
+               ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s",
+                               name);
+               if (ret < 0) {
+                       PERROR("Failed to set session name as network destination sub-directory");
+                       ret = -LTTNG_ERR_FATAL;
+                       goto end;
+               } else if (ret >= sizeof(uris[0].subdir)) {
+                       /* Truncated output. */
+                       ret = -LTTNG_ERR_INVALID;
+                       goto end;
+               }
+       }
+
+       switch (size) {
+       case 0:
+               descriptor = lttng_session_descriptor_snapshot_create(name);
+               break;
+       case 1:
+               if (uris[0].dtype != LTTNG_DST_PATH) {
+                       ret = -LTTNG_ERR_INVALID;
+                       goto end;
+               }
+               descriptor = lttng_session_descriptor_snapshot_local_create(
+                               name,
+                               uris[0].dst.path);
+               break;
+       case 2:
+               descriptor = lttng_session_descriptor_snapshot_network_create(
+                               name,
+                               snapshot_url,
+                               NULL);
+               break;
+       default:
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+       if (!descriptor) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+       ret_code = lttng_create_session_ext(descriptor);
+       ret = ret_code == LTTNG_OK ? 0 : -ret_code;
+end:
+       lttng_session_descriptor_destroy(descriptor);
        free(uris);
        return ret;
 }
 
 /*
- * Destroy session using name.
- * Returns size of returned session payload data or a negative error code.
+ * Create a session exclusively used for live.
+ *
+ * Return 0 on success else a negative LTTng error code.
  */
-static
-int _lttng_destroy_session(const char *session_name)
+int lttng_create_session_live(const char *name, const char *url,
+               unsigned int timer_interval)
 {
-       struct lttcomm_session_msg lsm;
+       int ret;
+       enum lttng_error_code ret_code;
+       struct lttng_session_descriptor *descriptor = NULL;
 
-       if (session_name == NULL) {
-               return -LTTNG_ERR_INVALID;
+       if (!name) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
        }
 
-       memset(&lsm, 0, sizeof(lsm));
-       lsm.cmd_type = LTTNG_DESTROY_SESSION;
-
-       lttng_ctl_copy_string(lsm.session.name, session_name,
-                       sizeof(lsm.session.name));
-
-       return lttng_ctl_ask_sessiond(&lsm, NULL);
+       if (url) {
+               descriptor = lttng_session_descriptor_live_network_create(
+                               name, url, NULL, timer_interval);
+       } else {
+               descriptor = lttng_session_descriptor_live_create(
+                               name, timer_interval);
+       }
+       if (!descriptor) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
+       ret_code = lttng_create_session_ext(descriptor);
+       ret = ret_code == LTTNG_OK ? 0 : -ret_code;
+end:
+       lttng_session_descriptor_destroy(descriptor);
+       return ret;
 }
 
 /*
  * Stop the session and wait for the data before destroying it
+ *
+ * Return 0 on success else a negative LTTng error code.
  */
 int lttng_destroy_session(const char *session_name)
 {
        int ret;
+       enum lttng_error_code ret_code;
+       enum lttng_destruction_handle_status status;
+       struct lttng_destruction_handle *handle = NULL;
 
        /*
-        * Stop the tracing and wait for the data.
+        * Stop the tracing and wait for the data to be
+        * consumed.
         */
        ret = _lttng_stop_tracing(session_name, 1);
        if (ret && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
                goto end;
        }
 
-       ret = _lttng_destroy_session(session_name);
+       ret_code = lttng_destroy_session_ext(session_name, &handle);
+       if (ret_code != LTTNG_OK) {
+               ret = (int) -ret_code;
+               goto end;
+       }
+       assert(handle);
+
+       /* Block until the completion of the destruction of the session. */
+       status = lttng_destruction_handle_wait_for_completion(handle, -1);
+       if (status != LTTNG_DESTRUCTION_HANDLE_STATUS_COMPLETED) {
+               ret = -LTTNG_ERR_UNK;
+               goto end;
+       }
+
+       status = lttng_destruction_handle_get_result(handle, &ret_code);
+       if (status != LTTNG_DESTRUCTION_HANDLE_STATUS_OK) {
+               ret = -LTTNG_ERR_UNK;
+               goto end;
+       }
+       ret = ret_code == LTTNG_OK ? 0 : -ret_code;
 end:
+       lttng_destruction_handle_destroy(handle);
        return ret;
 }
 
@@ -1776,21 +1999,10 @@ end:
  */
 int lttng_destroy_session_no_wait(const char *session_name)
 {
-       int ret;
+       enum lttng_error_code ret_code;
 
-       /*
-        * Stop the tracing without waiting for the data.
-        * The session might already have been stopped, so just
-        * skip this error.
-        */
-       ret = _lttng_stop_tracing(session_name, 0);
-       if (ret && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
-               goto end;
-       }
-
-       ret = _lttng_destroy_session(session_name);
-end:
-       return ret;
+       ret_code = lttng_destroy_session_ext(session_name, NULL);
+       return ret_code == LTTNG_OK ? ret_code : -ret_code;
 }
 
 /*
@@ -1799,19 +2011,72 @@ end:
  * Returns the number of lttng_session entries in sessions;
  * on error, returns a negative value.
  */
-int lttng_list_sessions(struct lttng_session **sessions)
+int lttng_list_sessions(struct lttng_session **out_sessions)
 {
        int ret;
        struct lttcomm_session_msg lsm;
+       const size_t session_size = sizeof(struct lttng_session) +
+                       sizeof(struct lttng_session_extended);
+       size_t session_count, i;
+       struct lttng_session_extended *sessions_extended_begin;
+       struct lttng_session *sessions = NULL;
 
        memset(&lsm, 0, sizeof(lsm));
        lsm.cmd_type = LTTNG_LIST_SESSIONS;
-       ret = lttng_ctl_ask_sessiond(&lsm, (void**) sessions);
-       if (ret < 0) {
-               return ret;
+       ret = lttng_ctl_ask_sessiond(&lsm, (void**) &sessions);
+       if (ret <= 0) {
+               goto end;
+       }
+       if (!sessions) {
+               ret = -LTTNG_ERR_FATAL;
+               goto end;
+       }
+
+       if (ret % session_size) {
+               ret = -LTTNG_ERR_UNK;
+               free(sessions);
+               *out_sessions = NULL;
+               goto end;
+       }
+       session_count = (size_t) ret / session_size;
+       sessions_extended_begin = (struct lttng_session_extended *)
+                       (&sessions[session_count]);
+
+       /* Set extended session info pointers. */
+       for (i = 0; i < session_count; i++) {
+               struct lttng_session *session = &sessions[i];
+               struct lttng_session_extended *extended =
+                               &(sessions_extended_begin[i]);
+
+               session->extended.ptr = extended;
        }
 
-       return ret / sizeof(struct lttng_session);
+       ret = (int) session_count;
+       *out_sessions = sessions;
+end:
+       return ret;
+}
+
+enum lttng_error_code lttng_session_get_creation_time(
+               const struct lttng_session *session, uint64_t *creation_time)
+{
+       enum lttng_error_code ret = LTTNG_OK;
+       struct lttng_session_extended *extended;
+
+       if (!session || !creation_time || !session->extended.ptr) {
+               ret = LTTNG_ERR_INVALID;
+               goto end;
+       }
+
+       extended = session->extended.ptr;
+       if (!extended->creation_time.is_set) {
+               /* Not created on the session daemon yet. */
+               ret = LTTNG_ERR_SESSION_NOT_EXIST;
+               goto end;
+       }
+       *creation_time = extended->creation_time.value;
+end:
+       return ret;
 }
 
 int lttng_set_session_shm_path(const char *session_name,
@@ -1890,7 +2155,7 @@ int lttng_list_channels(struct lttng_handle *handle,
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
                        sizeof(lsm.session.name));
 
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        ret = lttng_ctl_ask_sessiond(&lsm, (void**) channels);
        if (ret < 0) {
@@ -1950,7 +2215,7 @@ int lttng_list_events(struct lttng_handle *handle,
                        sizeof(lsm.session.name));
        lttng_ctl_copy_string(lsm.u.list.channel_name, channel_name,
                        sizeof(lsm.u.list.channel_name));
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm, NULL, 0, NULL, 0,
                (void **) &reception_buffer, (void **) &cmd_header,
@@ -1967,7 +2232,7 @@ int lttng_list_events(struct lttng_handle *handle,
        /* Set number of events and free command header */
        nb_events = cmd_header->nb_events;
        if (nb_events > INT_MAX) {
-               ret = -EOVERFLOW;
+               ret = -LTTNG_ERR_OVERFLOW;
                goto end;
        }
        free(cmd_header);
@@ -2477,7 +2742,7 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 
        lttng_ctl_copy_string(lsm.session.name, handle->session_name,
                        sizeof(lsm.session.name));
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
        size = uri_parse_str_urls(control_url, data_url, &uris);
        if (size < 0) {
@@ -2496,6 +2761,7 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 /*
  * [OBSOLETE]
  */
+int lttng_enable_consumer(struct lttng_handle *handle);
 int lttng_enable_consumer(struct lttng_handle *handle)
 {
        return -ENOSYS;
@@ -2504,77 +2770,21 @@ int lttng_enable_consumer(struct lttng_handle *handle)
 /*
  * [OBSOLETE]
  */
+int lttng_disable_consumer(struct lttng_handle *handle);
 int lttng_disable_consumer(struct lttng_handle *handle)
 {
        return -ENOSYS;
 }
 
 /*
- * This is an extension of create session that is ONLY and SHOULD only be used
- * by the lttng command line program. It exists to avoid using URI parsing in
- * the lttng client.
- *
- * We need the date and time for the trace path subdirectory for the case where
- * the user does NOT define one using either -o or -U. Using the normal
- * lttng_create_session API call, we have no clue on the session daemon side if
- * the URL was generated automatically by the client or define by the user.
- *
- * So this function "wrapper" is hidden from the public API, takes the datetime
- * string and appends it if necessary to the URI subdirectory before sending it
- * to the session daemon.
- *
- * With this extra function, the lttng_create_session call behavior is not
- * changed and the timestamp is appended to the URI on the session daemon side
- * if necessary.
+ * [OBSOLETE]
  */
+int _lttng_create_session_ext(const char *name, const char *url,
+               const char *datetime);
 int _lttng_create_session_ext(const char *name, const char *url,
                const char *datetime)
 {
-       int ret;
-       ssize_t size;
-       struct lttcomm_session_msg lsm;
-       struct lttng_uri *uris = NULL;
-
-       if (name == NULL || datetime == NULL) {
-               return -LTTNG_ERR_INVALID;
-       }
-
-       memset(&lsm, 0, sizeof(lsm));
-
-       lsm.cmd_type = LTTNG_CREATE_SESSION;
-       lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
-
-       /* There should never be a data URL. */
-       size = uri_parse_str_urls(url, NULL, &uris);
-       if (size < 0) {
-               ret = -LTTNG_ERR_INVALID;
-               goto error;
-       }
-
-       lsm.u.uri.size = size;
-
-       if (size > 0 && uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) {
-               /* Don't append datetime if the name was automatically created. */
-               if (strncmp(name, DEFAULT_SESSION_NAME "-",
-                                       strlen(DEFAULT_SESSION_NAME) + 1)) {
-                       ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s",
-                                       name, datetime);
-               } else {
-                       ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s", name);
-               }
-               if (ret < 0) {
-                       PERROR("snprintf uri subdir");
-                       ret = -LTTNG_ERR_FATAL;
-                       goto error;
-               }
-       }
-
-       ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, uris,
-                       sizeof(struct lttng_uri) * size, NULL);
-
-error:
-       free(uris);
-       return ret;
+       return -ENOSYS;
 }
 
 /*
@@ -2605,6 +2815,10 @@ int lttng_data_pending(const char *session_name)
                /* Unexpected payload size */
                ret = -LTTNG_ERR_INVALID;
                goto end;
+       } else if (!pending) {
+               /* Internal error. */
+               ret = -LTTNG_ERR_UNK;
+               goto end;
        }
 
        ret = (int) *pending;
@@ -2614,99 +2828,104 @@ end:
 }
 
 /*
- * Create a session exclusively used for snapshot.
+ * List IDs in the tracker.
+ *
+ * tracker_type is the type of tracker.
+ * ids is set to an allocated array of IDs currently tracked. On
+ * success, ids and contained ids must be freed/destroy by the caller.
+ * nr_ids is set to the number of entries contained by the ids array.
  *
- * Returns LTTNG_OK on success or a negative error code.
+ * Returns 0 on success, else a negative LTTng error code.
  */
-int lttng_create_session_snapshot(const char *name, const char *snapshot_url)
+int lttng_list_tracker_ids(struct lttng_handle *handle,
+               enum lttng_tracker_type tracker_type,
+               struct lttng_tracker_ids **_ids)
 {
-       int ret;
-       ssize_t size;
+       int ret, i;
        struct lttcomm_session_msg lsm;
-       struct lttng_uri *uris = NULL;
+       struct lttcomm_tracker_command_header *cmd_header = NULL;
+       char *cmd_payload = NULL, *p;
+       size_t cmd_header_len;
+       size_t nr_ids = 0;
+       struct lttng_tracker_ids *ids = NULL;
 
-       if (name == NULL) {
+       if (handle == NULL) {
                return -LTTNG_ERR_INVALID;
        }
 
        memset(&lsm, 0, sizeof(lsm));
+       lsm.cmd_type = LTTNG_LIST_TRACKER_IDS;
+       lsm.u.id_tracker_list.tracker_type = tracker_type;
+       lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+                       sizeof(lsm.session.name));
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
 
-       lsm.cmd_type = LTTNG_CREATE_SESSION_SNAPSHOT;
-       lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
-
-       size = uri_parse_str_urls(snapshot_url, NULL, &uris);
-       if (size < 0) {
-               return -LTTNG_ERR_INVALID;
+       ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm, NULL, 0, NULL, 0,
+                       (void **) &cmd_payload, (void **) &cmd_header,
+                       &cmd_header_len);
+       if (ret < 0) {
+               goto error;
        }
 
-       lsm.u.uri.size = size;
-
-       /*
-        * If the user does not specify a custom subdir, use the session name.
-        */
-       if (size > 0 && uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) {
-               ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s", name);
-               if (ret < 0) {
-                       PERROR("snprintf uri subdir");
-                       ret = -LTTNG_ERR_FATAL;
-                       goto error;
-               }
+       /* Set number of tracker_id and free command header */
+       nr_ids = cmd_header->nb_tracker_id;
+       if (nr_ids > INT_MAX) {
+               ret = -LTTNG_ERR_OVERFLOW;
+               goto error;
        }
+       free(cmd_header);
+       cmd_header = NULL;
 
-       ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, uris,
-                       sizeof(struct lttng_uri) * size, NULL);
-
-error:
-       free(uris);
-       return ret;
-}
-
-/*
- * Create a session exclusively used for live.
- *
- * Returns LTTNG_OK on success or a negative error code.
- */
-int lttng_create_session_live(const char *name, const char *url,
-               unsigned int timer_interval)
-{
-       int ret;
-       ssize_t size;
-       struct lttcomm_session_msg lsm;
-       struct lttng_uri *uris = NULL;
-
-       if (name == NULL || timer_interval == 0) {
-               return -LTTNG_ERR_INVALID;
+       ids = lttng_tracker_ids_create(nr_ids);
+       if (!ids) {
+               ret = -LTTNG_ERR_NOMEM;
+               goto error;
        }
 
-       memset(&lsm, 0, sizeof(lsm));
+       p = cmd_payload;
+       for (i = 0; i < nr_ids; i++) {
+               struct lttcomm_tracker_id_header *tracker_id;
+               struct lttng_tracker_id *id;
+               enum lttng_tracker_id_status status;
 
-       lsm.cmd_type = LTTNG_CREATE_SESSION_LIVE;
-       lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
-
-       if (url) {
-               size = uri_parse_str_urls(url, NULL, &uris);
-               if (size <= 0) {
+               tracker_id = (struct lttcomm_tracker_id_header *) p;
+               p += sizeof(struct lttcomm_tracker_id_header);
+               id = lttng_tracker_ids_get_pointer_of_index(ids, i);
+               if (!id) {
                        ret = -LTTNG_ERR_INVALID;
-                       goto end;
+                       goto error;
+               }
+
+               switch (tracker_id->type) {
+               case LTTNG_ID_ALL:
+                       status = lttng_tracker_id_set_all(id);
+                       break;
+               case LTTNG_ID_VALUE:
+                       id->value = tracker_id->u.value;
+                       status = lttng_tracker_id_set_value(
+                                       id, tracker_id->u.value);
+                       break;
+               case LTTNG_ID_STRING:
+                       status = lttng_tracker_id_set_string(id, p);
+                       p += tracker_id->u.var_data_len;
+                       break;
+               default:
+                       goto error;
                }
 
-               /* file:// is not accepted for live session. */
-               if (uris[0].dtype == LTTNG_DST_PATH) {
+               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
                        ret = -LTTNG_ERR_INVALID;
-                       goto end;
+                       goto error;
                }
-       } else {
-               size = 0;
        }
+       free(cmd_payload);
+       *_ids = ids;
+       return 0;
 
-       lsm.u.session_live.nb_uri = size;
-       lsm.u.session_live.timer_interval = timer_interval;
-
-       ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, uris,
-                       sizeof(struct lttng_uri) * size, NULL);
-
-end:
-       free(uris);
+error:
+       lttng_tracker_ids_destroy(ids);
+       free(cmd_payload);
+       free(cmd_header);
        return ret;
 }
 
@@ -2723,40 +2942,55 @@ end:
 int lttng_list_tracker_pids(struct lttng_handle *handle,
                int *_enabled, int32_t **_pids, size_t *_nr_pids)
 {
-       int ret;
-       int enabled = 1;
-       struct lttcomm_session_msg lsm;
-       size_t nr_pids;
-       int32_t *pids = NULL;
+       struct lttng_tracker_ids *ids = NULL;
+       unsigned int nr_ids = 0;
+       int *pids = NULL;
+       int ret = 0, i;
+       enum lttng_tracker_id_status status;
+       const struct lttng_tracker_id *id;
 
-       if (handle == NULL) {
-               return -LTTNG_ERR_INVALID;
+       ret = lttng_list_tracker_ids(handle, LTTNG_TRACKER_PID, &ids);
+       if (ret < 0) {
+               return ret;
        }
 
-       memset(&lsm, 0, sizeof(lsm));
-       lsm.cmd_type = LTTNG_LIST_TRACKER_PIDS;
-       lttng_ctl_copy_string(lsm.session.name, handle->session_name,
-                       sizeof(lsm.session.name));
-       lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+       status = lttng_tracker_ids_get_count(ids, &nr_ids);
+       if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+               ret = -LTTNG_ERR_INVALID;
+               goto end;
+       }
 
-       ret = lttng_ctl_ask_sessiond(&lsm, (void **) &pids);
-       if (ret < 0) {
-               return ret;
+       if (nr_ids == 1) {
+               id = lttng_tracker_ids_get_at_index(ids, 0);
+               if (id && lttng_tracker_id_get_type(id) == LTTNG_ID_ALL) {
+                       *_enabled = 0;
+                       goto end;
+               }
        }
-       nr_pids = ret / sizeof(int32_t);
-       if (nr_pids > 0 && !pids) {
-               return -LTTNG_ERR_UNK;
+
+       *_enabled = 1;
+
+       pids = zmalloc(nr_ids * sizeof(*pids));
+       if (!pids) {
+               ret = -LTTNG_ERR_NOMEM;
+               goto end;
        }
-       if (nr_pids == 1 && pids[0] == -1) {
-               free(pids);
-               pids = NULL;
-               enabled = 0;
-               nr_pids = 0;
+       for (i = 0; i < nr_ids; i++) {
+               id = lttng_tracker_ids_get_at_index(ids, i);
+               status = lttng_tracker_id_get_value(id, &pids[i]);
+               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                       ret = -LTTNG_ERR_UNK;
+                       goto end;
+               }
        }
-       *_enabled = enabled;
        *_pids = pids;
-       *_nr_pids = nr_pids;
-       return 0;
+       *_nr_pids = nr_ids;
+end:
+       lttng_tracker_ids_destroy(ids);
+       if (ret < 0) {
+               free(pids);
+       }
+       return ret;
 }
 
 /*
@@ -2893,6 +3127,131 @@ end:
        return ret;
 }
 
+static int lttng_track_untrack_id(struct lttng_handle *handle,
+               enum lttng_tracker_type tracker_type,
+               const struct lttng_tracker_id *id,
+               enum lttcomm_sessiond_command cmd)
+{
+       int ret;
+       struct lttcomm_session_msg lsm;
+       const char *var_data = NULL;
+       size_t var_data_len = 0;
+       int value;
+       enum lttng_tracker_id_status status;
+
+       /* NULL arguments are forbidden. No default values. */
+       if (handle == NULL) {
+               goto error;
+       }
+
+       memset(&lsm, 0, sizeof(lsm));
+
+       lsm.cmd_type = cmd;
+       lsm.u.id_tracker.tracker_type = tracker_type;
+       lsm.u.id_tracker.id_type = lttng_tracker_id_get_type(id);
+       switch (lsm.u.id_tracker.id_type) {
+       case LTTNG_ID_ALL:
+               break;
+       case LTTNG_ID_VALUE:
+               status = lttng_tracker_id_get_value(id, &value);
+               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                       goto error;
+               }
+               lsm.u.id_tracker.u.value = value;
+               break;
+       case LTTNG_ID_STRING:
+               status = lttng_tracker_id_get_string(id, &var_data);
+               if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+                       goto error;
+               }
+               var_data_len = strlen(var_data) + 1; /* Includes \0. */
+               lsm.u.id_tracker.u.var_len = var_data_len;
+               break;
+       default:
+               goto error;
+       }
+
+       COPY_DOMAIN_PACKED(lsm.domain, handle->domain);
+
+       lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+                       sizeof(lsm.session.name));
+
+       ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(
+                       &lsm, (char *) var_data, var_data_len, NULL);
+       return ret;
+error:
+       return -LTTNG_ERR_INVALID;
+}
+
+/*
+ * Add ID to session tracker.
+ * Return 0 on success else a negative LTTng error code.
+ */
+int lttng_track_id(struct lttng_handle *handle,
+               enum lttng_tracker_type tracker_type,
+               const struct lttng_tracker_id *id)
+{
+       return lttng_track_untrack_id(handle, tracker_type, id, LTTNG_TRACK_ID);
+}
+
+/*
+ * Remove ID from session tracker.
+ * Return 0 on success else a negative LTTng error code.
+ */
+int lttng_untrack_id(struct lttng_handle *handle,
+               enum lttng_tracker_type tracker_type,
+               const struct lttng_tracker_id *id)
+{
+       return lttng_track_untrack_id(
+                       handle, tracker_type, id, LTTNG_UNTRACK_ID);
+}
+
+/*
+ * Add PID to session tracker.
+ * Return 0 on success else a negative LTTng error code.
+ */
+int lttng_track_pid(struct lttng_handle *handle, int pid)
+{
+       int ret;
+       struct lttng_tracker_id *id = NULL;
+       enum lttng_tracker_id_status status;
+
+       id = lttng_tracker_id_create();
+       status = lttng_tracker_id_set_value(id, pid);
+       if (status == LTTNG_TRACKER_ID_STATUS_INVALID) {
+               ret = -LTTNG_ERR_INVALID;
+               goto error;
+       }
+
+       ret = lttng_track_id(handle, LTTNG_TRACKER_PID, id);
+error:
+       lttng_tracker_id_destroy(id);
+       return ret;
+}
+
+/*
+ * Remove PID from session tracker.
+ * Return 0 on success else a negative LTTng error code.
+ */
+int lttng_untrack_pid(struct lttng_handle *handle, int pid)
+{
+       int ret;
+       struct lttng_tracker_id *id = NULL;
+       enum lttng_tracker_id_status status;
+
+       id = lttng_tracker_id_create();
+       status = lttng_tracker_id_set_value(id, pid);
+       if (status == LTTNG_TRACKER_ID_STATUS_INVALID) {
+               ret = -LTTNG_ERR_INVALID;
+               goto error;
+       }
+
+       ret = lttng_untrack_id(handle, LTTNG_TRACKER_PID, id);
+error:
+       lttng_tracker_id_destroy(id);
+       return ret;
+}
+
 /*
  * lib constructor.
  */
This page took 0.037146 seconds and 4 git commands to generate.