X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fustcomm.h;h=d1e9af1354c4f1bf897c66d4df92179ff8aaf175;hb=2137460a3901f8abdae909cf72e43e6ac23507ec;hp=dac9aaed96159318bded85cc540d4aab28079bd2;hpb=67534785e151f4c78aa5697703c55c5193deb65c;p=lttng-ust.git

diff --git a/src/common/ustcomm.h b/src/common/ustcomm.h
index dac9aaed..d1e9af13 100644
--- a/src/common/ustcomm.h
+++ b/src/common/ustcomm.h
@@ -1,8 +1,7 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
@@ -43,7 +42,7 @@ struct lttng_ust_enum_entry;
 struct lttng_integer_type;
 struct lttng_ust_session;
 
-struct ustctl_reg_msg {
+struct lttng_ust_ctl_reg_msg {
 	uint32_t magic;
 	uint32_t major;
 	uint32_t minor;
@@ -57,7 +56,7 @@ struct ustctl_reg_msg {
 	uint32_t uint32_t_alignment;
 	uint32_t uint64_t_alignment;
 	uint32_t long_alignment;
-	uint32_t socket_type;			/* enum ustctl_socket_type */
+	uint32_t socket_type;			/* enum lttng_ust_ctl_socket_type */
 	char name[LTTNG_UST_ABI_PROCNAME_LEN];	/* process name */
 	char padding[LTTNG_UST_COMM_REG_MSG_PADDING];
 } __attribute__((packed));
@@ -185,7 +184,7 @@ struct ustcomm_notify_channel_msg {
 struct ustcomm_notify_channel_reply {
 	int32_t ret_code;	/* 0: ok, negative: error code */
 	uint32_t chan_id;
-	uint32_t header_type;	/* enum ustctl_channel_header */
+	uint32_t header_type;	/* enum lttng_ust_ctl_channel_header */
 	char padding[USTCOMM_NOTIFY_CHANNEL_REPLY_PADDING];
 } __attribute__((packed));
 
@@ -207,6 +206,9 @@ int ustcomm_accept_unix_sock(int sock)
 int ustcomm_listen_unix_sock(int sock)
 	__attribute__((visibility("hidden")));
 
+int ustcomm_shutdown_unix_sock(int sock)
+	__attribute__((visibility("hidden")));
+
 int ustcomm_close_unix_sock(int sock)
 	__attribute__((visibility("hidden")));
 
@@ -266,13 +268,14 @@ int ustcomm_recv_counter_shm_from_sessiond(int sock,
  * Returns -EPIPE or -ECONNRESET if other end has hung up.
  */
 int ustcomm_send_reg_msg(int sock,
-		enum ustctl_socket_type type,
+		enum lttng_ust_ctl_socket_type type,
 		uint32_t bits_per_long,
 		uint32_t uint8_t_alignment,
 		uint32_t uint16_t_alignment,
 		uint32_t uint32_t_alignment,
 		uint32_t uint64_t_alignment,
-		uint32_t long_alignment)
+		uint32_t long_alignment,
+		const char *procname)
 	__attribute__((visibility("hidden")));
 
 /*
@@ -287,7 +290,7 @@ int ustcomm_register_event(int sock,
 	int loglevel,
 	const char *signature,		/* event signature (input) */
 	size_t nr_fields,		/* fields */
-	const struct lttng_ust_event_field **fields,
+	const struct lttng_ust_event_field * const *fields,
 	const char *model_emf_uri,
 	uint32_t *id)			/* event id (output) */
 	__attribute__((visibility("hidden")));
@@ -300,7 +303,7 @@ 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,
+	const struct lttng_ust_enum_entry * const *entries,
 	uint64_t *id)			/* enum id (output) */
 	__attribute__((visibility("hidden")));