/*
- * lttng-context-provider.c
- *
- * LTTng UST application context provider.
+ * SPDX-License-Identifier: LGPL-2.1-only
*
* Copyright (C) 2016 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.
- *
- * 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 application context provider.
*/
#define _LGPL_SOURCE
+#include <stddef.h>
+#include <stdint.h>
#include <sys/types.h>
#include <unistd.h>
-#include <lttng/ust-context-provider.h>
+
+#include <ust-context-provider.h>
+
+#include "context-internal.h"
#include "lttng-tracer-core.h"
#include "jhash.h"
-#include <helper.h>
+#include "context-provider-internal.h"
+#include <ust-helper.h>
#define CONTEXT_PROVIDER_HT_BITS 12
#define CONTEXT_PROVIDER_HT_SIZE (1U << CONTEXT_PROVIDER_HT_BITS)
lttng_ust_fixup_tls();
/* Provider name starts with "$app.". */
- if (strncmp("$app.", provider->name, strlen("$app.") != 0))
+ if (strncmp("$app.", provider->name, strlen("$app.")) != 0)
return -EINVAL;
- /* Provider name cannot contain a column character. */
+ /* Provider name cannot contain a colon character. */
if (strchr(provider->name, ':'))
return -EINVAL;
if (ust_lock()) {
hash = jhash(provider->name, name_len, 0);
head = &context_provider_ht.table[hash & (CONTEXT_PROVIDER_HT_SIZE - 1)];
cds_hlist_add_head(&provider->node, head);
+
lttng_ust_context_set_session_provider(provider->name,
provider->get_size, provider->record,
provider->get_value);
+
+ lttng_ust_context_set_event_notifier_group_provider(provider->name,
+ provider->get_size, provider->record,
+ provider->get_value);
end:
ust_unlock();
return ret;
lttng_ust_context_set_session_provider(provider->name,
lttng_ust_dummy_get_size, lttng_ust_dummy_record,
lttng_ust_dummy_get_value);
+
+ lttng_ust_context_set_event_notifier_group_provider(provider->name,
+ lttng_ust_dummy_get_size, lttng_ust_dummy_record,
+ lttng_ust_dummy_get_value);
+
cds_hlist_del(&provider->node);
end:
ust_unlock();
* metadata describing the context.
*/
int lttng_ust_add_app_context_to_ctx_rcu(const char *name,
- struct lttng_ctx **ctx)
+ struct lttng_ust_ctx **ctx)
{
struct lttng_ust_context_provider *provider;
- struct lttng_ctx_field new_field;
+ struct lttng_ust_ctx_field *new_field = NULL;
int ret;
if (*ctx && lttng_find_context(*ctx, name))
return -EEXIST;
- /*
- * For application context, add it by expanding
- * ctx array.
- */
- memset(&new_field, 0, sizeof(new_field));
- new_field.field_name = strdup(name);
- if (!new_field.field_name)
- return -ENOMEM;
- new_field.event_field.name = new_field.field_name;
- new_field.event_field.type.atype = atype_dynamic;
+ new_field = zmalloc(sizeof(struct lttng_ust_ctx_field));
+ if (!new_field) {
+ ret = -ENOMEM;
+ goto error_field_alloc;
+ }
+ new_field->struct_size = sizeof(struct lttng_ust_ctx_field);
+ new_field->event_field = zmalloc(sizeof(struct lttng_ust_event_field));
+ if (!new_field->event_field) {
+ ret = -ENOMEM;
+ goto error_event_field_alloc;
+ }
+ new_field->field_name = strdup(name);
+ if (!new_field->field_name) {
+ ret = -ENOMEM;
+ goto error_field_name_alloc;
+ }
+ new_field->event_field->name = new_field->field_name;
+ new_field->event_field->type.atype = atype_dynamic;
/*
* If provider is not found, we add the context anyway, but
* it will provide a dummy context.
*/
provider = lookup_provider_by_name(name);
if (provider) {
- new_field.get_size = provider->get_size;
- new_field.record = provider->record;
- new_field.get_value = provider->get_value;
+ new_field->get_size = provider->get_size;
+ new_field->record = provider->record;
+ new_field->get_value = provider->get_value;
} else {
- new_field.get_size = lttng_ust_dummy_get_size;
- new_field.record = lttng_ust_dummy_record;
- new_field.get_value = lttng_ust_dummy_get_value;
+ new_field->get_size = lttng_ust_dummy_get_size;
+ new_field->record = lttng_ust_dummy_record;
+ new_field->get_value = lttng_ust_dummy_get_value;
}
- ret = lttng_context_add_rcu(ctx, &new_field);
+ /*
+ * For application context, add it by expanding
+ * ctx array. Ownership of new_field is passed to the callee on
+ * success.
+ */
+ ret = lttng_context_add_rcu(ctx, new_field);
if (ret) {
- free(new_field.field_name);
+ free(new_field->field_name);
+ free(new_field->event_field);
+ free(new_field);
return ret;
}
return 0;
+
+error_field_name_alloc:
+ free(new_field->event_field);
+error_event_field_alloc:
+ free(new_field);
+error_field_alloc:
+ return ret;
}
projects / lttng-ust.git / blobdiff