X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-perf-counters.c;h=3a00a7fabdb8f9de00e34428de0315c37e710b48;hb=dc325c1d762bbbdc1866e590f4649078f8600664;hp=90f9db1944baba037974b50a1846c0dfcb4a7746;hpb=b4051ad8c170901d5297e1b3005b24e63cb0ab1e;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c
index 90f9db19..3a00a7fa 100644
--- a/liblttng-ust/lttng-context-perf-counters.c
+++ b/liblttng-ust/lttng-context-perf-counters.c
@@ -1,26 +1,13 @@
 /*
- * lttng-context-perf-counters.c
- *
- * LTTng UST performance monitoring counters (perf-counters) integration.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2009-2014 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
+ * LTTng UST performance monitoring counters (perf-counters) integration.
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
@@ -28,21 +15,26 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <sys/mman.h>
 #include <sys/syscall.h>
+#include <lttng/ust-arch.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 #include <urcu/system.h>
 #include <urcu/arch.h>
 #include <urcu/rculist.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <urcu/ref.h>
 #include <usterr-signal-safe.h>
 #include <signal.h>
 #include <urcu/tls-compat.h>
 #include "perf_event.h"
+
+#include "context-internal.h"
 #include "lttng-tracer-core.h"
+#include "ust-events-internal.h"
 
 /*
  * We use a global perf counter key and iterate on per-thread RCU lists
@@ -166,11 +158,11 @@ void lttng_perf_unlock(void)
 }
 
 static
-size_t perf_counter_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t perf_counter_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(uint64_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
 	size += sizeof(uint64_t);
 	return size;
 }
@@ -191,7 +183,7 @@ uint64_t read_perf_counter_syscall(
 	return count;
 }
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(LTTNG_UST_ARCH_X86)
 
 static
 uint64_t rdpmc(unsigned int counter)
@@ -435,31 +427,31 @@ struct lttng_perf_counter_thread_field *
 }
 
 static
-uint64_t wrapper_perf_counter_read(struct lttng_ctx_field *field)
+uint64_t wrapper_perf_counter_read(struct lttng_ust_ctx_field *field)
 {
 	struct lttng_perf_counter_field *perf_field;
 	struct lttng_perf_counter_thread_field *perf_thread_field;
 
-	perf_field = field->u.perf_counter;
+	perf_field = (struct lttng_perf_counter_field *) field->priv;
 	perf_thread_field = get_thread_field(perf_field);
 	return arch_read_perf_counter(perf_thread_field);
 }
 
 static
-void perf_counter_record(struct lttng_ctx_field *field,
+void perf_counter_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	uint64_t value;
 
 	value = wrapper_perf_counter_read(field);
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(value));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(value));
 	chan->ops->event_write(ctx, &value, sizeof(value));
 }
 
 static
-void perf_counter_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void perf_counter_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = wrapper_perf_counter_read(field);
 }
@@ -492,13 +484,13 @@ void lttng_destroy_perf_thread_key(void *_key)
 
 /* Called with UST lock held */
 static
-void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
+void lttng_destroy_perf_counter_field(struct lttng_ust_ctx_field *field)
 {
 	struct lttng_perf_counter_field *perf_field;
 	struct lttng_perf_counter_thread_field *pos, *p;
 
-	free((char *) field->event_field.name);
-	perf_field = field->u.perf_counter;
+	free((char *) field->event_field->name);
+	perf_field = (struct lttng_perf_counter_field *) field->priv;
 	/*
 	 * This put is performed when no threads can concurrently
 	 * perform a "get" concurrently, thanks to urcu-bp grace
@@ -514,7 +506,7 @@ void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
 	free(perf_field);
 }
 
-#ifdef __ARM_ARCH_7A__
+#ifdef LTTNG_UST_ARCH_ARMV7
 
 static
 int perf_get_exclude_kernel(void)
@@ -522,7 +514,7 @@ int perf_get_exclude_kernel(void)
 	return 0;
 }
 
-#else /* __ARM_ARCH_7A__ */
+#else /* LTTNG_UST_ARCH_ARMV7 */
 
 static
 int perf_get_exclude_kernel(void)
@@ -530,15 +522,16 @@ int perf_get_exclude_kernel(void)
 	return 1;
 }
 
-#endif /* __ARM_ARCH_7A__ */
+#endif /* LTTNG_UST_ARCH_ARMV7 */
 
 /* Called with UST lock held */
 int lttng_add_perf_counter_to_ctx(uint32_t type,
 				uint64_t config,
 				const char *name,
-				struct lttng_ctx **ctx)
+				struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	struct lttng_ust_ctx_field *field;
+	struct lttng_ust_type_common *ust_type;
 	struct lttng_perf_counter_field *perf_field;
 	char *name_alloc;
 	int ret;
@@ -553,6 +546,14 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 		ret = -ENOMEM;
 		goto perf_field_alloc_error;
 	}
+	ust_type = lttng_ust_create_type_integer(sizeof(uint64_t) * CHAR_BIT,
+			lttng_ust_rb_alignof(uint64_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(uint64_t),
+			BYTE_ORDER, 10);
+	if (!ust_type) {
+		ret = -ENOMEM;
+		goto type_alloc_error;
+	}
 	field = lttng_append_context(ctx);
 	if (!field) {
 		ret = -ENOMEM;
@@ -565,17 +566,8 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 
 	field->destroy = lttng_destroy_perf_counter_field;
 
-	field->event_field.name = name_alloc;
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size =
-			sizeof(uint64_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment =
-			lttng_alignof(uint64_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness =
-			lttng_is_signed_type(uint64_t);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field->name = name_alloc;
+	field->event_field->type = ust_type;
 	field->get_size = perf_counter_get_size;
 	field->record = perf_counter_record;
 	field->get_value = perf_counter_get_value;
@@ -584,7 +576,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 	perf_field->attr.config = config;
 	perf_field->attr.exclude_kernel = perf_get_exclude_kernel();
 	CDS_INIT_LIST_HEAD(&perf_field->thread_field_list);
-	field->u.perf_counter = perf_field;
+	field->priv = perf_field;
 
 	/* Ensure that this perf counter can be used in this process. */
 	ret = open_perf_fd(&perf_field->attr);
@@ -607,6 +599,8 @@ setup_error:
 find_error:
 	lttng_remove_context_field(ctx, field);
 append_context_error:
+	lttng_ust_destroy_type(ust_type);
+type_alloc_error:
 	free(perf_field);
 perf_field_alloc_error:
 	free(name_alloc);