Merge branch 'master' of git://git.lttng.org/lttng-tools

[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 10748bbfa29b5495dfc09ddca6538290a804b4e9..17cb51915555393a96f924c2fd47a2afa6afeb5a 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -28,7 +28,7 @@
 #define _GNU_SOURCE
 #include <limits.h>
 #include <lttng/lttng.h>
-#include <sys/socket.h>
+#include <common/compat/socket.h>
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
@@ -75,7 +75,7 @@ enum lttcomm_return_code {
        LTTCOMM_UNKNOWN_DOMAIN,         /* Tracing domain not known */
        LTTCOMM_ALLOC_FAIL,                             /* Trace allocation fail */
        LTTCOMM_NO_SESSION,                             /* No session found */
-       LTTCOMM_CREATE_FAIL,                    /* Create trace fail */
+       LTTCOMM_CREATE_DIR_FAIL,        /* Create directory fail */
        LTTCOMM_SESSION_FAIL,                   /* Create session fail */
        LTTCOMM_START_FAIL,                             /* Start tracing fail */
        LTTCOMM_STOP_FAIL,                              /* Stop tracing fail */
@@ -92,6 +92,7 @@ enum lttcomm_return_code {
        LTTCOMM_APP_NOT_FOUND,          /* App not found in traceable app list */
        LTTCOMM_EPERM,                  /* Permission denied */
        LTTCOMM_KERN_NA,                                /* Kernel tracer unavalable */
+       LTTCOMM_KERN_VERSION,           /* Kernel tracer version is not compatible */
        LTTCOMM_KERN_EVENT_EXIST,       /* Kernel event already exists */
        LTTCOMM_KERN_SESS_FAIL,                 /* Kernel create session failed */
        LTTCOMM_KERN_CHAN_FAIL,                 /* Kernel create channel failed */
@@ -110,6 +111,8 @@ enum lttcomm_return_code {
        LTTCOMM_KERN_DIR_EXIST,                 /* Kernel trace directory exist */
        LTTCOMM_KERN_NO_SESSION,                /* No kernel session found */
        LTTCOMM_KERN_LIST_FAIL,                 /* Kernel listing events failed */
+       LTTCOMM_UST_CALIBRATE_FAIL,     /* UST calibration failed */
+       LTTCOMM_UST_VERSION,            /* UST tracer version is not compatible */
        LTTCOMM_UST_SESS_FAIL,                  /* UST create session failed */
        LTTCOMM_UST_CHAN_EXIST,         /* UST channel already exist */
        LTTCOMM_UST_CHAN_FAIL,                  /* UST create channel failed */
@@ -132,6 +135,7 @@ enum lttcomm_return_code {
        LTTCOMM_UST_EVENT_EXIST,        /* UST event exist */
        LTTCOMM_UST_EVENT_NOT_FOUND,    /* UST event not found */
        LTTCOMM_UST_CONTEXT_EXIST,      /* UST context exist */
+       LTTCOMM_UST_CONTEXT_INVAL,      /* UST context invalid */
 
        CONSUMERD_COMMAND_SOCK_READY,           /* when consumerd command socket ready */
        CONSUMERD_SUCCESS_RECV_FD,              /* success on receiving fds */
@@ -147,6 +151,7 @@ enum lttcomm_return_code {
        CONSUMERD_SPLICE_EINVAL,                /* EINVAL from splice(2) */
        CONSUMERD_SPLICE_ENOMEM,                /* ENOMEM from splice(2) */
        CONSUMERD_SPLICE_ESPIPE,                /* ESPIPE from splice(2) */
+       LTTCOMM_NEED_ROOT_SESSIOND,             /* root sessiond is needed */
        /* MUST be last element */
        LTTCOMM_NR,                                             /* Last element */
 };
@@ -287,7 +292,7 @@ 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,
-               struct ucred *creds);
+               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);