X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=eb9ae8475f272f9b2ad6ce8f22ce4fabadf5bbc3;hb=0d37f2bce95a09b86a1afde525c429d0ae7d19e9;hp=6cc98d542e9a0b54797fb143cc588dbb49133348;hpb=bd29c13d4c9296705a4444404a69c0557e5b8cb9;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 6cc98d542..eb9ae8475 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -30,6 +30,8 @@
 #include <lttng/lttng.h>
 #include <common/compat/socket.h>
 
+#include "unix.h"
+
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
 
@@ -62,6 +64,7 @@ enum lttcomm_sessiond_command {
 	LTTNG_REGISTER_CONSUMER,
 	LTTNG_START_TRACE,
 	LTTNG_STOP_TRACE,
+	LTTNG_LIST_TRACEPOINT_FIELDS,
 };
 
 /*
@@ -157,6 +160,8 @@ enum lttcomm_return_code {
 	CONSUMERD_SPLICE_ENOMEM,		/* ENOMEM from splice(2) */
 	CONSUMERD_SPLICE_ESPIPE,		/* ESPIPE from splice(2) */
 	LTTCOMM_INVALID,			/* Invalid parameter */
+	LTTCOMM_NO_USTCONSUMERD,        /* No UST consumer detected */
+	LTTCOMM_NO_KERNCONSUMERD,       /* No Kernel consumer detected */
 
 	/* MUST be last element */
 	LTTCOMM_NR,						/* Last element */
@@ -282,25 +287,6 @@ struct lttcomm_ust_reply {
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
-extern int lttcomm_create_unix_sock(const char *pathname);
-extern int lttcomm_connect_unix_sock(const char *pathname);
-extern int lttcomm_accept_unix_sock(int sock);
-extern int lttcomm_listen_unix_sock(int sock);
-extern int lttcomm_close_unix_sock(int sock);
-
-/* Send a message accompanied by fd(s) over a unix socket. */
-extern ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd);
-/* Recv a message accompanied by fd(s) from a unix socket */
-extern ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd);
-
-extern ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len);
-extern ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len);
-
-extern ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len);
-extern ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
-		lttng_sock_cred *creds);
-
 extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
-extern int lttcomm_setsockopt_creds_unix_sock(int sock);
 
 #endif	/* _LTTNG_SESSIOND_COMM_H */