X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=b155fe4adc712ac688fc5279f1cb945cc2bbaf92;hb=97535efaa975ca52bf02c2d5e76351bfd2e3defa;hp=d24d2f58001dee8b011b094ef849b5a6fa714a6e;hpb=b99a0cb3edd93f55e712096a352d64b79d4716bb;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index d24d2f580..b155fe4ad 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -37,6 +37,10 @@
 #include "inet6.h"
 #include <common/unix.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
 
@@ -48,11 +52,6 @@
 #define LTTCOMM_MAX_SEND_FDS           16
 #endif
 
-/*
- * Get the error code index from 0 since LTTCOMM_OK start at 1000
- */
-#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_CONSUMERD_COMMAND_SOCK_READY)
-
 enum lttcomm_sessiond_command {
 	/* Tracer command */
 	LTTNG_ADD_CONTEXT                               = 0,
@@ -275,7 +274,7 @@ enum lttcomm_return_code {
 	LTTCOMM_CONSUMERD_ROTATION_FAIL,            /* Rotation has failed. */
 	LTTCOMM_CONSUMERD_SNAPSHOT_FAILED,          /* snapshot has failed. */
 	LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED,/* Trace chunk creation failed. */
-	LTTCOMM_CONSUMERD_CLOSE_TRACE_CHUNK_FAILED, /* Trace chunk creation failed. */
+	LTTCOMM_CONSUMERD_CLOSE_TRACE_CHUNK_FAILED, /* Trace chunk close failed. */
 	LTTCOMM_CONSUMERD_INVALID_PARAMETERS,       /* Invalid parameters. */
 	LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_LOCAL, /* Trace chunk exists on consumer daemon. */
 	LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_REMOTE,/* Trace chunk exists on relay daemon. */
@@ -486,6 +485,7 @@ struct lttcomm_session_msg {
 		} LTTNG_PACKED process_attr_tracker_set_tracking_policy;
 		struct {
 			uint32_t length;
+			uint8_t is_trigger_anonymous;
 		} LTTNG_PACKED trigger;
 		struct {
 			uint32_t length;
@@ -896,38 +896,42 @@ struct lttcomm_ust_reply {
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
-LTTNG_HIDDEN const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
+const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
 
-LTTNG_HIDDEN int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
+int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
 		const char *ip, unsigned int port);
-LTTNG_HIDDEN int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
+int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
 		const char *ip, unsigned int port);
 
-LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto);
-LTTNG_HIDDEN int lttcomm_create_sock(struct lttcomm_sock *sock);
-LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri);
-LTTNG_HIDDEN void lttcomm_destroy_sock(struct lttcomm_sock *sock);
-LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src);
-LTTNG_HIDDEN void lttcomm_copy_sock(struct lttcomm_sock *dst,
+struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto);
+int lttcomm_create_sock(struct lttcomm_sock *sock);
+struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri);
+void lttcomm_destroy_sock(struct lttcomm_sock *sock);
+struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src);
+void lttcomm_copy_sock(struct lttcomm_sock *dst,
 		struct lttcomm_sock *src);
 
 /* Relayd socket object. */
-LTTNG_HIDDEN struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(
+struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(
 		struct lttng_uri *uri, uint32_t major, uint32_t minor);
 
-LTTNG_HIDDEN int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
-LTTNG_HIDDEN int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
+int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
+int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
 
-LTTNG_HIDDEN int lttcomm_sock_get_port(const struct lttcomm_sock *sock,
+int lttcomm_sock_get_port(const struct lttcomm_sock *sock,
 		uint16_t *port);
 /*
  * Set a port to an lttcomm_sock. This will have no effect is the socket is
  * already bound.
  */
-LTTNG_HIDDEN int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port);
+int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port);
 
-LTTNG_HIDDEN void lttcomm_init(void);
+void lttcomm_init(void);
 /* Get network timeout, in milliseconds */
-LTTNG_HIDDEN unsigned long lttcomm_get_network_timeout(void);
+unsigned long lttcomm_get_network_timeout(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif	/* _LTTNG_SESSIOND_COMM_H */