Refactor: lttng-ctl: follow terminology of the tracker documentation

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl-helper.h

diff --git a/src/lib/lttng-ctl/lttng-ctl-helper.h b/src/lib/lttng-ctl/lttng-ctl-helper.h
index 8e9786bc244dd361081133c960d9bd785f0da3e8..f252bbbde3ba089669bc7a43681081cb6d99f608 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl-helper.h
+++ b/src/lib/lttng-ctl/lttng-ctl-helper.h
@@ -1,18 +1,8 @@
 /*
  * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef LTTNG_CTL_HELPER_H
@@ -41,22 +31,35 @@ void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
  * Return the size of the received data on success or else a negative lttng
  * error code. If buf is NULL, 0 is returned on success.
  */
-int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
+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);
 
 /*
- * Calls lttng_ctl_ask_sessiond_varlen() with no expected command header.
+ * Calls lttng_ctl_ask_sessiond_fds_varlen() with no expected command header.
  */
-static inline
-int lttng_ctl_ask_sessiond_varlen_no_cmd_header(struct lttcomm_session_msg *lsm,
-               void *vardata, size_t vardata_len, void **user_payload_buf)
+static inline int lttng_ctl_ask_sessiond_varlen_no_cmd_header(
+               struct lttcomm_session_msg *lsm,
+               const void *vardata,
+               size_t vardata_len,
+               void **user_payload_buf)
 {
-       return lttng_ctl_ask_sessiond_varlen(lsm, vardata,
+       return lttng_ctl_ask_sessiond_fds_varlen(lsm, NULL, 0, vardata,
                vardata_len, user_payload_buf, NULL, NULL);
 }
 
+/*
+ * Calls lttng_ctl_ask_sessiond_fds_varlen() with fds and no expected command header.
+ */
+static inline
+int lttng_ctl_ask_sessiond_fds_no_cmd_header(struct lttcomm_session_msg *lsm,
+               const int *fds, size_t nb_fd, void **buf)
+{
+       return lttng_ctl_ask_sessiond_fds_varlen(lsm, fds, nb_fd, NULL,
+               0, NULL, NULL, NULL);
+}
 /*
  * Use this if no variable length data needs to be sent.
  */
@@ -68,4 +71,6 @@ int lttng_ctl_ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 
 int lttng_check_tracing_group(void);
 
+int connect_sessiond(void);
+
 #endif /* LTTNG_CTL_HELPER_H */