X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust-comm.h;h=bc185669301a5fb0f36fa5e501c55fe2ff17aa1f;hb=b1f720f08ebd9f83045a8ed7689658b8171a8adf;hp=7d1871dc7fc11c7e6f000e964518578f2d933f6b;hpb=864a1eda22ed99266509ac76451c6f27f91aa17e;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 7d1871dc..bc185669 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -77,12 +77,12 @@ 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;
@@ -96,16 +96,16 @@ struct ustcomm_ust_msg {
 			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];
@@ -131,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;
@@ -145,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;
@@ -164,7 +164,7 @@ struct ustcomm_notify_event_reply {
 #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 */
@@ -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 */