bin: compile lttng-sessiond as C++

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.h

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index d946aa3a3074b8979bdc36478d3a8fe633d713db..65020bbfcd098a9b22f4d1e15abfa6b41e8ed9cd 100644 (file)
--- 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
 
@@ -107,6 +111,7 @@ enum lttcomm_sessiond_command {
        LTTNG_CREATE_SESSION_EXT                        = 49,
        LTTNG_CLEAR_SESSION                             = 50,
        LTTNG_LIST_TRIGGERS                             = 51,
+       LTTNG_EXECUTE_ERROR_QUERY                       = 52,
 };
 
 static inline
@@ -197,6 +202,8 @@ const char *lttcomm_sessiond_command_str(enum lttcomm_sessiond_command cmd)
                return "LTTNG_CLEAR_SESSION";
        case LTTNG_LIST_TRIGGERS:
                return "LTTNG_LIST_TRIGGERS";
+       case LTTNG_EXECUTE_ERROR_QUERY:
+               return "LTTNG_EXECUTE_ERROR_QUERY";
        default:
                abort();
        }
@@ -483,7 +490,11 @@ 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;
+               } LTTNG_PACKED error_query;
                struct {
                        uint64_t rotation_id;
                } LTTNG_PACKED get_rotation_info;
@@ -522,7 +533,7 @@ struct lttcomm_session_msg {
  * starts at reloc_table_offset.
  */
 #define LTTNG_FILTER_PADDING   32
-struct lttng_filter_bytecode {
+struct lttng_bytecode {
        uint32_t len;   /* len of data */
        uint32_t reloc_table_offset;
        uint64_t seqnum;
@@ -860,11 +871,11 @@ struct lttcomm_ust_msg {
        uint32_t handle;
        uint32_t cmd;
        union {
-               struct lttng_ust_channel channel;
-               struct lttng_ust_stream stream;
-               struct lttng_ust_event event;
-               struct lttng_ust_context context;
-               struct lttng_ust_tracer_version version;
+               struct lttng_ust_abi_channel channel;
+               struct lttng_ust_abi_stream stream;
+               struct lttng_ust_abi_event event;
+               struct lttng_ust_abi_context context;
+               struct lttng_ust_abi_tracer_version version;
        } u;
 } LTTNG_PACKED;
 
@@ -884,44 +895,48 @@ struct lttcomm_ust_reply {
                struct {
                        uint64_t memory_map_size;
                } LTTNG_PACKED stream;
-               struct lttng_ust_tracer_version version;
+               struct lttng_ust_abi_tracer_version version;
        } u;
 } LTTNG_PACKED;
 
 #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 */