X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.h;h=a25cdc70de01f7070069fccf876273d8a814cbfc;hb=d22ad5f818289bb10faa814c2ecef071ec0c2c67;hp=a0a4a17f43b8ba0edd8ecd3f9d29798ffe421c01;hpb=16ea9370e1b1d553c795d888cef0c900079a1ae2;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h
index a0a4a17f4..a25cdc70d 100644
--- a/src/bin/lttng-sessiond/ust-registry.h
+++ b/src/bin/lttng-sessiond/ust-registry.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef LTTNG_UST_REGISTRY_H
@@ -22,9 +12,9 @@
 #include <stdint.h>
 
 #include <common/hashtable/hashtable.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
 
 #define CTF_SPEC_MAJOR	1
 #define CTF_SPEC_MINOR	8
@@ -48,7 +38,7 @@ struct ust_registry_session {
 	/* Next enumeration ID available. */
 	uint64_t next_enum_id;
 	/* Universal unique identifier used by the tracer. */
-	unsigned char uuid[UUID_LEN];
+	unsigned char uuid[LTTNG_UUID_LEN];
 
 	/* session ABI description */
 
@@ -142,7 +132,7 @@ struct ust_registry_channel {
 	uint64_t consumer_key;
 	/* Id set when replying to a register channel. */
 	uint32_t chan_id;
-	enum ustctl_channel_header header_type;
+	enum lttng_ust_ctl_channel_header header_type;
 
 	/*
 	 * Flag for this channel if the metadata was dumped once during
@@ -166,7 +156,7 @@ struct ust_registry_channel {
 	 * register channel notification from the UST tracer.
 	 */
 	size_t nr_ctx_fields;
-	struct ustctl_field *ctx_fields;
+	struct lttng_ust_ctl_field *ctx_fields;
 	struct lttng_ht_node_u64 node;
 	/* For delayed reclaim */
 	struct rcu_head rcu_head;
@@ -182,11 +172,11 @@ struct ust_registry_event {
 	int session_objd;
 	int channel_objd;
 	/* Name of the event returned by the tracer. */
-	char name[LTTNG_UST_SYM_NAME_LEN];
+	char name[LTTNG_UST_ABI_SYM_NAME_LEN];
 	char *signature;
 	int loglevel_value;
 	size_t nr_fields;
-	struct ustctl_field *fields;
+	struct lttng_ust_ctl_field *fields;
 	char *model_emf_uri;
 	/*
 	 * Flag for this channel if the metadata was dumped once during
@@ -201,8 +191,8 @@ struct ust_registry_event {
 };
 
 struct ust_registry_enum {
-	char name[LTTNG_UST_SYM_NAME_LEN];
-	struct ustctl_enum_entry *entries;
+	char name[LTTNG_UST_ABI_SYM_NAME_LEN];
+	struct lttng_ust_ctl_enum_entry *entries;
 	size_t nr_entries;
 	uint64_t id;	/* enum id in session */
 	/* Enumeration node in session hash table. */
@@ -302,7 +292,7 @@ void ust_registry_session_destroy(struct ust_registry_session *session);
 
 int ust_registry_create_event(struct ust_registry_session *session,
 		uint64_t chan_key, int session_objd, int channel_objd, char *name,
-		char *sig, size_t nr_fields, struct ustctl_field *fields,
+		char *sig, size_t nr_fields, struct lttng_ust_ctl_field *fields,
 		int loglevel_value, char *model_emf_uri, int buffer_type,
 		uint32_t *event_id_p, struct ust_app *app);
 struct ust_registry_event *ust_registry_find_event(
@@ -320,7 +310,7 @@ int ust_metadata_event_statedump(struct ust_registry_session *session,
 		struct ust_registry_event *event);
 int ust_registry_create_or_find_enum(struct ust_registry_session *session,
 		int session_objd, char *name,
-		struct ustctl_enum_entry *entries, size_t nr_entries,
+		struct lttng_ust_ctl_enum_entry *entries, size_t nr_entries,
 		uint64_t *enum_id);
 struct ust_registry_enum *
 	ust_registry_lookup_enum_by_id(struct ust_registry_session *session,
@@ -375,7 +365,7 @@ void ust_registry_session_destroy(struct ust_registry_session *session)
 static inline
 int ust_registry_create_event(struct ust_registry_session *session,
 		uint64_t chan_key, int session_objd, int channel_objd, char *name,
-		char *sig, size_t nr_fields, struct ustctl_field *fields,
+		char *sig, size_t nr_fields, struct lttng_ust_ctl_field *fields,
 		int loglevel_value, char *model_emf_uri, int buffer_type,
 		uint32_t *event_id_p)
 {
@@ -415,7 +405,7 @@ int ust_metadata_event_statedump(struct ust_registry_session *session,
 static inline
 int ust_registry_create_or_find_enum(struct ust_registry_session *session,
 		int session_objd, char *name,
-		struct ustctl_enum_entry *entries, size_t nr_entries,
+		struct lttng_ust_ctl_enum_entry *entries, size_t nr_entries,
 		uint64_t *enum_id)
 {
 	return 0;