Add and change lttcomm socket API

[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 52369dc625d565a1e8c26d31520caecea48f5cd8..580beec32b74953a4f08099220837183edb40b1e 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -61,6 +61,7 @@ enum lttcomm_sessiond_command {
        LTTNG_ENABLE_ALL_EVENT,
        /* Session daemon command */
        LTTNG_CREATE_SESSION,
+       LTTNG_CREATE_SESSION_URI,
        LTTNG_DESTROY_SESSION,
        LTTNG_LIST_CHANNELS,
        LTTNG_LIST_DOMAINS,
@@ -71,6 +72,17 @@ enum lttcomm_sessiond_command {
        LTTNG_START_TRACE,
        LTTNG_STOP_TRACE,
        LTTNG_LIST_TRACEPOINT_FIELDS,
+       /* Consumer */
+       LTTNG_DISABLE_CONSUMER,
+       LTTNG_ENABLE_CONSUMER,
+       LTTNG_SET_CONSUMER_URI,
+       /* Relay daemon */
+       RELAYD_ADD_STREAM,
+       RELAYD_CREATE_SESSION,
+       RELAYD_START_DATA,
+       RELAYD_UPDATE_SYNC_INFO,
+       RELAYD_VERSION,
+       RELAYD_SEND_METADATA,
 };
 
 /*
@@ -169,11 +181,62 @@ enum lttcomm_return_code {
        LTTCOMM_NO_USTCONSUMERD,        /* No UST consumer detected */
        LTTCOMM_NO_KERNCONSUMERD,       /* No Kernel consumer detected */
        LTTCOMM_EVENT_EXIST_LOGLEVEL,   /* Event already enabled with different loglevel */
+       LTTCOMM_URI_DATA_MISS,          /* Missing network data URI */
+       LTTCOMM_URI_CTRL_MISS,          /* Missing network control URI */
+       LTTCOMM_ENABLE_CONSUMER_FAIL,   /* Enabling consumer failed */
+       LTTCOMM_RELAYD_SESSION_FAIL,    /* lttng-relayd create session failed */
+       LTTCOMM_RELAYD_VERSION_FAIL,    /* lttng-relayd not compatible */
 
        /* MUST be last element */
        LTTCOMM_NR,                                             /* Last element */
 };
 
+/* lttng socket protocol. */
+enum lttcomm_sock_proto {
+       LTTCOMM_SOCK_UDP,
+       LTTCOMM_SOCK_TCP,
+};
+
+/*
+ * Index in the net_families array below. Please keep in sync!
+ */
+enum lttcomm_sock_domain {
+       LTTCOMM_INET      = 1,
+       LTTCOMM_INET6     = 2,
+};
+
+struct lttcomm_sockaddr {
+       enum lttcomm_sock_domain type;
+       union {
+               struct sockaddr_in sin;
+               struct sockaddr_in6 sin6;
+       } addr;
+};
+
+struct lttcomm_sock {
+       int fd;
+       enum lttcomm_sock_proto proto;
+       struct lttcomm_sockaddr sockaddr;
+       const struct lttcomm_proto_ops *ops;
+};
+
+struct lttcomm_net_family {
+       int family;
+       int (*create) (struct lttcomm_sock *sock, int type, int proto);
+};
+
+struct lttcomm_proto_ops {
+       int (*bind) (struct lttcomm_sock *sock);
+       int (*close) (struct lttcomm_sock *sock);
+       int (*connect) (struct lttcomm_sock *sock);
+       struct lttcomm_sock *(*accept) (struct lttcomm_sock *sock);
+       int (*listen) (struct lttcomm_sock *sock, int backlog);
+       ssize_t (*recvmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
+                       int flags);
+       ssize_t (*sendmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
+                       int flags);
+};
+
 /*
  * Data structure received from lttng client to session daemon.
  */
@@ -210,6 +273,13 @@ struct lttcomm_session_msg {
                        char channel_name[NAME_MAX];
                } list;
                struct lttng_calibrate calibrate;
+               /* Used by the set_consumer_uri call */
+               struct lttng_uri uri;
+               struct {
+                       uint32_t enable_consumer;
+                       struct lttng_uri ctrl_uri;
+                       struct lttng_uri data_uri;
+               } create_uri;
        } u;
 };
 
@@ -238,6 +308,7 @@ struct lttcomm_consumer_msg {
                        uint64_t max_sb_size; /* the subbuffer size for this channel */
                        /* shm_fd and wait_fd are sent as ancillary data */
                        uint64_t mmap_len;
+                       char name[LTTNG_SYMBOL_NAME_LEN];
                } channel;
                struct {
                        int channel_key;
@@ -249,7 +320,16 @@ struct lttcomm_consumer_msg {
                        uid_t uid;         /* User ID owning the session */
                        gid_t gid;         /* Group ID owning the session */
                        char path_name[PATH_MAX];
+                       int net_index;
+                       unsigned int metadata_flag;
+                       char name[LTTNG_SYMBOL_NAME_LEN];  /* Name string of the stream */
                } stream;
+               struct {
+                       int net_index;
+                       enum lttng_stream_type type;
+                       /* Open socket to the relayd */
+                       struct lttcomm_sock sock;
+               } relayd_sock;
        } u;
 };
 
@@ -294,52 +374,6 @@ struct lttcomm_ust_reply {
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
-/* lttng socket protocol. */
-enum lttcomm_sock_proto {
-       LTTCOMM_SOCK_UDP,
-       LTTCOMM_SOCK_TCP,
-};
-
-/*
- * Index in the net_families array below. Please keep in sync!
- */
-enum lttcomm_sock_domain {
-       LTTCOMM_INET,
-       LTTCOMM_INET6,
-};
-
-struct lttcomm_sockaddr {
-       enum lttcomm_sock_domain type;
-       union {
-               struct sockaddr_in sin;
-               struct sockaddr_in6 sin6;
-       } addr;
-};
-
-struct lttcomm_sock {
-       int fd;
-       enum lttcomm_sock_proto proto;
-       struct lttcomm_sockaddr sockaddr;
-       const struct lttcomm_proto_ops *ops;
-};
-
-struct lttcomm_net_family {
-       int family;
-       int (*create) (struct lttcomm_sock *sock, int type, int proto);
-};
-
-struct lttcomm_proto_ops {
-       int (*bind) (struct lttcomm_sock *sock);
-       int (*close) (struct lttcomm_sock *sock);
-       int (*connect) (struct lttcomm_sock *sock);
-       struct lttcomm_sock *(*accept) (struct lttcomm_sock *sock);
-       int (*listen) (struct lttcomm_sock *sock, int backlog);
-       ssize_t (*recvmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
-                       int flags);
-       ssize_t (*sendmsg) (struct lttcomm_sock *sock, void *buf, size_t len,
-                       int flags);
-};
-
 extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
 
 extern int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
@@ -347,9 +381,12 @@ extern int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
 extern int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
                const char *ip, unsigned int port);
 
-extern struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_domain domain,
-               enum lttcomm_sock_proto proto);
-extern int lttcomm_create_sock(struct lttcomm_sock *sock,
-               enum lttcomm_sock_domain domain, enum lttcomm_sock_proto proto);
+extern struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto);
+extern int lttcomm_create_sock(struct lttcomm_sock *sock);
+extern struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri);
+extern void lttcomm_destroy_sock(struct lttcomm_sock *sock);
+extern struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src);
+extern void lttcomm_copy_sock(struct lttcomm_sock *dst,
+               struct lttcomm_sock *src);
 
 #endif /* _LTTNG_SESSIOND_COMM_H */