X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=3d1ba3729c173a40b2d28b3713cec5ed137582bf;hb=25cff019d711338b8a7efe1cc54e4b1870157348;hp=ae53f158e83dc338ae09e43047ef8adda154a1fc;hpb=751d4e910613be142f5590ed91590a8e3f3299ef;p=lttng-ust.git diff --git a/include/ust-comm.h b/include/ust-comm.h index ae53f158..3d1ba372 100644 --- a/include/ust-comm.h +++ b/include/ust-comm.h @@ -1,24 +1,9 @@ -#ifndef _LTTNG_UST_COMM_H -#define _LTTNG_UST_COMM_H - /* - * Copyright (C) 2011 - David Goulet - * Julien Desfossez - * Mathieu Desnoyers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; only - * version 2.1 of the License. + * SPDX-License-Identifier: LGPL-2.1-only * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 Julien Desfossez + * Copyright (C) 2011 Mathieu Desnoyers */ /* @@ -26,12 +11,21 @@ * These declarations should NOT be considered stable API. */ +#ifndef _LTTNG_UST_COMM_H +#define _LTTNG_UST_COMM_H + +#include #include #include #include #include #include -#include +#include +#include "ust-helper.h" + +#ifndef LTTNG_PACKED +#error "LTTNG_PACKED should be defined" +#endif /* * Default timeout the application waits for the sessiond to send its @@ -39,7 +33,7 @@ * variable "LTTNG_UST_REGISTER_TIMEOUT". Note that if the sessiond is not * found, the application proceeds directly without any delay. */ -#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS 3000 +#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS CONFIG_LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS #define LTTNG_DEFAULT_RUNDIR LTTNG_SYSTEM_RUNDIR #define LTTNG_DEFAULT_HOME_RUNDIR ".lttng" @@ -48,8 +42,11 @@ #define LTTNG_UST_COMM_MAX_LISTEN 10 #define LTTNG_UST_COMM_REG_MSG_PADDING 64 -struct lttng_event_field; +struct lttng_ust_event_field; struct lttng_ctx_field; +struct lttng_enum_entry; +struct lttng_integer_type; +struct lttng_session; struct ustctl_reg_msg { uint32_t magic; @@ -80,17 +77,37 @@ struct ustcomm_ust_msg { uint32_t cmd; char padding[USTCOMM_MSG_PADDING1]; 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_tracepoint_iter tracepoint; + 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; + struct lttng_ust_abi_tracepoint_iter tracepoint; struct { uint32_t data_size; /* following filter data */ uint32_t reloc_offset; uint64_t seqnum; } LTTNG_PACKED filter; + struct { + uint32_t count; /* how many names follow */ + } LTTNG_PACKED exclusion; + struct { + uint32_t data_size; /* following capture data */ + uint32_t reloc_offset; + uint64_t seqnum; + } LTTNG_PACKED capture; + struct lttng_ust_abi_counter counter; + struct lttng_ust_abi_counter_global counter_global; + struct lttng_ust_abi_counter_cpu counter_cpu; + /* + * For lttng_ust_abi_EVENT_NOTIFIER_CREATE, a struct + * lttng_ust_abi_event_notifier implicitly follows struct + * ustcomm_ust_msg. + */ + struct { + /* Length of struct lttng_ust_abi_event_notifier */ + uint32_t len; + } event_notifier; char padding[USTCOMM_MSG_PADDING2]; } u; } LTTNG_PACKED; @@ -114,8 +131,8 @@ struct ustcomm_ust_reply { struct { uint64_t memory_map_size; } LTTNG_PACKED stream; - struct lttng_ust_tracer_version version; - struct lttng_ust_tracepoint_iter tracepoint; + struct lttng_ust_abi_tracer_version version; + struct lttng_ust_abi_tracepoint_iter tracepoint; char padding[USTCOMM_REPLY_PADDING2]; } u; } LTTNG_PACKED; @@ -128,7 +145,7 @@ struct ustcomm_notify_hdr { struct ustcomm_notify_event_msg { uint32_t session_objd; uint32_t channel_objd; - char event_name[LTTNG_UST_SYM_NAME_LEN]; + char event_name[LTTNG_UST_ABI_SYM_NAME_LEN]; int32_t loglevel; uint32_t signature_len; uint32_t fields_len; @@ -144,6 +161,22 @@ struct ustcomm_notify_event_reply { char padding[USTCOMM_NOTIFY_EVENT_REPLY_PADDING]; } LTTNG_PACKED; +#define USTCOMM_NOTIFY_ENUM_MSG_PADDING 32 +struct ustcomm_notify_enum_msg { + uint32_t session_objd; + char enum_name[LTTNG_UST_ABI_SYM_NAME_LEN]; + uint32_t entries_len; + char padding[USTCOMM_NOTIFY_ENUM_MSG_PADDING]; + /* followed by enum entries */ +} LTTNG_PACKED; + +#define USTCOMM_NOTIFY_EVENT_REPLY_PADDING 32 +struct ustcomm_notify_enum_reply { + int32_t ret_code; /* 0: ok, negative: error code */ + uint64_t enum_id; + char padding[USTCOMM_NOTIFY_EVENT_REPLY_PADDING]; +} LTTNG_PACKED; + #define USTCOMM_NOTIFY_CHANNEL_MSG_PADDING 32 struct ustcomm_notify_channel_msg { uint32_t session_objd; @@ -166,36 +199,64 @@ struct ustcomm_notify_channel_reply { * struct lttng_ust_field_iter field. */ -extern int ustcomm_create_unix_sock(const char *pathname); -extern int ustcomm_connect_unix_sock(const char *pathname); -extern int ustcomm_accept_unix_sock(int sock); -extern int ustcomm_listen_unix_sock(int sock); -extern int ustcomm_close_unix_sock(int sock); - -extern ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len); -extern ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len); -extern ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd); -extern ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd); - -extern const char *ustcomm_get_readable_code(int code); -extern int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum); -extern int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur, - uint32_t expected_handle, uint32_t expected_cmd); -extern int ustcomm_send_app_cmd(int sock, +LTTNG_HIDDEN +int ustcomm_create_unix_sock(const char *pathname); +LTTNG_HIDDEN +int ustcomm_connect_unix_sock(const char *pathname, + long timeout); +LTTNG_HIDDEN +int ustcomm_accept_unix_sock(int sock); +LTTNG_HIDDEN +int ustcomm_listen_unix_sock(int sock); +LTTNG_HIDDEN +int ustcomm_close_unix_sock(int sock); + +LTTNG_HIDDEN +ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len); +LTTNG_HIDDEN +ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len); +LTTNG_HIDDEN +ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd); +LTTNG_HIDDEN +ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd); + +LTTNG_HIDDEN +const char *ustcomm_get_readable_code(int code); +LTTNG_HIDDEN +int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum); +LTTNG_HIDDEN +int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur, + uint32_t expected_handle, uint32_t expected_cmd); +LTTNG_HIDDEN +int ustcomm_send_app_cmd(int sock, struct ustcomm_ust_msg *lum, struct ustcomm_ust_reply *lur); +LTTNG_HIDDEN int ustcomm_recv_fd(int sock); +LTTNG_HIDDEN ssize_t ustcomm_recv_channel_from_sessiond(int sock, void **chan_data, uint64_t len, int *wakeup_fd); +LTTNG_HIDDEN int ustcomm_recv_stream_from_sessiond(int sock, uint64_t *memory_map_size, int *shm_fd, int *wakeup_fd); +LTTNG_HIDDEN +ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock, + int *event_notifier_notif_fd); + +LTTNG_HIDDEN +ssize_t ustcomm_recv_counter_from_sessiond(int sock, + void **counter_data, uint64_t len); +LTTNG_HIDDEN +int ustcomm_recv_counter_shm_from_sessiond(int sock, + int *shm_fd); /* * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN int ustcomm_send_reg_msg(int sock, enum ustctl_socket_type type, uint32_t bits_per_long, @@ -209,14 +270,16 @@ int ustcomm_send_reg_msg(int sock, * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN int ustcomm_register_event(int sock, + struct lttng_session *session, int session_objd, /* session descriptor */ int channel_objd, /* channel descriptor */ const char *event_name, /* event name (input) */ int loglevel, const char *signature, /* event signature (input) */ size_t nr_fields, /* fields */ - const struct lttng_event_field *fields, + const struct lttng_ust_event_field **fields, const char *model_emf_uri, uint32_t *id); /* event id (output) */ @@ -224,7 +287,21 @@ int ustcomm_register_event(int sock, * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN +int ustcomm_register_enum(int sock, + int session_objd, /* session descriptor */ + const char *enum_name, /* enum name (input) */ + size_t nr_entries, /* entries */ + const struct lttng_enum_entry *entries, + uint64_t *id); /* enum id (output) */ + +/* + * Returns 0 on success, negative error value on error. + * Returns -EPIPE or -ECONNRESET if other end has hung up. + */ +LTTNG_HIDDEN int ustcomm_register_channel(int sock, + struct lttng_session *session, int session_objd, /* session descriptor */ int channel_objd, /* channel descriptor */ size_t nr_ctx_fields, @@ -232,7 +309,9 @@ int ustcomm_register_channel(int sock, uint32_t *chan_id, /* channel id (output) */ int *header_type); /* header type (output) */ +LTTNG_HIDDEN int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec); +LTTNG_HIDDEN int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec); #endif /* _LTTNG_UST_COMM_H */