X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=2d6493d8eec989b53c17e361b8f5665bae0f9bb8;hb=fe7bf56464d7747362e1bde77c2769a62c81ac4c;hp=d1a2bd97de18574b82344a6cc52fa169c4ec3a14;hpb=fbc9f37df245d544a7705ba576297df791220b44;p=lttng-tools.git diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index d1a2bd97d..2d6493d8e 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2011 David Goulet - * Copyright (C) 2011 Julien Desfossez + * Copyright (C) 2011 EfficiOS Inc. * Copyright (C) 2011 Mathieu Desnoyers * * SPDX-License-Identifier: GPL-2.0-only @@ -31,6 +30,7 @@ #include #include +#include #include #include "inet.h" @@ -107,8 +107,104 @@ enum lttcomm_sessiond_command { LTTNG_CREATE_SESSION_EXT = 49, LTTNG_CLEAR_SESSION = 50, LTTNG_LIST_TRIGGERS = 51, + LTTNG_EXECUTE_ERROR_QUERY = 52, }; +static inline +const char *lttcomm_sessiond_command_str(enum lttcomm_sessiond_command cmd) +{ + switch (cmd) { + case LTTNG_ADD_CONTEXT: + return "LTTNG_ADD_CONTEXT"; + case LTTNG_DISABLE_CHANNEL: + return "LTTNG_DISABLE_CHANNEL"; + case LTTNG_DISABLE_EVENT: + return "LTTNG_DISABLE_EVENT"; + case LTTNG_LIST_SYSCALLS: + return "LTTNG_LIST_SYSCALLS"; + case LTTNG_ENABLE_CHANNEL: + return "LTTNG_ENABLE_CHANNEL"; + case LTTNG_ENABLE_EVENT: + return "LTTNG_ENABLE_EVENT"; + case LTTNG_DESTROY_SESSION: + return "LTTNG_DESTROY_SESSION"; + case LTTNG_LIST_CHANNELS: + return "LTTNG_LIST_CHANNELS"; + case LTTNG_LIST_DOMAINS: + return "LTTNG_LIST_DOMAINS"; + case LTTNG_LIST_EVENTS: + return "LTTNG_LIST_EVENTS"; + case LTTNG_LIST_SESSIONS: + return "LTTNG_LIST_SESSIONS"; + case LTTNG_LIST_TRACEPOINTS: + return "LTTNG_LIST_TRACEPOINTS"; + case LTTNG_REGISTER_CONSUMER: + return "LTTNG_REGISTER_CONSUMER"; + case LTTNG_START_TRACE: + return "LTTNG_START_TRACE"; + case LTTNG_STOP_TRACE: + return "LTTNG_STOP_TRACE"; + case LTTNG_LIST_TRACEPOINT_FIELDS: + return "LTTNG_LIST_TRACEPOINT_FIELDS"; + case LTTNG_DISABLE_CONSUMER: + return "LTTNG_DISABLE_CONSUMER"; + case LTTNG_ENABLE_CONSUMER: + return "LTTNG_ENABLE_CONSUMER"; + case LTTNG_SET_CONSUMER_URI: + return "LTTNG_SET_CONSUMER_URI"; + case LTTNG_DATA_PENDING: + return "LTTNG_DATA_PENDING"; + case LTTNG_SNAPSHOT_ADD_OUTPUT: + return "LTTNG_SNAPSHOT_ADD_OUTPUT"; + case LTTNG_SNAPSHOT_DEL_OUTPUT: + return "LTTNG_SNAPSHOT_DEL_OUTPUT"; + case LTTNG_SNAPSHOT_LIST_OUTPUT: + return "LTTNG_SNAPSHOT_LIST_OUTPUT"; + case LTTNG_SNAPSHOT_RECORD: + return "LTTNG_SNAPSHOT_RECORD"; + case LTTNG_SAVE_SESSION: + return "LTTNG_SAVE_SESSION"; + case LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE: + return "LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE"; + case LTTNG_PROCESS_ATTR_TRACKER_REMOVE_INCLUDE_VALUE: + return "LTTNG_PROCESS_ATTR_TRACKER_REMOVE_INCLUDE_VALUE"; + case LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY: + return "LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY"; + case LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY: + return "LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY"; + case LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET: + return "LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET"; + case LTTNG_SET_SESSION_SHM_PATH: + return "LTTNG_SET_SESSION_SHM_PATH"; + case LTTNG_REGENERATE_METADATA: + return "LTTNG_REGENERATE_METADATA"; + case LTTNG_REGENERATE_STATEDUMP: + return "LTTNG_REGENERATE_STATEDUMP"; + case LTTNG_REGISTER_TRIGGER: + return "LTTNG_REGISTER_TRIGGER"; + case LTTNG_UNREGISTER_TRIGGER: + return "LTTNG_UNREGISTER_TRIGGER"; + case LTTNG_ROTATE_SESSION: + return "LTTNG_ROTATE_SESSION"; + case LTTNG_ROTATION_GET_INFO: + return "LTTNG_ROTATION_GET_INFO"; + case LTTNG_ROTATION_SET_SCHEDULE: + return "LTTNG_ROTATION_SET_SCHEDULE"; + case LTTNG_SESSION_LIST_ROTATION_SCHEDULES: + return "LTTNG_SESSION_LIST_ROTATION_SCHEDULES"; + case LTTNG_CREATE_SESSION_EXT: + return "LTTNG_CREATE_SESSION_EXT"; + case LTTNG_CLEAR_SESSION: + return "LTTNG_CLEAR_SESSION"; + case LTTNG_LIST_TRIGGERS: + return "LTTNG_LIST_TRIGGERS"; + case LTTNG_EXECUTE_ERROR_QUERY: + return "LTTNG_EXECUTE_ERROR_QUERY"; + default: + abort(); + } +} + enum lttcomm_relayd_command { RELAYD_ADD_STREAM = 1, RELAYD_CREATE_SESSION = 2, @@ -230,14 +326,14 @@ struct lttcomm_sockaddr { struct sockaddr_in sin; struct sockaddr_in6 sin6; } addr; -} LTTNG_PACKED; +}; struct lttcomm_sock { int32_t fd; enum lttcomm_sock_proto proto; struct lttcomm_sockaddr sockaddr; const struct lttcomm_proto_ops *ops; -} LTTNG_PACKED; +}; /* * Relayd sock. Adds the protocol version to use for the communications with @@ -247,7 +343,7 @@ struct lttcomm_relayd_sock { struct lttcomm_sock sock; uint32_t major; uint32_t minor; -} LTTNG_PACKED; +}; struct lttcomm_net_family { int family; @@ -390,7 +486,11 @@ struct lttcomm_session_msg { } LTTNG_PACKED process_attr_tracker_set_tracking_policy; struct { uint32_t length; + uint8_t is_trigger_anonymous; } LTTNG_PACKED trigger; + struct { + uint32_t length; + } LTTNG_PACKED error_query; struct { uint64_t rotation_id; } LTTNG_PACKED get_rotation_info; @@ -429,7 +529,7 @@ struct lttcomm_session_msg { * starts at reloc_table_offset. */ #define LTTNG_FILTER_PADDING 32 -struct lttng_filter_bytecode { +struct lttng_bytecode { uint32_t len; /* len of data */ uint32_t reloc_table_offset; uint64_t seqnum; @@ -558,8 +658,9 @@ struct lttcomm_consumer_msg { struct { uint64_t net_index; enum lttng_stream_type type; - /* Open socket to the relayd */ - struct lttcomm_relayd_sock sock; + uint32_t major; + uint32_t minor; + uint8_t relayd_socket_protocol; /* Tracing session id associated to the relayd. */ uint64_t session_id; /* Relayd session id, only used with control socket. */ @@ -767,11 +868,11 @@ struct lttcomm_ust_msg { uint32_t handle; uint32_t cmd; union { - struct lttng_ust_channel channel; - struct lttng_ust_stream stream; - struct lttng_ust_event event; - struct lttng_ust_context context; - struct lttng_ust_tracer_version version; + struct lttng_ust_abi_channel channel; + struct lttng_ust_abi_stream stream; + struct lttng_ust_abi_event event; + struct lttng_ust_abi_context context; + struct lttng_ust_abi_tracer_version version; } u; } LTTNG_PACKED; @@ -791,7 +892,7 @@ struct lttcomm_ust_reply { struct { uint64_t memory_map_size; } LTTNG_PACKED stream; - struct lttng_ust_tracer_version version; + struct lttng_ust_abi_tracer_version version; } u; } LTTNG_PACKED; @@ -805,6 +906,9 @@ LTTNG_HIDDEN int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr, const char *ip, unsigned int port); LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto); +LTTNG_HIDDEN int lttcomm_populate_sock_from_open_socket(struct lttcomm_sock *sock, + int fd, + enum lttcomm_sock_proto protocol); LTTNG_HIDDEN int lttcomm_create_sock(struct lttcomm_sock *sock); LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri); LTTNG_HIDDEN void lttcomm_destroy_sock(struct lttcomm_sock *sock);