#include <lttng/ust-error.h>
#include <lttng/ust-compiler.h>
#include <lttng/ust-ctl.h>
-#include "ust-helper.h"
#ifndef LTTNG_PACKED
#error "LTTNG_PACKED should be defined"
#define LTTNG_UST_COMM_MAX_LISTEN 10
#define LTTNG_UST_COMM_REG_MSG_PADDING 64
-struct lttng_event_field;
-struct lttng_ctx_field;
-struct lttng_enum_entry;
+struct lttng_ust_event_field;
+struct lttng_ust_ctx_field;
+struct lttng_ust_enum_entry;
struct lttng_integer_type;
-struct lttng_session;
+struct lttng_ust_session;
struct ustctl_reg_msg {
uint32_t magic;
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;
uint32_t reloc_offset;
uint64_t seqnum;
} LTTNG_PACKED capture;
- struct lttng_ust_counter counter;
- struct lttng_ust_counter_global counter_global;
- struct lttng_ust_counter_cpu counter_cpu;
+ 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_EVENT_NOTIFIER_CREATE, a struct
- * lttng_ust_event_notifier implicitly follows struct
+ * 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_event_notifier */
+ /* Length of struct lttng_ust_abi_event_notifier */
uint32_t len;
} event_notifier;
char padding[USTCOMM_MSG_PADDING2];
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;
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;
#define USTCOMM_NOTIFY_ENUM_MSG_PADDING 32
struct ustcomm_notify_enum_msg {
uint32_t session_objd;
- char enum_name[LTTNG_UST_SYM_NAME_LEN];
+ char enum_name[LTTNG_UST_ABI_SYM_NAME_LEN];
uint32_t entries_len;
char padding[USTCOMM_NOTIFY_ENUM_MSG_PADDING];
/* followed by enum entries */
* struct lttng_ust_field_iter field.
*/
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
int ustcomm_create_unix_sock(const char *pathname);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_connect_unix_sock(const char *pathname,
long timeout);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_accept_unix_sock(int sock);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_listen_unix_sock(int sock);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_close_unix_sock(int sock);
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd);
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
const char *ustcomm_get_readable_code(int code);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur,
uint32_t expected_handle, uint32_t expected_cmd);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_send_app_cmd(int sock,
struct ustcomm_ust_msg *lum,
struct ustcomm_ust_reply *lur);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_recv_fd(int sock);
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
ssize_t ustcomm_recv_channel_from_sessiond(int sock,
void **chan_data, uint64_t len, int *wakeup_fd);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_recv_stream_from_sessiond(int sock,
uint64_t *memory_map_size,
int *shm_fd, int *wakeup_fd);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock,
int *event_notifier_notif_fd);
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
ssize_t ustcomm_recv_counter_from_sessiond(int sock,
void **counter_data, uint64_t len);
-LTTNG_HIDDEN
+
+__attribute__((visibility("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
+__attribute__((visibility("hidden")))
int ustcomm_send_reg_msg(int sock,
enum ustctl_socket_type type,
uint32_t bits_per_long,
* Returns 0 on success, negative error value on error.
* Returns -EPIPE or -ECONNRESET if other end has hung up.
*/
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
int ustcomm_register_event(int sock,
- struct lttng_session *session,
+ struct lttng_ust_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,
+ struct lttng_ust_event_field **fields,
const char *model_emf_uri,
uint32_t *id); /* event id (output) */
* Returns 0 on success, negative error value on error.
* Returns -EPIPE or -ECONNRESET if other end has hung up.
*/
-LTTNG_HIDDEN
+__attribute__((visibility("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,
+ struct lttng_ust_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
+__attribute__((visibility("hidden")))
int ustcomm_register_channel(int sock,
- struct lttng_session *session,
+ struct lttng_ust_session *session,
int session_objd, /* session descriptor */
int channel_objd, /* channel descriptor */
size_t nr_ctx_fields,
- const struct lttng_ctx_field *ctx_fields,
+ struct lttng_ust_ctx_field **ctx_fields,
uint32_t *chan_id, /* channel id (output) */
int *header_type); /* header type (output) */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
#endif /* _LTTNG_UST_COMM_H */
projects / lttng-ust.git / blobdiff