X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-probes.c;h=98998b0fae9cbd37e449a0a0b9db2676785ad418;hb=a5ae46ccd9f046246765c634237a65ffa79eb4e9;hp=433171cfb04635c424394a9e2c292f82a70a8ae4;hpb=71d3169070a4c9e0df87a9d825dd7520022385a7;p=lttng-ust.git diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c index 433171cf..98998b0f 100644 --- a/liblttng-ust/lttng-probes.c +++ b/liblttng-ust/lttng-probes.c @@ -1,25 +1,12 @@ /* - * lttng-probes.c + * SPDX-License-Identifier: LGPL-2.1-only * - * Holds LTTng probes registry. - * - * Copyright 2010-2012 (c) - 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. + * Copyright 2010-2012 (C) Mathieu Desnoyers * - * 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 + * Holds LTTng probes registry. */ +#define _LGPL_SOURCE #include #include #include @@ -28,12 +15,13 @@ #include #include "tracepoint-internal.h" #include -#include +#include #include #include "lttng-tracer-core.h" #include "jhash.h" #include "error.h" +#include "ust-events-internal.h" /* * probe list is protected by ust_lock()/ust_unlock(). @@ -56,13 +44,13 @@ static int lazy_nesting; * Called under ust lock. */ static -int check_event_provider(struct lttng_probe_desc *desc) +int check_event_provider(struct lttng_ust_probe_desc *desc) { int i; size_t provider_name_len; provider_name_len = strnlen(desc->provider, - LTTNG_UST_SYM_NAME_LEN - 1); + LTTNG_UST_ABI_SYM_NAME_LEN - 1); for (i = 0; i < desc->nr_events; i++) { if (strncmp(desc->event_desc[i]->name, desc->provider, @@ -76,9 +64,9 @@ int check_event_provider(struct lttng_probe_desc *desc) * Called under ust lock. */ static -void lttng_lazy_probe_register(struct lttng_probe_desc *desc) +void lttng_lazy_probe_register(struct lttng_ust_probe_desc *desc) { - struct lttng_probe_desc *iter; + struct lttng_ust_probe_desc *iter; struct cds_list_head *probe_list; /* @@ -96,7 +84,7 @@ void lttng_lazy_probe_register(struct lttng_probe_desc *desc) */ /* - * We sort the providers by struct lttng_probe_desc pointer + * We sort the providers by struct lttng_ust_probe_desc pointer * address. */ probe_list = &_probe_list; @@ -121,7 +109,7 @@ desc_added: static void fixup_lazy_probes(void) { - struct lttng_probe_desc *iter, *tmp; + struct lttng_ust_probe_desc *iter, *tmp; int ret; lazy_nesting++; @@ -147,21 +135,7 @@ struct cds_list_head *lttng_get_probe_list_head(void) } static -const struct lttng_probe_desc *find_provider(const char *provider) -{ - struct lttng_probe_desc *iter; - struct cds_list_head *probe_list; - - probe_list = lttng_get_probe_list_head(); - cds_list_for_each_entry(iter, probe_list, head) { - if (!strcmp(iter->provider, provider)) - return iter; - } - return NULL; -} - -static -int check_provider_version(struct lttng_probe_desc *desc) +int check_provider_version(struct lttng_ust_probe_desc *desc) { /* * Check tracepoint provider version compatibility. @@ -190,10 +164,12 @@ int check_provider_version(struct lttng_probe_desc *desc) } -int lttng_probe_register(struct lttng_probe_desc *desc) +int lttng_ust_probe_register(struct lttng_ust_probe_desc *desc) { int ret = 0; + lttng_ust_fixup_tls(); + /* * If version mismatch, don't register, but don't trigger assert * on caller. The version check just prints an error. @@ -201,15 +177,8 @@ int lttng_probe_register(struct lttng_probe_desc *desc) if (!check_provider_version(desc)) return 0; - ust_lock(); + ust_lock_nocheck(); - /* - * Check if the provider has already been registered. - */ - if (find_provider(desc->provider)) { - ret = -EEXIST; - goto end; - } cds_list_add(&desc->lazy_init_head, &lazy_probe_init); desc->lazy = 1; DBG("adding probe %s containing %u events to lazy registration list", @@ -221,35 +190,30 @@ int lttng_probe_register(struct lttng_probe_desc *desc) */ if (lttng_session_active()) fixup_lazy_probes(); -end: + + lttng_fix_pending_event_notifiers(); + ust_unlock(); return ret; } -/* Backward compatibility with UST 2.0 */ -int ltt_probe_register(struct lttng_probe_desc *desc) +void lttng_ust_probe_unregister(struct lttng_ust_probe_desc *desc) { - return lttng_probe_register(desc); -} + lttng_ust_fixup_tls(); -void lttng_probe_unregister(struct lttng_probe_desc *desc) -{ if (!check_provider_version(desc)) return; - ust_lock(); + ust_lock_nocheck(); if (!desc->lazy) cds_list_del(&desc->head); else cds_list_del(&desc->lazy_init_head); - DBG("just unregistered probe %s", desc->provider); - ust_unlock(); -} -/* Backward compatibility with UST 2.0 */ -void ltt_probe_unregister(struct lttng_probe_desc *desc) -{ - lttng_probe_unregister(desc); + lttng_probe_provider_unregister_events(desc); + DBG("just unregistered probes of provider %s", desc->provider); + + ust_unlock(); } void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list) @@ -267,7 +231,7 @@ void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list) */ int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list) { - struct lttng_probe_desc *probe_desc; + struct lttng_ust_probe_desc *probe_desc; int i; struct cds_list_head *probe_list; @@ -283,8 +247,8 @@ int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list) cds_list_add(&list_entry->head, &list->head); strncpy(list_entry->tp.name, probe_desc->event_desc[i]->name, - LTTNG_UST_SYM_NAME_LEN); - list_entry->tp.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + LTTNG_UST_ABI_SYM_NAME_LEN); + list_entry->tp.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; if (!probe_desc->event_desc[i]->loglevel) { list_entry->tp.loglevel = TRACE_DEFAULT; } else { @@ -308,7 +272,7 @@ err_nomem: * Return current iteration position, advance internal iterator to next. * Return NULL if end of list. */ -struct lttng_ust_tracepoint_iter * +struct lttng_ust_abi_tracepoint_iter * lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list) { struct tp_list_entry *entry; @@ -339,7 +303,7 @@ void lttng_probes_prune_field_list(struct lttng_ust_field_list *list) */ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) { - struct lttng_probe_desc *probe_desc; + struct lttng_ust_probe_desc *probe_desc; int i; struct cds_list_head *probe_list; @@ -347,7 +311,7 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) CDS_INIT_LIST_HEAD(&list->head); cds_list_for_each_entry(probe_desc, probe_list, head) { for (i = 0; i < probe_desc->nr_events; i++) { - const struct lttng_event_desc *event_desc = + const struct lttng_ust_event_desc *event_desc = probe_desc->event_desc[i]; int j; @@ -361,10 +325,10 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) cds_list_add(&list_entry->head, &list->head); strncpy(list_entry->field.event_name, event_desc->name, - LTTNG_UST_SYM_NAME_LEN); - list_entry->field.event_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + LTTNG_UST_ABI_SYM_NAME_LEN); + list_entry->field.event_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; list_entry->field.field_name[0] = '\0'; - list_entry->field.type = LTTNG_UST_FIELD_OTHER; + list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; if (!event_desc->loglevel) { list_entry->field.loglevel = TRACE_DEFAULT; } else { @@ -374,8 +338,8 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) } for (j = 0; j < event_desc->nr_fields; j++) { - const struct lttng_event_field *event_field = - &event_desc->fields[j]; + const struct lttng_ust_event_field *event_field = + event_desc->fields[j]; struct tp_field_list_entry *list_entry; list_entry = zmalloc(sizeof(*list_entry)); @@ -384,41 +348,41 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) cds_list_add(&list_entry->head, &list->head); strncpy(list_entry->field.event_name, event_desc->name, - LTTNG_UST_SYM_NAME_LEN); - list_entry->field.event_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + LTTNG_UST_ABI_SYM_NAME_LEN); + list_entry->field.event_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; strncpy(list_entry->field.field_name, event_field->name, - LTTNG_UST_SYM_NAME_LEN); - list_entry->field.field_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + LTTNG_UST_ABI_SYM_NAME_LEN); + list_entry->field.field_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; switch (event_field->type.atype) { case atype_integer: - list_entry->field.type = LTTNG_UST_FIELD_INTEGER; + list_entry->field.type = LTTNG_UST_ABI_FIELD_INTEGER; break; case atype_string: - list_entry->field.type = LTTNG_UST_FIELD_STRING; + list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING; break; - case atype_array: - if (event_field->type.u.array.elem_type.atype != atype_integer - || event_field->type.u.array.elem_type.u.basic.integer.encoding == lttng_encode_none) - list_entry->field.type = LTTNG_UST_FIELD_OTHER; + case atype_array_nestable: + if (event_field->type.u.array_nestable.elem_type->atype != atype_integer + || event_field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) + list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; else - list_entry->field.type = LTTNG_UST_FIELD_STRING; + list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING; break; - case atype_sequence: - if (event_field->type.u.sequence.elem_type.atype != atype_integer - || event_field->type.u.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) - list_entry->field.type = LTTNG_UST_FIELD_OTHER; + case atype_sequence_nestable: + if (event_field->type.u.sequence_nestable.elem_type->atype != atype_integer + || event_field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) + list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; else - list_entry->field.type = LTTNG_UST_FIELD_STRING; + list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING; break; case atype_float: - list_entry->field.type = LTTNG_UST_FIELD_FLOAT; + list_entry->field.type = LTTNG_UST_ABI_FIELD_FLOAT; break; - case atype_enum: - list_entry->field.type = LTTNG_UST_FIELD_ENUM; + case atype_enum_nestable: + list_entry->field.type = LTTNG_UST_ABI_FIELD_ENUM; break; default: - list_entry->field.type = LTTNG_UST_FIELD_OTHER; + list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; } if (!event_desc->loglevel) { list_entry->field.loglevel = TRACE_DEFAULT; @@ -446,7 +410,7 @@ err_nomem: * Return current iteration position, advance internal iterator to next. * Return NULL if end of list. */ -struct lttng_ust_field_iter * +struct lttng_ust_abi_field_iter * lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list) { struct tp_field_list_entry *entry;