X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust-comm.h;h=63647a3e18c86e6017872f911c241c582681d233;hb=5152f6df156d6ccb234965d1b3d26b167bd6b94e;hp=b45797ef93e064ce763548c1af74cd28063d0628;hpb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;p=lttng-ust.git diff --git a/include/ust-comm.h b/include/ust-comm.h index b45797ef..63647a3e 100644 --- a/include/ust-comm.h +++ b/include/ust-comm.h @@ -22,17 +22,13 @@ #include #include -#ifndef LTTNG_PACKED -#error "LTTNG_PACKED should be defined" -#endif - /* * Default timeout the application waits for the sessiond to send its * "register done" command. Can be overridden with the environment * 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 CONFIG_LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS +#define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS 3000 #define LTTNG_DEFAULT_RUNDIR LTTNG_SYSTEM_RUNDIR #define LTTNG_DEFAULT_HOME_RUNDIR ".lttng" @@ -45,7 +41,7 @@ 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; @@ -64,7 +60,7 @@ struct ustctl_reg_msg { uint32_t socket_type; /* enum ustctl_socket_type */ char name[LTTNG_UST_ABI_PROCNAME_LEN]; /* process name */ char padding[LTTNG_UST_COMM_REG_MSG_PADDING]; -} LTTNG_PACKED; +} __attribute__((packed)); /* * Data structure for the commands sent from sessiond to UST. @@ -86,15 +82,15 @@ struct ustcomm_ust_msg { uint32_t data_size; /* following filter data */ uint32_t reloc_offset; uint64_t seqnum; - } LTTNG_PACKED filter; + } __attribute__((packed)) filter; struct { uint32_t count; /* how many names follow */ - } LTTNG_PACKED exclusion; + } __attribute__((packed)) exclusion; struct { uint32_t data_size; /* following capture data */ uint32_t reloc_offset; uint64_t seqnum; - } LTTNG_PACKED capture; + } __attribute__((packed)) capture; struct lttng_ust_abi_counter counter; struct lttng_ust_abi_counter_global counter_global; struct lttng_ust_abi_counter_cpu counter_cpu; @@ -109,7 +105,7 @@ struct ustcomm_ust_msg { } event_notifier; char padding[USTCOMM_MSG_PADDING2]; } u; -} LTTNG_PACKED; +} __attribute__((packed)); /* * Data structure for the response from UST to the session daemon. @@ -126,19 +122,19 @@ struct ustcomm_ust_reply { union { struct { uint64_t memory_map_size; - } LTTNG_PACKED channel; + } __attribute__((packed)) channel; struct { uint64_t memory_map_size; - } LTTNG_PACKED stream; + } __attribute__((packed)) stream; struct lttng_ust_abi_tracer_version version; struct lttng_ust_abi_tracepoint_iter tracepoint; char padding[USTCOMM_REPLY_PADDING2]; } u; -} LTTNG_PACKED; +} __attribute__((packed)); struct ustcomm_notify_hdr { uint32_t notify_cmd; -} LTTNG_PACKED; +} __attribute__((packed)); #define USTCOMM_NOTIFY_EVENT_MSG_PADDING 32 struct ustcomm_notify_event_msg { @@ -151,14 +147,14 @@ struct ustcomm_notify_event_msg { uint32_t model_emf_uri_len; char padding[USTCOMM_NOTIFY_EVENT_MSG_PADDING]; /* followed by signature, fields, and model_emf_uri */ -} LTTNG_PACKED; +} __attribute__((packed)); #define USTCOMM_NOTIFY_EVENT_REPLY_PADDING 32 struct ustcomm_notify_event_reply { int32_t ret_code; /* 0: ok, negative: error code */ uint32_t event_id; char padding[USTCOMM_NOTIFY_EVENT_REPLY_PADDING]; -} LTTNG_PACKED; +} __attribute__((packed)); #define USTCOMM_NOTIFY_ENUM_MSG_PADDING 32 struct ustcomm_notify_enum_msg { @@ -167,14 +163,14 @@ struct ustcomm_notify_enum_msg { uint32_t entries_len; char padding[USTCOMM_NOTIFY_ENUM_MSG_PADDING]; /* followed by enum entries */ -} LTTNG_PACKED; +} __attribute__((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; +} __attribute__((packed)); #define USTCOMM_NOTIFY_CHANNEL_MSG_PADDING 32 struct ustcomm_notify_channel_msg { @@ -183,7 +179,7 @@ struct ustcomm_notify_channel_msg { uint32_t ctx_fields_len; char padding[USTCOMM_NOTIFY_CHANNEL_MSG_PADDING]; /* followed by context fields */ -} LTTNG_PACKED; +} __attribute__((packed)); #define USTCOMM_NOTIFY_CHANNEL_REPLY_PADDING 32 struct ustcomm_notify_channel_reply { @@ -191,85 +187,84 @@ struct ustcomm_notify_channel_reply { uint32_t chan_id; uint32_t header_type; /* enum ustctl_channel_header */ char padding[USTCOMM_NOTIFY_CHANNEL_REPLY_PADDING]; -} LTTNG_PACKED; +} __attribute__((packed)); /* * LTTNG_UST_TRACEPOINT_FIELD_LIST reply is followed by a * struct lttng_ust_field_iter field. */ -__attribute__((visibility("hidden"))) -int ustcomm_create_unix_sock(const char *pathname); +int ustcomm_create_unix_sock(const char *pathname) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) int ustcomm_connect_unix_sock(const char *pathname, - long timeout); + long timeout) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_accept_unix_sock(int sock); +int ustcomm_accept_unix_sock(int sock) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_listen_unix_sock(int sock); +int ustcomm_listen_unix_sock(int sock) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_close_unix_sock(int sock); +int ustcomm_close_unix_sock(int sock) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len); +ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len); +ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd); +ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd); +ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -const char *ustcomm_get_readable_code(int code); +const char *ustcomm_get_readable_code(int code) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum); +int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur, - uint32_t expected_handle, uint32_t expected_cmd); + uint32_t expected_handle, uint32_t expected_cmd) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) int ustcomm_send_app_cmd(int sock, struct ustcomm_ust_msg *lum, - struct ustcomm_ust_reply *lur); + struct ustcomm_ust_reply *lur) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_recv_fd(int sock); +int ustcomm_recv_fd(int sock) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) ssize_t ustcomm_recv_channel_from_sessiond(int sock, - void **chan_data, uint64_t len, int *wakeup_fd); + void **chan_data, uint64_t len, int *wakeup_fd) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) int ustcomm_recv_stream_from_sessiond(int sock, uint64_t *memory_map_size, - int *shm_fd, int *wakeup_fd); + int *shm_fd, int *wakeup_fd) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock, - int *event_notifier_notif_fd); + int *event_notifier_notif_fd) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) ssize_t ustcomm_recv_counter_from_sessiond(int sock, - void **counter_data, uint64_t len); + void **counter_data, uint64_t len) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) int ustcomm_recv_counter_shm_from_sessiond(int sock, - int *shm_fd); + int *shm_fd) + __attribute__((visibility("hidden"))); /* * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ -__attribute__((visibility("hidden"))) int ustcomm_send_reg_msg(int sock, enum ustctl_socket_type type, uint32_t bits_per_long, @@ -277,55 +272,56 @@ int ustcomm_send_reg_msg(int sock, uint32_t uint16_t_alignment, uint32_t uint32_t_alignment, uint32_t uint64_t_alignment, - uint32_t long_alignment); + uint32_t long_alignment) + __attribute__((visibility("hidden"))); /* * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ -__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_ust_event_field **fields, + struct lttng_ust_event_field **fields, const char *model_emf_uri, - uint32_t *id); /* event id (output) */ + uint32_t *id) /* event id (output) */ + __attribute__((visibility("hidden"))); /* * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ -__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_ust_enum_entry **entries, - uint64_t *id); /* enum id (output) */ + struct lttng_ust_enum_entry **entries, + uint64_t *id) /* enum id (output) */ + __attribute__((visibility("hidden"))); /* * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ -__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, struct lttng_ust_ctx_field **ctx_fields, uint32_t *chan_id, /* channel id (output) */ - int *header_type); /* header type (output) */ + int *header_type) /* header type (output) */ + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec); +int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec) + __attribute__((visibility("hidden"))); -__attribute__((visibility("hidden"))) -int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec); +int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec) + __attribute__((visibility("hidden"))); #endif /* _LTTNG_UST_COMM_H */