From 1c23b886aeb023cc94c683e4f79b19187db6361f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sat, 13 Jun 2015 11:14:17 +0200 Subject: [PATCH 1/1] Fix: cpu-id context should use int type cycles_t makes no sense as type for cpu-id context. Signed-off-by: Mathieu Desnoyers --- lttng-context-cpu-id.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c index dd60b199..0738d9c7 100644 --- a/lttng-context-cpu-id.c +++ b/lttng-context-cpu-id.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "lttng-events.h" #include "wrapper/ringbuffer/frontend_types.h" #include "wrapper/vmalloc.h" @@ -34,8 +33,8 @@ size_t cpu_id_get_size(size_t offset) { size_t size = 0; - size += lib_ring_buffer_align(offset, lttng_alignof(cycles_t)); - size += sizeof(cycles_t); + size += lib_ring_buffer_align(offset, lttng_alignof(int)); + size += sizeof(int); return size; } @@ -44,7 +43,7 @@ void cpu_id_record(struct lttng_ctx_field *field, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { - cycles_t cpu; + int cpu; cpu = ctx->cpu; lib_ring_buffer_align_ctx(ctx, lttng_alignof(cpu)); @@ -71,9 +70,9 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx) } field->event_field.name = "cpu_id"; field->event_field.type.atype = atype_integer; - field->event_field.type.u.basic.integer.size = sizeof(cycles_t) * CHAR_BIT; - field->event_field.type.u.basic.integer.alignment = lttng_alignof(cycles_t) * CHAR_BIT; - field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(cycles_t); + field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT; + field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT; + field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(int); 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; -- 2.34.1