X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-perf-counters.c;h=f8241c392872ff53230c55b7201589794a8c323b;hb=2adb7ad28124fdbc0ad61bcada1c7dbceb03e9ab;hp=a6ff55b678d472d29fb157f7b0527918432121e2;hpb=20142124a2e34c287a277bbd7ef5b28697735d10;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c index a6ff55b6..f8241c39 100644 --- a/liblttng-ust/lttng-context-perf-counters.c +++ b/liblttng-ust/lttng-context-perf-counters.c @@ -1,23 +1,9 @@ /* - * 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 * - * 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 @@ -27,21 +13,26 @@ #include #include #include +#include +#include #include #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include #include #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 @@ -165,7 +156,7 @@ 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; @@ -434,18 +425,18 @@ 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) { @@ -457,8 +448,8 @@ void perf_counter_record(struct lttng_ctx_field *field, } 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); } @@ -491,13 +482,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 @@ -535,9 +526,10 @@ int perf_get_exclude_kernel(void) 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; @@ -552,6 +544,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_alignof(uint64_t) * CHAR_BIT, + lttng_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; @@ -564,17 +564,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; @@ -583,7 +574,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); @@ -606,6 +597,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);