X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.h;h=ba1ff75d3f998ae9852c778c940276bf14492d3e;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=2940ab7accea9534b3fe63696f4b5ea6a60a55e6;hpb=9aed43774a511ae9b2458e474d0f2efe5bfa871e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h
index 2940ab7ac..ba1ff75d3 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 */
 
@@ -131,6 +121,10 @@ struct ust_registry_session {
 	 */
 	uint32_t major;
 	uint32_t minor;
+
+	/* The id of the parent session */
+	uint64_t tracing_id;
+	uid_t tracing_uid;
 };
 
 struct ust_registry_channel {
@@ -178,7 +172,7 @@ 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;
@@ -197,7 +191,7 @@ struct ust_registry_event {
 };
 
 struct ust_registry_enum {
-	char name[LTTNG_UST_SYM_NAME_LEN];
+	char name[LTTNG_UST_ABI_SYM_NAME_LEN];
 	struct ustctl_enum_entry *entries;
 	size_t nr_entries;
 	uint64_t id;	/* enum id in session */
@@ -291,7 +285,9 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 		const char *root_shm_path,
 		const char *shm_path,
 		uid_t euid,
-		gid_t egid);
+		gid_t egid,
+		uint64_t tracing_id,
+		uid_t tracing_uid);
 void ust_registry_session_destroy(struct ust_registry_session *session);
 
 int ust_registry_create_event(struct ust_registry_session *session,
@@ -351,7 +347,15 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 		uint32_t uint32_t_alignment,
 		uint32_t uint64_t_alignment,
 		uint32_t long_alignment,
-		int byte_order)
+		int byte_order,
+		uint32_t major,
+		uint32_t minor,
+		const char *root_shm_path,
+		const char *shm_path,
+		uid_t euid,
+		gid_t egid,
+		uint64_t tracing_id,
+		uid_t tracing_uid)
 {
 	return 0;
 }