#include "lttng-share.h"
-#define LTTNG_RUNDIR "/var/run/lttng"
-
/* Default unix socket path */
#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK LTTNG_RUNDIR "/client-ltt-sessiond"
#define DEFAULT_GLOBAL_APPS_UNIX_SOCK LTTNG_RUNDIR "/apps-ltt-sessiond"
#define DEFAULT_HOME_APPS_UNIX_SOCK "%s/.apps-ltt-sessiond"
#define DEFAULT_HOME_CLIENT_UNIX_SOCK "%s/.client-ltt-sessiond"
-/* Kernel consumer path */
-#define KCONSUMERD_PATH LTTNG_RUNDIR "/kconsumerd"
-#define KCONSUMERD_CMD_SOCK_PATH KCONSUMERD_PATH "/command"
-#define KCONSUMERD_ERR_SOCK_PATH KCONSUMERD_PATH "/error"
-
/* Queue size of listen(2) */
#define MAX_LISTEN 10
#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
enum lttcomm_sessiond_command {
+ KERNEL_CREATE_CHANNEL,
+ KERNEL_CREATE_SESSION,
+ KERNEL_CREATE_STREAM,
+ KERNEL_DISABLE_EVENT,
+ KERNEL_ENABLE_EVENT,
+ KERNEL_ENABLE_ALL_EVENT,
+ KERNEL_LIST_EVENTS,
+ KERNEL_OPEN_METADATA,
+ KERNEL_START_TRACE,
+ KERNEL_STOP_TRACE,
LTTNG_CREATE_SESSION,
LTTNG_DESTROY_SESSION,
LTTNG_FORCE_SUBBUF_SWITCH,
* lttcomm error code.
*/
enum lttcomm_return_code {
- LTTCOMM_OK = 1000, /* Ok */
- LTTCOMM_ERR, /* Unknown Error */
- LTTCOMM_UND, /* Undefine command */
- LTTCOMM_ALLOC_FAIL, /* Trace allocation fail */
- LTTCOMM_NO_SESSION, /* No session found */
- LTTCOMM_CREATE_FAIL, /* Create trace fail */
- LTTCOMM_SESSION_FAIL, /* Create session fail */
- LTTCOMM_START_FAIL, /* Start tracing fail */
- LTTCOMM_STOP_FAIL, /* Stop tracing fail */
- LTTCOMM_LIST_FAIL, /* Listing apps fail */
- LTTCOMM_NO_APPS, /* No traceable application */
- LTTCOMM_NO_SESS, /* No sessions available */
- LTTCOMM_NO_TRACE, /* No trace exist */
- LTTCOMM_FATAL, /* Session daemon had a fatal error */
- LTTCOMM_NO_TRACEABLE, /* Error for non traceable app */
- LTTCOMM_SELECT_SESS, /* Must select a session */
- LTTCOMM_EXIST_SESS, /* Session name already exist */
- LTTCOMM_NR, /* Last element */
-};
-
-/* commands for kconsumerd */
-enum lttcomm_consumerd_command {
- LTTCOMM_ADD_STREAM = 1100,
- LTTCOMM_UPDATE_STREAM, /* pause, delete, start depending on fd state */
- LTTCOMM_STOP, /* delete all */
-};
-
-/* state of each fd in consumerd */
-enum lttcomm_kconsumerd_fd_state {
- ACTIVE_FD,
- PAUSE_FD,
- DELETE_FD,
+ LTTCOMM_OK = 1000, /* Ok */
+ LTTCOMM_ERR, /* Unknown Error */
+ LTTCOMM_UND, /* Undefine command */
+ LTTCOMM_ALLOC_FAIL, /* Trace allocation fail */
+ LTTCOMM_NO_SESSION, /* No session found */
+ LTTCOMM_CREATE_FAIL, /* Create trace fail */
+ LTTCOMM_SESSION_FAIL, /* Create session fail */
+ LTTCOMM_START_FAIL, /* Start tracing fail */
+ LTTCOMM_STOP_FAIL, /* Stop tracing fail */
+ LTTCOMM_LIST_FAIL, /* Listing apps fail */
+ LTTCOMM_NO_APPS, /* No traceable application */
+ LTTCOMM_NO_SESS, /* No sessions available */
+ LTTCOMM_NO_TRACE, /* No trace exist */
+ LTTCOMM_FATAL, /* Session daemon had a fatal error */
+ LTTCOMM_NO_TRACEABLE, /* Error for non traceable app */
+ LTTCOMM_SELECT_SESS, /* Must select a session */
+ LTTCOMM_EXIST_SESS, /* Session name already exist */
+ LTTCOMM_NO_EVENT, /* No event found */
+ LTTCOMM_KERN_NA, /* Kernel tracer unavalable */
+ LTTCOMM_KERN_SESS_FAIL, /* Kernel create session failed */
+ LTTCOMM_KERN_CHAN_FAIL, /* Kernel create channel failed */
+ LTTCOMM_KERN_ENABLE_FAIL, /* Kernel enable event failed */
+ LTTCOMM_KERN_DISABLE_FAIL, /* Kernel disable event failed */
+ LTTCOMM_KERN_META_FAIL, /* Kernel open metadata failed */
+ LTTCOMM_KERN_START_FAIL, /* Kernel start trace failed */
+ LTTCOMM_KERN_STOP_FAIL, /* Kernel stop trace failed */
+ LTTCOMM_KERN_CONSUMER_FAIL, /* Kernel consumer start failed */
+ LTTCOMM_KERN_STREAM_FAIL, /* Kernel create stream failed */
+ LTTCOMM_KERN_DIR_FAIL, /* Kernel trace directory creation failed */
+ LTTCOMM_KERN_DIR_EXIST, /* Kernel trace directory exist */
+ LTTCOMM_KERN_NO_SESSION, /* No kernel session found */
+ LTTCOMM_KERN_LIST_FAIL, /* Kernel listing events failed */
+ KCONSUMERD_COMMAND_SOCK_READY, /* when kconsumerd command socket ready */
+ KCONSUMERD_SUCCESS_RECV_FD, /* success on receiving fds */
+ KCONSUMERD_ERROR_RECV_FD, /* error on receiving fds */
+ KCONSUMERD_POLL_ERROR, /* Error in polling thread in kconsumerd */
+ KCONSUMERD_POLL_NVAL, /* Poll on closed fd */
+ KCONSUMERD_POLL_HUP, /* All fds have hungup */
+ KCONSUMERD_EXIT_SUCCESS, /* kconsumerd exiting normally */
+ KCONSUMERD_EXIT_FAILURE, /* kconsumerd exiting on error */
+ KCONSUMERD_OUTFD_ERROR, /* error opening the tracefile */
+ KCONSUMERD_SPLICE_EBADF, /* EBADF from splice(2) */
+ KCONSUMERD_SPLICE_EINVAL, /* EINVAL from splice(2) */
+ KCONSUMERD_SPLICE_ENOMEM, /* ENOMEM from splice(2) */
+ KCONSUMERD_SPLICE_ESPIPE, /* ESPIPE from splice(2) */
+ /* MUST be last element */
+ LTTCOMM_NR, /* Last element */
};
/*
} create_session;
/* Marker data */
struct {
- char channel[NAME_MAX];
- char marker[NAME_MAX];
- } marker;
- /* SET_SOCK_PATH */
- struct {
- char sock_path[PATH_MAX];
- } sock_path;
- /* SET_SUBBUF_NUM */
- struct {
- unsigned int subbuf_num;
- char channel[NAME_MAX];
- } subbuf_num;
- /* SET_SUBBUF_SIZE */
- struct {
- unsigned int subbuf_size;
- char channel[NAME_MAX];
- } subbuf_size;
+ char event_name[NAME_MAX];
+ } event;
} u;
};
*/
struct lttcomm_kconsumerd_header {
u32 payload_size;
- u32 cmd_type; /* enum lttcomm_consumerd_command */
- u32 ret_code; /* enum lttcomm_return_code */
+ u32 cmd_type; /* enum kconsumerd_command */
};
/* lttcomm_kconsumerd_msg represents a file descriptor to consume the
char path_name[PATH_MAX];
int fd;
u32 state; /* enum lttcomm_kconsumerd_fd_state */
+ unsigned long max_sb_size; /* the subbuffer size for this channel */
};
extern int lttcomm_create_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);
+extern ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd, size_t len);
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 const char *lttcomm_get_readable_code(enum lttcomm_return_code code);