/*
- * lttng-probes.c
+ * SPDX-License-Identifier: LGPL-2.1-only
*
- * Holds LTTng probes registry.
- *
- * Copyright 2010-2012 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * 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.
+ * Copyright 2010-2012 (C) Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * 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
+ * Holds LTTng probes registry.
*/
+#define _LGPL_SOURCE
#include <string.h>
#include <errno.h>
#include <urcu/list.h>
#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().
return &_probe_list;
}
-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 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.
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",
*/
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)
-{
- return lttng_probe_register(desc);
-}
-
void lttng_probe_unregister(struct lttng_probe_desc *desc)
{
+ lttng_ust_fixup_tls();
+
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)
list_entry->field.type = LTTNG_UST_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)
+ if (event_field->type.u.legacy.array.elem_type.atype != atype_integer
+ || event_field->type.u.legacy.array.elem_type.u.basic.integer.encoding == lttng_encode_none)
+ list_entry->field.type = LTTNG_UST_FIELD_OTHER;
+ else
+ list_entry->field.type = LTTNG_UST_FIELD_STRING;
+ break;
+ 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_FIELD_OTHER;
else
list_entry->field.type = LTTNG_UST_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)
+ if (event_field->type.u.legacy.sequence.elem_type.atype != atype_integer
+ || event_field->type.u.legacy.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none)
+ list_entry->field.type = LTTNG_UST_FIELD_OTHER;
+ else
+ list_entry->field.type = LTTNG_UST_FIELD_STRING;
+ break;
+ 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_FIELD_OTHER;
else
list_entry->field.type = LTTNG_UST_FIELD_STRING;
case atype_float:
list_entry->field.type = LTTNG_UST_FIELD_FLOAT;
break;
- case atype_enum:
+ case atype_enum: /* Fall-through */
+ case atype_enum_nestable:
list_entry->field.type = LTTNG_UST_FIELD_ENUM;
break;
default:
projects / lttng-ust.git / blobdiff