X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context.c;h=a5d5d03506d674252a803a725185bc3577e525b4;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=ad6c38f0241486f78392cb82f5348a15d83187a6;hpb=735bef4705cc42f25d26f25be09ba98f1efb8511;p=lttng-ust.git diff --git a/liblttng-ust/lttng-context.c b/liblttng-ust/lttng-context.c index ad6c38f0..a5d5d035 100644 --- a/liblttng-ust/lttng-context.c +++ b/liblttng-ust/lttng-context.c @@ -1,34 +1,24 @@ /* - * lttng-context.c - * - * LTTng UST trace/channel/event context management. + * SPDX-License-Identifier: LGPL-2.1-only * * Copyright (C) 2011 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 trace/channel/event context management. */ #define _LGPL_SOURCE #include #include #include -#include +#include #include #include +#include #include #include +#include "tracepoint-internal.h" + +#include "context-internal.h" /* * The filter implementation requires that two consecutive "get" for the @@ -154,8 +144,8 @@ int lttng_context_add_rcu(struct lttng_ctx **ctx_p, } *nf = *f; lttng_context_update(new_ctx); - rcu_assign_pointer(*ctx_p, new_ctx); - synchronize_trace(); + lttng_ust_rcu_assign_pointer(*ctx_p, new_ctx); + lttng_ust_synchronize_trace(); if (old_ctx) { free(old_ctx->fields); free(old_ctx); @@ -179,13 +169,13 @@ void lttng_context_update(struct lttng_ctx *ctx) type = &ctx->fields[i].event_field.type; switch (type->atype) { case atype_integer: - field_align = type->u.basic.integer.alignment; + field_align = type->u.integer.alignment; break; case atype_array: { struct lttng_basic_type *btype; - btype = &type->u.array.elem_type; + btype = &type->u.legacy.array.elem_type; switch (btype->atype) { case atype_integer: field_align = btype->u.basic.integer.alignment; @@ -194,18 +184,44 @@ void lttng_context_update(struct lttng_ctx *ctx) break; case atype_array: + case atype_array_nestable: case atype_sequence: + case atype_sequence_nestable: default: WARN_ON_ONCE(1); break; } break; } + case atype_array_nestable: + { + const struct lttng_type *nested_type; + + nested_type = type->u.array_nestable.elem_type; + switch (nested_type->atype) { + case atype_integer: + field_align = nested_type->u.integer.alignment; + break; + case atype_string: + break; + + case atype_array: + case atype_array_nestable: + case atype_sequence: + case atype_sequence_nestable: + default: + WARN_ON_ONCE(1); + break; + } + field_align = max_t(size_t, field_align, + type->u.array_nestable.alignment); + break; + } case atype_sequence: { struct lttng_basic_type *btype; - btype = &type->u.sequence.length_type; + btype = &type->u.legacy.sequence.length_type; switch (btype->atype) { case atype_integer: field_align = btype->u.basic.integer.alignment; @@ -213,13 +229,15 @@ void lttng_context_update(struct lttng_ctx *ctx) case atype_string: case atype_array: + case atype_array_nestable: case atype_sequence: + case atype_sequence_nestable: default: WARN_ON_ONCE(1); break; } - btype = &type->u.sequence.elem_type; + btype = &type->u.legacy.sequence.elem_type; switch (btype->atype) { case atype_integer: field_align = max_t(size_t, @@ -231,18 +249,46 @@ void lttng_context_update(struct lttng_ctx *ctx) break; case atype_array: + case atype_array_nestable: case atype_sequence: + case atype_sequence_nestable: default: WARN_ON_ONCE(1); break; } break; } + case atype_sequence_nestable: + { + const struct lttng_type *nested_type; + + nested_type = type->u.sequence_nestable.elem_type; + switch (nested_type->atype) { + case atype_integer: + field_align = nested_type->u.integer.alignment; + break; + + case atype_string: + break; + + case atype_array: + case atype_array_nestable: + case atype_sequence: + case atype_sequence_nestable: + default: + WARN_ON_ONCE(1); + break; + } + field_align = max_t(size_t, field_align, + type->u.sequence_nestable.alignment); + break; + } case atype_string: break; case atype_dynamic: break; case atype_enum: + case atype_enum_nestable: default: WARN_ON_ONCE(1); break; @@ -332,8 +378,8 @@ int lttng_ust_context_set_provider_rcu(struct lttng_ctx **_ctx, new_fields[i].get_value = get_value; } new_ctx->fields = new_fields; - rcu_assign_pointer(*_ctx, new_ctx); - synchronize_trace(); + lttng_ust_rcu_assign_pointer(*_ctx, new_ctx); + lttng_ust_synchronize_trace(); free(ctx->fields); free(ctx); return 0; @@ -343,7 +389,7 @@ field_error: return ret; } -int lttng_session_context_init(struct lttng_ctx **ctx) +int lttng_context_init_all(struct lttng_ctx **ctx) { int ret; @@ -397,6 +443,11 @@ int lttng_session_context_init(struct lttng_ctx **ctx) WARN("Cannot add context lttng_add_pid_ns_to_ctx"); goto error; } + ret = lttng_add_time_ns_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_time_ns_to_ctx"); + goto error; + } ret = lttng_add_user_ns_to_ctx(ctx); if (ret) { WARN("Cannot add context lttng_add_user_ns_to_ctx"); @@ -407,6 +458,36 @@ int lttng_session_context_init(struct lttng_ctx **ctx) WARN("Cannot add context lttng_add_uts_ns_to_ctx"); goto error; } + ret = lttng_add_vuid_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_vuid_to_ctx"); + goto error; + } + ret = lttng_add_veuid_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_veuid_to_ctx"); + goto error; + } + ret = lttng_add_vsuid_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_vsuid_to_ctx"); + goto error; + } + ret = lttng_add_vgid_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_vgid_to_ctx"); + goto error; + } + ret = lttng_add_vegid_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_vegid_to_ctx"); + goto error; + } + ret = lttng_add_vsgid_to_ctx(ctx); + if (ret) { + WARN("Cannot add context lttng_add_vsgid_to_ctx"); + goto error; + } lttng_context_update(*ctx); return 0; @@ -414,14 +495,3 @@ error: lttng_destroy_context(*ctx); return ret; } - -/* For backward compatibility. Leave those exported symbols in place. */ -struct lttng_ctx *lttng_static_ctx; - -void lttng_context_init(void) -{ -} - -void lttng_context_exit(void) -{ -}