X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fust-core.c;h=0b1fcf0b787724781e3dc855f00b41e6393e1ed1;hb=73f94b3ce6a9531a7c4d8b178b417fa58da35d66;hp=e8dff983279e3ec869ca9bb7b15274852e300919;hpb=ebabbf580131acd1fe246c4d31fc5c044d36a038;p=lttng-ust.git

diff --git a/liblttng-ust/ust-core.c b/liblttng-ust/ust-core.c
index e8dff983..0b1fcf0b 100644
--- a/liblttng-ust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -1,28 +1,15 @@
 /*
- * ust-core.c
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _LGPL_SOURCE
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <lttng/ust-events.h>
+
+#include "ust-events-internal.h"
 #include <usterr-signal-safe.h>
 #include "lttng-tracer-core.h"
 #include "jhash.h"
@@ -30,7 +17,7 @@
 static CDS_LIST_HEAD(lttng_transport_list);
 static CDS_LIST_HEAD(lttng_counter_transport_list);
 
-struct lttng_transport *lttng_transport_find(const char *name)
+struct lttng_transport *lttng_ust_transport_find(const char *name)
 {
 	struct lttng_transport *transport;
 
@@ -99,8 +86,8 @@ void lttng_counter_transport_unregister(struct lttng_counter_transport *transpor
 /*
  * Needed by comm layer.
  */
-struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
-		const struct lttng_enum_desc *enum_desc)
+struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_ust_session *session,
+		struct lttng_ust_enum_desc *enum_desc)
 {
 	struct lttng_enum *_enum;
 	struct cds_hlist_head *head;
@@ -109,7 +96,7 @@ struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
 	uint32_t hash;
 
 	hash = jhash(enum_desc->name, name_len, 0);
-	head = &session->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
+	head = &session->priv->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
 	cds_hlist_for_each_entry(_enum, node, head, hlist) {
 		assert(_enum->desc);
 		if (_enum->desc == enum_desc)
@@ -118,7 +105,7 @@ struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
 	return NULL;
 }
 
-size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t lttng_ust_dummy_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -127,7 +114,7 @@ size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset)
 	return size;
 }
 
-void lttng_ust_dummy_record(struct lttng_ctx_field *field,
+void lttng_ust_dummy_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -137,8 +124,8 @@ void lttng_ust_dummy_record(struct lttng_ctx_field *field,
 	chan->ops->event_write(ctx, &sel_char, sizeof(sel_char));
 }
 
-void lttng_ust_dummy_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void lttng_ust_dummy_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->sel = LTTNG_UST_DYNAMIC_TYPE_NONE;
 }