From 8f1313b1479668c150975b930bba4d8134a270c1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 25 Feb 2021 18:36:03 -0500 Subject: [PATCH] Hide private ust-comm.h symbols The major SONAME bump to '1' gives us the opportunity to hide private symbols that should never have been visible. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I57a6d90535e01d85abb26c42da117828d1334c72 --- include/ust-comm.h | 52 +++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/include/ust-comm.h b/include/ust-comm.h index 7d1871dc..27743b2d 100644 --- a/include/ust-comm.h +++ b/include/ust-comm.h @@ -199,29 +199,45 @@ 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, - long timeout); -extern int ustcomm_accept_unix_sock(int sock); -extern int ustcomm_listen_unix_sock(int sock); -extern int ustcomm_close_unix_sock(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); -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); +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); -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 +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); @@ -240,6 +256,7 @@ int ustcomm_recv_counter_shm_from_sessiond(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_send_reg_msg(int sock, enum ustctl_socket_type type, uint32_t bits_per_long, @@ -253,6 +270,7 @@ 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 */ @@ -269,6 +287,7 @@ 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) */ @@ -280,6 +299,7 @@ int ustcomm_register_enum(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_channel(int sock, struct lttng_session *session, int session_objd, /* session descriptor */ @@ -289,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 */ -- 2.34.1