X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-perf-counters.c;h=fa2833240e4828c3bf8565cdeca5ecd9caa26f2f;hb=f69fe5fb0a2b0c581f0562bdd04ab2a003d239f9;hp=12d4ab3b2a1a2760f4da5bc29fbd83424aea896e;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c index 12d4ab3b..fa283324 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 @@ -37,13 +23,16 @@ #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 @@ -167,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; @@ -436,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) { @@ -459,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); } @@ -493,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 @@ -537,9 +526,9 @@ 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_perf_counter_field *perf_field; char *name_alloc; int ret; @@ -566,17 +555,17 @@ 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 = + 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.basic.integer.alignment = + field->event_field->type.u.integer.alignment = lttng_alignof(uint64_t) * CHAR_BIT; - field->event_field.type.u.basic.integer.signedness = + field->event_field->type.u.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->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 = perf_counter_get_size; field->record = perf_counter_record; field->get_value = perf_counter_get_value; @@ -585,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);