*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
#define _LIBLTTSESSIONDCOMM_H
#include <limits.h>
-#include <uuid/uuid.h>
+#include <lttng/lttng.h>
#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_DISABLE_EVENT,
- KERNEL_ENABLE_EVENT,
- KERNEL_START_TRACE,
- KERNEL_STOP_TRACE,
+ /* Tracer command */
+ LTTNG_ADD_CONTEXT,
+ LTTNG_DISABLE_CHANNEL,
+ LTTNG_DISABLE_EVENT,
+ LTTNG_DISABLE_ALL_EVENT,
+ LTTNG_ENABLE_CHANNEL,
+ LTTNG_ENABLE_EVENT,
+ LTTNG_ENABLE_ALL_EVENT,
+ /* Session daemon command */
LTTNG_CREATE_SESSION,
LTTNG_DESTROY_SESSION,
- LTTNG_FORCE_SUBBUF_SWITCH,
- LTTNG_GET_ALL_SESSION,
- LTTNG_GET_SOCK_PATH,
- LTTNG_GET_SUBBUF_NUM_SIZE,
- LTTNG_LIST_MARKERS,
+ LTTNG_LIST_CHANNELS,
+ LTTNG_LIST_DOMAINS,
+ LTTNG_LIST_EVENTS,
LTTNG_LIST_SESSIONS,
- LTTNG_LIST_TRACES,
- LTTNG_LIST_TRACE_EVENTS,
- LTTNG_SETUP_TRACE,
- LTTNG_SET_SOCK_PATH,
- LTTNG_SET_SUBBUF_NUM,
- LTTNG_SET_SUBBUF_SIZE,
- UST_ALLOC_TRACE,
- UST_CREATE_TRACE,
- UST_DESTROY_TRACE,
- UST_DISABLE_MARKER,
- UST_ENABLE_MARKER,
- UST_LIST_APPS,
- UST_START_TRACE,
- UST_STOP_TRACE,
+ LTTNG_LIST_TRACEPOINTS,
+ LTTNG_START_TRACE,
+ LTTNG_STOP_TRACE,
+ LTTNG_CALIBRATE,
};
/*
LTTCOMM_OK = 1000, /* Ok */
LTTCOMM_ERR, /* Unknown Error */
LTTCOMM_UND, /* Undefine command */
+ LTTCOMM_NOT_IMPLEMENTED, /* Command not implemented */
+ 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_STOP_FAIL, /* Stop tracing fail */
LTTCOMM_LIST_FAIL, /* Listing apps fail */
LTTCOMM_NO_APPS, /* No traceable application */
- LTTCOMM_NO_SESS, /* No sessions available */
+ LTTCOMM_SESS_NOT_FOUND, /* Session name not found */
LTTCOMM_NO_TRACE, /* No trace exist */
LTTCOMM_FATAL, /* Session daemon had a fatal error */
LTTCOMM_NO_TRACEABLE, /* Error for non traceable app */
LTTCOMM_EXIST_SESS, /* Session name already exist */
LTTCOMM_NO_EVENT, /* No event found */
LTTCOMM_KERN_NA, /* Kernel tracer unavalable */
+ LTTCOMM_KERN_EVENT_EXIST, /* Kernel event already exists */
LTTCOMM_KERN_SESS_FAIL, /* Kernel create session failed */
LTTCOMM_KERN_CHAN_FAIL, /* Kernel create channel failed */
+ LTTCOMM_KERN_CHAN_NOT_FOUND, /* Kernel channel not found */
+ LTTCOMM_KERN_CHAN_DISABLE_FAIL, /* Kernel disable channel failed */
+ LTTCOMM_KERN_CHAN_ENABLE_FAIL, /* Kernel enable channel failed */
+ LTTCOMM_KERN_CONTEXT_FAIL, /* Kernel add context 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 */
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,
-};
-
/*
* Data structure received from lttng client to session daemon.
*/
struct lttcomm_session_msg {
u32 cmd_type; /* enum lttcomm_sessiond_command */
- uuid_t session_uuid;
- char trace_name[NAME_MAX];
- char session_name[NAME_MAX];
- u32 pid; /* pid_t */
+ struct lttng_session session;
+ struct lttng_domain domain;
union {
struct {
- int auto_session;
- } create_session;
- /* Marker data */
+ char channel_name[NAME_MAX];
+ char name[NAME_MAX];
+ } disable;
+ /* Event data */
+ struct {
+ char channel_name[NAME_MAX];
+ struct lttng_event event;
+ } enable;
+ /* Create channel */
struct {
+ struct lttng_channel chan;
+ } channel;
+ /* Context */
+ struct {
+ char channel_name[NAME_MAX];
char event_name[NAME_MAX];
- } event;
+ struct lttng_event_context ctx;
+ } context;
+ /* List */
+ struct {
+ char channel_name[NAME_MAX];
+ } list;
+ struct lttng_calibrate calibrate;
} u;
};
u32 cmd_type; /* enum lttcomm_sessiond_command */
u32 ret_code; /* enum lttcomm_return_code */
u32 pid; /* pid_t */
- u32 trace_name_offset;
u32 data_size;
- uuid_t session_uuid;
/* Contains: trace_name + data */
char payload[];
};
*/
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
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);
projects / lttng-tools.git / blobdiff