Add utils to send file descriptors to the sessiond

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index f0f2e801c0128065e1d143b27bc6d929b69c0249..eadb00eda37af2fb293723aab83aa237f9515144 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -1,5 +1,5 @@
 /*
- * liblttngctl.c
+ * lttng-ctl.c
  *
  * Linux Trace Toolkit Control Library
  *
@@ -176,6 +176,35 @@ end:
        return ret;
 }
 
+/*
+ * Send file descriptors to the session daemon.
+ *
+ * On success, returns the number of bytes sent (>=0)
+ * On error, returns -1
+ */
+static int send_session_fds(const int *fds, size_t nb_fd)
+{
+       int ret;
+
+       if (!connected) {
+               ret = -LTTNG_ERR_NO_SESSIOND;
+               goto end;
+       }
+
+       if (!fds || !nb_fd) {
+               ret = 0;
+               goto end;
+       }
+
+       ret = lttcomm_send_fds_unix_sock(sessiond_socket, fds, nb_fd);
+       if (ret < 0) {
+               ret = -LTTNG_ERR_FATAL;
+       }
+
+end:
+       return ret;
+}
+
 /*
  * Receive data from the sessiond socket.
  *
@@ -445,15 +474,16 @@ end:
 
 /*
  * Ask the session daemon a specific command and put the data into buf.
- * Takes extra var. len. data as input to send to the session daemon.
+ * Takes extra var. len. data and file descriptors as input to send to the
+ * session daemon.
  *
  * Return size of data (only payload, not header) or a negative error code.
  */
 LTTNG_HIDDEN
-int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
-               const void *vardata, size_t vardata_len,
-               void **user_payload_buf, void **user_cmd_header_buf,
-               size_t *user_cmd_header_len)
+int lttng_ctl_ask_sessiond_fds_varlen(struct lttcomm_session_msg *lsm,
+               const int *fds, size_t nb_fd, const void *vardata,
+               size_t vardata_len, void **user_payload_buf,
+               void **user_cmd_header_buf, size_t *user_cmd_header_len)
 {
        int ret;
        size_t payload_len;
@@ -478,6 +508,13 @@ int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
                goto end;
        }
 
+       /* Send fds */
+       ret = send_session_fds(fds, nb_fd);
+       if (ret < 0) {
+               /* Ret value is a valid lttng error code. */
+               goto end;
+       }
+
        /* Get header from data transmission */
        ret = recv_data_sessiond(&llm, sizeof(llm));
        if (ret < 0) {
@@ -1873,8 +1910,8 @@ int lttng_list_events(struct lttng_handle *handle,
                        sizeof(lsm.u.list.channel_name));
        lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
-       ret = lttng_ctl_ask_sessiond_varlen(&lsm, NULL, 0, (void **) events,
-               (void **) &cmd_header, &cmd_header_len);
+       ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm, NULL, 0, NULL, 0,
+               (void **) events, (void **) &cmd_header, &cmd_header_len);
        if (ret < 0) {
                goto error;
        }
@@ -1913,100 +1950,6 @@ error:
        return ret;
 }
 
-int lttng_event_get_filter_expression(struct lttng_event *event,
-       const char **filter_expression)
-{
-       int ret = 0;
-       struct lttcomm_event_extended_header *ext_header;
-
-       if (!event || !filter_expression) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
-
-       ext_header = event->extended.ptr;
-
-       if (!ext_header) {
-               /*
-                * This can happen since the lttng_event structure is
-                * used for other tasks where this pointer is never set.
-                */
-               *filter_expression = NULL;
-               goto end;
-       }
-
-       if (ext_header->filter_len) {
-               *filter_expression = ((const char *) (ext_header)) +
-                               sizeof(*ext_header);
-       } else {
-               *filter_expression = NULL;
-       }
-
-end:
-       return ret;
-}
-
-int lttng_event_get_exclusion_name_count(struct lttng_event *event)
-{
-       int ret;
-       struct lttcomm_event_extended_header *ext_header;
-
-       if (!event) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
-
-       ext_header = event->extended.ptr;
-       if (!ext_header) {
-               /*
-                * This can happen since the lttng_event structure is
-                * used for other tasks where this pointer is never set.
-                */
-               ret = 0;
-               goto end;
-       }
-
-       if (ext_header->nb_exclusions > INT_MAX) {
-               ret = -LTTNG_ERR_OVERFLOW;
-               goto end;
-       }
-       ret = (int) ext_header->nb_exclusions;
-end:
-       return ret;
-}
-
-int lttng_event_get_exclusion_name(struct lttng_event *event,
-               size_t index, const char **exclusion_name)
-{
-       int ret = 0;
-       struct lttcomm_event_extended_header *ext_header;
-       void *at;
-
-       if (!event || !exclusion_name) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
-
-       ext_header = event->extended.ptr;
-       if (!ext_header) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
-
-       if (index >= ext_header->nb_exclusions) {
-               ret = -LTTNG_ERR_INVALID;
-               goto end;
-       }
-
-       at = (void *) ext_header + sizeof(*ext_header);
-       at += ext_header->filter_len;
-       at += index * LTTNG_SYMBOL_NAME_LEN;
-       *exclusion_name = at;
-
-end:
-       return ret;
-}
-
 /*
  * Sets the tracing_group variable with name.
  * This function allocates memory pointed to by tracing_group.