X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl-helper.h;h=8e9786bc244dd361081133c960d9bd785f0da3e8;hb=ef0e06bcabd5f5fcf609b60d6558c2bdded5e496;hp=58b3dba57fecb13c93a946fd8b759ace6b531ba1;hpb=6c71277b0dc97ce8a4ac6b8d359b4b349c04b658;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl-helper.h b/src/lib/lttng-ctl/lttng-ctl-helper.h
index 58b3dba57..8e9786bc2 100644
--- a/src/lib/lttng-ctl/lttng-ctl-helper.h
+++ b/src/lib/lttng-ctl/lttng-ctl-helper.h
@@ -18,7 +18,6 @@
 #ifndef LTTNG_CTL_HELPER_H
 #define LTTNG_CTL_HELPER_H
 
-#define _GNU_SOURCE
 #include <stdio.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -36,14 +35,27 @@ void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
 		struct lttng_domain *src);
 
 /*
- * Sends the lttcomm message to the session daemon and fills buf of the
+ * Sends the lttcomm message to the session daemon and fills buf if the
  * returned data is not NULL.
  *
  * 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,
-		void *vardata, size_t varlen, void **buf);
+		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.
+ */
+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)
+{
+	return lttng_ctl_ask_sessiond_varlen(lsm, vardata,
+		vardata_len, user_payload_buf, NULL, NULL);
+}
 
 /*
  * Use this if no variable length data needs to be sent.
@@ -51,7 +63,7 @@ int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
 static inline
 int lttng_ctl_ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 {
-	return lttng_ctl_ask_sessiond_varlen(lsm, NULL, 0, buf);
+	return lttng_ctl_ask_sessiond_varlen_no_cmd_header(lsm, NULL, 0, buf);
 }
 
 int lttng_check_tracing_group(void);