X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust-comm.h;h=da10b4085895e0f342d1acabd64b2369e6dd0a7b;hb=cbba5e044240cd4e5b90b1a312cb1cd692e027ea;hp=bc185669301a5fb0f36fa5e501c55fe2ff17aa1f;hpb=fd17d7cecd427479c035cd99cb2b2fb622bb3a38;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index bc185669..da10b408 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -21,7 +21,6 @@
 #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"
@@ -42,9 +41,9 @@
 #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_ust_enum_entry;
 struct lttng_integer_type;
 struct lttng_session;
 
@@ -199,56 +198,70 @@ struct ustcomm_notify_channel_reply {
  * 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);
 
@@ -256,7 +269,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
+__attribute__((visibility("hidden")))
 int ustcomm_send_reg_msg(int sock,
 		enum ustctl_socket_type type,
 		uint32_t bits_per_long,
@@ -270,7 +283,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
+__attribute__((visibility("hidden")))
 int ustcomm_register_event(int sock,
 	struct lttng_session *session,
 	int session_objd,		/* session descriptor */
@@ -279,7 +292,7 @@ int ustcomm_register_event(int sock,
 	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) */
 
@@ -287,19 +300,19 @@ 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
+__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,
+	const 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,
 	int session_objd,		/* session descriptor */
@@ -309,9 +322,10 @@ int ustcomm_register_channel(int sock,
 	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 */