X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cpu-id.c;h=83c0626dfab61d5dd7f2996fc3c9026b27b798ec;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=fb6e407cfb9c1c82bdd9a2eb741e42bb0a8e7b02;hpb=c7ea8487b97b4552a9fcf214a45e104c5f771c85;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c index fb6e407c..83c0626d 100644 --- a/liblttng-ust/lttng-context-cpu-id.c +++ b/liblttng-ust/lttng-context-cpu-id.c @@ -1,5 +1,7 @@ /* - * lttng-context-cpu-id.c + * SPDX-License-Identifier: LGPL-2.1-only + * + * Copyright (C) 2009-2015 Mathieu Desnoyers * * LTTng UST CPU id context. * @@ -8,25 +10,10 @@ * statistical. For instance, even though a user might select a * cpu_id==1 filter, there may be few events recorded into the channel * appearing from other CPUs, due to migration. - * - * Copyright (C) 2009-2015 Mathieu Desnoyers - * - * 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 _GNU_SOURCE +#define _LGPL_SOURCE +#include #include #include #include @@ -35,7 +22,7 @@ #include "../libringbuffer/getcpu.h" static -size_t cpu_id_get_size(size_t offset) +size_t cpu_id_get_size(struct lttng_ctx_field *field, size_t offset) { size_t size = 0; @@ -58,12 +45,9 @@ void cpu_id_record(struct lttng_ctx_field *field, static void cpu_id_get_value(struct lttng_ctx_field *field, - union lttng_ctx_value *value) + struct lttng_ctx_value *value) { - int cpu; - - cpu = lttng_ust_get_cpu(); - value->s64 = cpu; + value->u.s64 = lttng_ust_get_cpu(); } int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx) @@ -79,12 +63,12 @@ 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(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; + field->event_field.type.u.integer.size = sizeof(int) * CHAR_BIT; + field->event_field.type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT; + field->event_field.type.u.integer.signedness = lttng_is_signed_type(int); + 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->get_size = cpu_id_get_size; field->record = cpu_id_record; field->get_value = cpu_id_get_value;