X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-perf-counters.c;h=94f4e95d4589bf8bb798af3a07fa7478e1e88c96;hb=8da9deee450bf62c6c3abb1f44f9414c0667dd6f;hp=fa2833240e4828c3bf8565cdeca5ecd9caa26f2f;hpb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c
index fa283324..94f4e95d 100644
--- a/liblttng-ust/lttng-context-perf-counters.c
+++ b/liblttng-ust/lttng-context-perf-counters.c
@@ -7,6 +7,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
@@ -17,9 +18,10 @@
 #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>
@@ -160,7 +162,7 @@ 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;
 }
@@ -181,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)
@@ -438,13 +440,12 @@ uint64_t wrapper_perf_counter_read(struct lttng_ust_ctx_field *field)
 static
 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));
-	chan->ops->event_write(ctx, &value, sizeof(value));
+	chan->ops->event_write(ctx, &value, sizeof(value), lttng_ust_rb_alignof(value));
 }
 
 static
@@ -504,7 +505,7 @@ void lttng_destroy_perf_counter_field(struct lttng_ust_ctx_field *field)
 	free(perf_field);
 }
 
-#ifdef __ARM_ARCH_7A__
+#ifdef LTTNG_UST_ARCH_ARMV7
 
 static
 int perf_get_exclude_kernel(void)
@@ -512,7 +513,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)
@@ -520,7 +521,7 @@ 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,
@@ -529,6 +530,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 				struct lttng_ust_ctx **ctx)
 {
 	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;
@@ -543,6 +545,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;
@@ -556,16 +566,7 @@ 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.integer.size =
-			sizeof(uint64_t) * CHAR_BIT;
-	field->event_field->type.u.integer.alignment =
-			lttng_alignof(uint64_t) * CHAR_BIT;
-	field->event_field->type.u.integer.signedness =
-			lttng_is_signed_type(uint64_t);
-	field->event_field->type.u.integer.reverse_byte_order = 0;
-	field->event_field->type.u.integer.base = 10;
-	field->event_field->type.u.integer.encoding = lttng_encode_none;
+	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;
@@ -597,6 +598,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);