#include "ust-events-internal.h"
#include "wait.h"
#include "../libringbuffer/shm.h"
+#include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/frontend.h"
#include "../libcounter/counter.h"
#include "jhash.h"
#include <lttng/ust-abi.h>
+#include "context-provider-internal.h"
/*
* All operations within this file are called by the communication
return &sessions;
}
-static void _lttng_event_destroy(struct lttng_event *event);
-static void _lttng_event_notifier_destroy(
- struct lttng_event_notifier *event_notifier);
+static void _lttng_event_destroy(struct lttng_ust_event_common *event);
static void _lttng_enum_destroy(struct lttng_enum *_enum);
static
-void lttng_session_lazy_sync_event_enablers(struct lttng_session *session);
+void lttng_session_lazy_sync_event_enablers(struct lttng_ust_session *session);
static
-void lttng_session_sync_event_enablers(struct lttng_session *session);
+void lttng_session_sync_event_enablers(struct lttng_ust_session *session);
static
void lttng_event_notifier_group_sync_enablers(
struct lttng_event_notifier_group *event_notifier_group);
static
void lttng_enabler_destroy(struct lttng_enabler *enabler);
+bool lttng_ust_validate_event_name(const struct lttng_ust_event_desc *desc)
+{
+ if (strlen(desc->probe_desc->provider_name) + 1 +
+ strlen(desc->event_name) >= LTTNG_UST_ABI_SYM_NAME_LEN)
+ return false;
+ return true;
+}
+
+void lttng_ust_format_event_name(const struct lttng_ust_event_desc *desc,
+ char *name)
+{
+ strcpy(name, desc->probe_desc->provider_name);
+ strcat(name, ":");
+ strcat(name, desc->event_name);
+}
+
/*
* Called with ust lock held.
*/
static
int lttng_loglevel_match(int loglevel,
unsigned int has_loglevel,
- enum lttng_ust_loglevel_type req_type,
+ enum lttng_ust_abi_loglevel_type req_type,
int req_loglevel)
{
if (!has_loglevel)
loglevel = TRACE_DEFAULT;
switch (req_type) {
- case LTTNG_UST_LOGLEVEL_RANGE:
+ case LTTNG_UST_ABI_LOGLEVEL_RANGE:
if (loglevel <= req_loglevel
|| (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
return 1;
else
return 0;
- case LTTNG_UST_LOGLEVEL_SINGLE:
+ case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
if (loglevel == req_loglevel
|| (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
return 1;
else
return 0;
- case LTTNG_UST_LOGLEVEL_ALL:
+ case LTTNG_UST_ABI_LOGLEVEL_ALL:
default:
if (loglevel <= TRACE_DEBUG)
return 1;
}
}
-struct lttng_session *lttng_session_create(void)
+struct lttng_ust_session *lttng_session_create(void)
{
- struct lttng_session *session;
+ struct lttng_ust_session *session;
struct lttng_ust_session_private *session_priv;
int i;
- session = zmalloc(sizeof(struct lttng_session));
+ session = zmalloc(sizeof(struct lttng_ust_session));
if (!session)
return NULL;
- session->struct_size = sizeof(struct lttng_session);
+ session->struct_size = sizeof(struct lttng_ust_session);
session_priv = zmalloc(sizeof(struct lttng_ust_session_private));
if (!session_priv) {
free(session);
* Only used internally at session destruction.
*/
static
-void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
+void _lttng_channel_unmap(struct lttng_ust_channel_buffer *lttng_chan)
{
- struct channel *chan;
+ struct lttng_ust_lib_ring_buffer_channel *chan;
struct lttng_ust_shm_handle *handle;
- cds_list_del(<tng_chan->node);
- lttng_destroy_context(lttng_chan->ctx);
- chan = lttng_chan->chan;
- handle = lttng_chan->handle;
- /*
- * note: lttng_chan is private data contained within handle. It
- * will be freed along with the handle.
- */
+ cds_list_del(<tng_chan->priv->node);
+ lttng_destroy_context(lttng_chan->priv->ctx);
+ chan = lttng_chan->priv->rb_chan;
+ handle = chan->handle;
channel_destroy(chan, handle, 0);
+ free(lttng_chan->parent);
+ free(lttng_chan->priv);
+ free(lttng_chan);
}
static
-void register_event(struct lttng_event *event)
+void register_event(struct lttng_ust_event_common *event)
{
int ret;
- const struct lttng_event_desc *desc;
+ const struct lttng_ust_event_desc *desc;
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
- assert(event->parent->priv->registered == 0);
- desc = event->parent->priv->desc;
- ret = __tracepoint_probe_register_queue_release(desc->name,
+ assert(event->priv->registered == 0);
+ desc = event->priv->desc;
+ lttng_ust_format_event_name(desc, name);
+ ret = lttng_ust_tp_probe_register_queue_release(name,
desc->probe_callback,
event, desc->signature);
WARN_ON_ONCE(ret);
if (!ret)
- event->parent->priv->registered = 1;
+ event->priv->registered = 1;
}
static
-void register_event_notifier(struct lttng_event_notifier *event_notifier)
+void unregister_event(struct lttng_ust_event_common *event)
{
int ret;
- const struct lttng_event_desc *desc;
+ const struct lttng_ust_event_desc *desc;
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
- assert(event_notifier->registered == 0);
- desc = event_notifier->desc;
- ret = __tracepoint_probe_register_queue_release(desc->name,
- desc->u.ext.event_notifier_callback, event_notifier, desc->signature);
- WARN_ON_ONCE(ret);
- if (!ret)
- event_notifier->registered = 1;
-}
-
-static
-void unregister_event(struct lttng_event *event)
-{
- int ret;
- const struct lttng_event_desc *desc;
-
- assert(event->parent->priv->registered == 1);
- desc = event->parent->priv->desc;
- ret = __tracepoint_probe_unregister_queue_release(desc->name,
+ assert(event->priv->registered == 1);
+ desc = event->priv->desc;
+ lttng_ust_format_event_name(desc, name);
+ ret = lttng_ust_tp_probe_unregister_queue_release(name,
desc->probe_callback,
event);
WARN_ON_ONCE(ret);
if (!ret)
- event->parent->priv->registered = 0;
+ event->priv->registered = 0;
}
static
-void unregister_event_notifier(struct lttng_event_notifier *event_notifier)
-{
- int ret;
- const struct lttng_event_desc *desc;
-
- assert(event_notifier->registered == 1);
- desc = event_notifier->desc;
- ret = __tracepoint_probe_unregister_queue_release(desc->name,
- desc->u.ext.event_notifier_callback, event_notifier);
- WARN_ON_ONCE(ret);
- if (!ret)
- event_notifier->registered = 0;
-}
-
-/*
- * Only used internally at session destruction.
- */
-static
-void _lttng_event_unregister(struct lttng_event *event)
+void _lttng_event_unregister(struct lttng_ust_event_common *event)
{
- if (event->parent->priv->registered)
+ if (event->priv->registered)
unregister_event(event);
}
-/*
- * Only used internally at session destruction.
- */
-static
-void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier)
-{
- if (event_notifier->registered)
- unregister_event_notifier(event_notifier);
-}
-
-void lttng_session_destroy(struct lttng_session *session)
+void lttng_session_destroy(struct lttng_ust_session *session)
{
- struct lttng_channel *chan, *tmpchan;
- struct lttng_ust_event_private *event_priv, *tmpevent_priv;
+ struct lttng_ust_channel_buffer_private *chan, *tmpchan;
+ struct lttng_ust_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv;
struct lttng_enum *_enum, *tmp_enum;
struct lttng_event_enabler *event_enabler, *event_tmpenabler;
CMM_ACCESS_ONCE(session->active) = 0;
- cds_list_for_each_entry(event_priv, &session->priv->events_head, node) {
- _lttng_event_unregister(event_priv->pub);
+ cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
+ _lttng_event_unregister(event_recorder_priv->parent.pub);
}
lttng_ust_urcu_synchronize_rcu(); /* Wait for in-flight events to complete */
- __tracepoint_probe_prune_release_queue();
+ lttng_ust_tp_probe_prune_release_queue();
cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
&session->priv->enablers_head, node)
lttng_event_enabler_destroy(event_enabler);
- cds_list_for_each_entry_safe(event_priv, tmpevent_priv,
+ cds_list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv,
&session->priv->events_head, node)
- _lttng_event_destroy(event_priv->pub);
+ _lttng_event_destroy(event_recorder_priv->parent.pub);
cds_list_for_each_entry_safe(_enum, tmp_enum,
&session->priv->enums_head, node)
_lttng_enum_destroy(_enum);
cds_list_for_each_entry_safe(chan, tmpchan, &session->priv->chan_head, node)
- _lttng_channel_unmap(chan);
+ _lttng_channel_unmap(chan->pub);
cds_list_del(&session->priv->node);
lttng_destroy_context(session->priv->ctx);
free(session->priv);
{
int close_ret;
struct lttng_event_notifier_enabler *notifier_enabler, *tmpnotifier_enabler;
- struct lttng_event_notifier *notifier, *tmpnotifier;
+ struct lttng_ust_event_notifier_private *event_notifier_priv, *tmpevent_notifier_priv;
if (!event_notifier_group) {
return;
}
- cds_list_for_each_entry(notifier,
+ cds_list_for_each_entry(event_notifier_priv,
&event_notifier_group->event_notifiers_head, node)
- _lttng_event_notifier_unregister(notifier);
+ _lttng_event_unregister(event_notifier_priv->parent.pub);
lttng_ust_urcu_synchronize_rcu();
&event_notifier_group->enablers_head, node)
lttng_event_notifier_enabler_destroy(notifier_enabler);
- cds_list_for_each_entry_safe(notifier, tmpnotifier,
+ cds_list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
&event_notifier_group->event_notifiers_head, node)
- _lttng_event_notifier_destroy(notifier);
+ _lttng_event_destroy(event_notifier_priv->parent.pub);
if (event_notifier_group->error_counter)
lttng_ust_counter_destroy(event_notifier_group->error_counter);
}
static
-int lttng_enum_create(const struct lttng_enum_desc *desc,
- struct lttng_session *session)
+int lttng_enum_create(const struct lttng_ust_enum_desc *desc,
+ struct lttng_ust_session *session)
{
const char *enum_name = desc->name;
struct lttng_enum *_enum;
}
static
-int lttng_create_enum_check(const struct lttng_type *type,
- struct lttng_session *session)
+int lttng_create_enum_check(const struct lttng_ust_type_common *type,
+ struct lttng_ust_session *session)
{
- switch (type->atype) {
- case atype_enum_nestable:
+ switch (type->type) {
+ case lttng_ust_type_enum:
{
- const struct lttng_enum_desc *enum_desc;
+ const struct lttng_ust_enum_desc *enum_desc;
int ret;
- enum_desc = type->u.enum_nestable.desc;
+ enum_desc = lttng_ust_get_type_enum(type)->desc;
ret = lttng_enum_create(enum_desc, session);
if (ret && ret != -EEXIST) {
DBG("Unable to create enum error: (%d)", ret);
}
break;
}
- case atype_dynamic:
+ case lttng_ust_type_dynamic:
{
- const struct lttng_event_field *tag_field_generic;
- const struct lttng_enum_desc *enum_desc;
+ const struct lttng_ust_event_field *tag_field_generic;
+ const struct lttng_ust_enum_desc *enum_desc;
int ret;
tag_field_generic = lttng_ust_dynamic_type_tag_field();
- enum_desc = tag_field_generic->type.u.enum_nestable.desc;
+ enum_desc = lttng_ust_get_type_enum(tag_field_generic->type)->desc;
ret = lttng_enum_create(enum_desc, session);
if (ret && ret != -EEXIST) {
DBG("Unable to create enum error: (%d)", ret);
static
int lttng_create_all_event_enums(size_t nr_fields,
- const struct lttng_event_field *event_fields,
- struct lttng_session *session)
+ const struct lttng_ust_event_field **event_fields,
+ struct lttng_ust_session *session)
{
size_t i;
int ret;
/* For each field, ensure enum is part of the session. */
for (i = 0; i < nr_fields; i++) {
- const struct lttng_type *type = &event_fields[i].type;
+ const struct lttng_ust_type_common *type = event_fields[i]->type;
ret = lttng_create_enum_check(type, session);
if (ret)
static
int lttng_create_all_ctx_enums(size_t nr_fields,
- const struct lttng_ctx_field *ctx_fields,
- struct lttng_session *session)
+ struct lttng_ust_ctx_field *ctx_fields,
+ struct lttng_ust_session *session)
{
size_t i;
int ret;
/* For each field, ensure enum is part of the session. */
for (i = 0; i < nr_fields; i++) {
- const struct lttng_type *type = &ctx_fields[i].event_field.type;
+ const struct lttng_ust_type_common *type = ctx_fields[i].event_field->type;
ret = lttng_create_enum_check(type, session);
if (ret)
* Ensure that a state-dump will be performed for this session at the end
* of the current handle_message().
*/
-int lttng_session_statedump(struct lttng_session *session)
+int lttng_session_statedump(struct lttng_ust_session *session)
{
session->priv->statedump_pending = 1;
lttng_ust_sockinfo_session_enabled(session->priv->owner);
return 0;
}
-int lttng_session_enable(struct lttng_session *session)
+int lttng_session_enable(struct lttng_ust_session *session)
{
int ret = 0;
- struct lttng_channel *chan;
+ struct lttng_ust_channel_buffer_private *chan;
int notify_socket;
if (session->active) {
* we need to use.
*/
cds_list_for_each_entry(chan, &session->priv->chan_head, node) {
- const struct lttng_ctx *ctx;
- const struct lttng_ctx_field *fields = NULL;
+ struct lttng_ust_ctx *ctx;
+ struct lttng_ust_ctx_field *fields = NULL;
size_t nr_fields = 0;
uint32_t chan_id;
ret = ustcomm_register_channel(notify_socket,
session,
session->priv->objd,
- chan->objd,
+ chan->parent.objd,
nr_fields,
fields,
&chan_id,
return ret;
}
-int lttng_session_disable(struct lttng_session *session)
+int lttng_session_disable(struct lttng_ust_session *session)
{
int ret = 0;
return ret;
}
-int lttng_channel_enable(struct lttng_channel *channel)
+int lttng_channel_enable(struct lttng_ust_channel_common *lttng_channel)
{
int ret = 0;
- if (channel->enabled) {
+ if (lttng_channel->enabled) {
ret = -EBUSY;
goto end;
}
/* Set transient enabler state to "enabled" */
- channel->tstate = 1;
- lttng_session_sync_event_enablers(channel->session);
+ lttng_channel->priv->tstate = 1;
+ lttng_session_sync_event_enablers(lttng_channel->session);
/* Set atomically the state to "enabled" */
- CMM_ACCESS_ONCE(channel->enabled) = 1;
+ CMM_ACCESS_ONCE(lttng_channel->enabled) = 1;
end:
return ret;
}
-int lttng_channel_disable(struct lttng_channel *channel)
+int lttng_channel_disable(struct lttng_ust_channel_common *lttng_channel)
{
int ret = 0;
- if (!channel->enabled) {
+ if (!lttng_channel->enabled) {
ret = -EBUSY;
goto end;
}
/* Set atomically the state to "disabled" */
- CMM_ACCESS_ONCE(channel->enabled) = 0;
+ CMM_ACCESS_ONCE(lttng_channel->enabled) = 0;
/* Set transient enabler state to "enabled" */
- channel->tstate = 0;
- lttng_session_sync_event_enablers(channel->session);
+ lttng_channel->priv->tstate = 0;
+ lttng_session_sync_event_enablers(lttng_channel->session);
end:
return ret;
}
struct cds_hlist_head *borrow_hash_table_bucket(
struct cds_hlist_head *hash_table,
unsigned int hash_table_size,
- const struct lttng_event_desc *desc)
+ const struct lttng_ust_event_desc *desc)
{
- const char *event_name;
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
size_t name_len;
uint32_t hash;
- event_name = desc->name;
- name_len = strlen(event_name);
+ lttng_ust_format_event_name(desc, name);
+ name_len = strlen(name);
- hash = jhash(event_name, name_len, 0);
+ hash = jhash(name, name_len, 0);
return &hash_table[hash & (hash_table_size - 1)];
}
* Supports event creation while tracing session is active.
*/
static
-int lttng_event_create(const struct lttng_event_desc *desc,
- struct lttng_channel *chan)
+int lttng_event_recorder_create(const struct lttng_ust_event_desc *desc,
+ struct lttng_ust_channel_buffer *chan)
{
- struct lttng_event *event;
- struct lttng_ust_event_private *event_priv;
- struct lttng_session *session = chan->session;
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
+ struct lttng_ust_event_recorder *event_recorder;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
+ struct lttng_ust_session *session = chan->parent->session;
struct cds_hlist_head *head;
int ret = 0;
int notify_socket, loglevel;
const char *uri;
- head = borrow_hash_table_bucket(chan->session->priv->events_ht.table,
+ head = borrow_hash_table_bucket(chan->parent->session->priv->events_ht.table,
LTTNG_UST_EVENT_HT_SIZE, desc);
notify_socket = lttng_get_notify_socket(session->priv->owner);
/*
* Check if loglevel match. Refuse to connect event if not.
*/
- event = zmalloc(sizeof(struct lttng_event));
- if (!event) {
+ event_recorder = zmalloc(sizeof(struct lttng_ust_event_recorder));
+ if (!event_recorder) {
ret = -ENOMEM;
goto cache_error;
}
- event->struct_size = sizeof(struct lttng_event);
+ event_recorder->struct_size = sizeof(struct lttng_ust_event_recorder);
- event->parent = zmalloc(sizeof(struct lttng_event_common));
- if (!event->parent) {
+ event_recorder->parent = zmalloc(sizeof(struct lttng_ust_event_common));
+ if (!event_recorder->parent) {
ret = -ENOMEM;
goto parent_error;
}
- event->parent->struct_size = sizeof(struct lttng_event_common);
+ event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
+ event_recorder->parent->type = LTTNG_UST_EVENT_TYPE_RECORDER;
+ event_recorder->parent->child = event_recorder;
- event_priv = zmalloc(sizeof(struct lttng_ust_event_private));
- if (!event_priv) {
+ event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
+ if (!event_recorder_priv) {
ret = -ENOMEM;
goto priv_error;
}
- event->priv = event_priv;
- event_priv->pub = event;
- event->parent->priv = &event_priv->parent;
- event_priv->parent.pub = event->parent;
+ event_recorder->priv = event_recorder_priv;
+ event_recorder_priv->pub = event_recorder;
+ event_recorder->parent->priv = &event_recorder_priv->parent;
+ event_recorder_priv->parent.pub = event_recorder->parent;
- event->chan = chan;
+ event_recorder->chan = chan;
/* Event will be enabled by enabler sync. */
- event->parent->enabled = 0;
- event->parent->priv->registered = 0;
- CDS_INIT_LIST_HEAD(&event->parent->filter_bytecode_runtime_head);
- CDS_INIT_LIST_HEAD(&event->parent->priv->enablers_ref_head);
- event->parent->priv->desc = desc;
+ event_recorder->parent->run_filter = lttng_ust_interpret_event_filter;
+ event_recorder->parent->enabled = 0;
+ event_recorder->parent->priv->registered = 0;
+ CDS_INIT_LIST_HEAD(&event_recorder->parent->priv->filter_bytecode_runtime_head);
+ CDS_INIT_LIST_HEAD(&event_recorder->parent->priv->enablers_ref_head);
+ event_recorder->parent->priv->desc = desc;
if (desc->loglevel)
- loglevel = *(*event->parent->priv->desc->loglevel);
+ loglevel = *(*event_recorder->parent->priv->desc->loglevel);
else
loglevel = TRACE_DEFAULT;
- if (desc->u.ext.model_emf_uri)
- uri = *(desc->u.ext.model_emf_uri);
+ if (desc->model_emf_uri)
+ uri = *(desc->model_emf_uri);
else
uri = NULL;
+ lttng_ust_format_event_name(desc, name);
+
/* Fetch event ID from sessiond */
ret = ustcomm_register_event(notify_socket,
session,
session->priv->objd,
- chan->objd,
- desc->name,
+ chan->priv->parent.objd,
+ name,
loglevel,
desc->signature,
desc->nr_fields,
desc->fields,
uri,
- &event->id);
+ &event_recorder->priv->id);
if (ret < 0) {
DBG("Error (%d) registering event to sessiond", ret);
goto sessiond_register_error;
}
- cds_list_add(&event->priv->node, &chan->session->priv->events_head);
- cds_hlist_add_head(&event->priv->hlist, head);
+ cds_list_add(&event_recorder_priv->node, &chan->parent->session->priv->events_head);
+ cds_hlist_add_head(&event_recorder_priv->hlist, head);
return 0;
sessiond_register_error:
- free(event_priv);
+ free(event_recorder_priv);
priv_error:
- free(event->parent);
+ free(event_recorder->parent);
parent_error:
- free(event);
+ free(event_recorder);
cache_error:
create_enum_error:
socket_error:
}
static
-int lttng_event_notifier_create(const struct lttng_event_desc *desc,
+int lttng_event_notifier_create(const struct lttng_ust_event_desc *desc,
uint64_t token, uint64_t error_counter_index,
struct lttng_event_notifier_group *event_notifier_group)
{
- struct lttng_event_notifier *event_notifier;
+ struct lttng_ust_event_notifier *event_notifier;
+ struct lttng_ust_event_notifier_private *event_notifier_priv;
struct cds_hlist_head *head;
int ret = 0;
event_notifier_group->event_notifiers_ht.table,
LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc);
- event_notifier = zmalloc(sizeof(struct lttng_event_notifier));
+ event_notifier = zmalloc(sizeof(struct lttng_ust_event_notifier));
if (!event_notifier) {
ret = -ENOMEM;
goto error;
}
+ event_notifier->struct_size = sizeof(struct lttng_ust_event_notifier);
- event_notifier->group = event_notifier_group;
- event_notifier->user_token = token;
- event_notifier->error_counter_index = error_counter_index;
+ event_notifier->parent = zmalloc(sizeof(struct lttng_ust_event_common));
+ if (!event_notifier->parent) {
+ ret = -ENOMEM;
+ goto parent_error;
+ }
+ event_notifier->parent->struct_size = sizeof(struct lttng_ust_event_common);
+ event_notifier->parent->type = LTTNG_UST_EVENT_TYPE_NOTIFIER;
+ event_notifier->parent->child = event_notifier;
- /* Event notifier will be enabled by enabler sync. */
- event_notifier->enabled = 0;
- event_notifier->registered = 0;
+ event_notifier_priv = zmalloc(sizeof(struct lttng_ust_event_notifier_private));
+ if (!event_notifier_priv) {
+ ret = -ENOMEM;
+ goto priv_error;
+ }
+ event_notifier->priv = event_notifier_priv;
+ event_notifier_priv->pub = event_notifier;
+ event_notifier->parent->priv = &event_notifier_priv->parent;
+ event_notifier_priv->parent.pub = event_notifier->parent;
+
+ event_notifier_priv->group = event_notifier_group;
+ event_notifier_priv->parent.user_token = token;
+ event_notifier_priv->error_counter_index = error_counter_index;
- CDS_INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head);
- CDS_INIT_LIST_HEAD(&event_notifier->capture_bytecode_runtime_head);
- CDS_INIT_LIST_HEAD(&event_notifier->enablers_ref_head);
- event_notifier->desc = desc;
+ /* Event notifier will be enabled by enabler sync. */
+ event_notifier->parent->run_filter = lttng_ust_interpret_event_filter;
+ event_notifier->parent->enabled = 0;
+ event_notifier_priv->parent.registered = 0;
+
+ CDS_INIT_LIST_HEAD(&event_notifier->parent->priv->filter_bytecode_runtime_head);
+ CDS_INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head);
+ CDS_INIT_LIST_HEAD(&event_notifier_priv->parent.enablers_ref_head);
+ event_notifier_priv->parent.desc = desc;
event_notifier->notification_send = lttng_event_notifier_notification_send;
- cds_list_add(&event_notifier->node,
+ cds_list_add(&event_notifier_priv->node,
&event_notifier_group->event_notifiers_head);
- cds_hlist_add_head(&event_notifier->hlist, head);
+ cds_hlist_add_head(&event_notifier_priv->hlist, head);
return 0;
+priv_error:
+ free(event_notifier->parent);
+parent_error:
+ free(event_notifier);
error:
return ret;
}
static
-void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier)
-{
- struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
-
- /* Remove from event_notifier list. */
- cds_list_del(&event_notifier->node);
- /* Remove from event_notifier hash table. */
- cds_hlist_del(&event_notifier->hlist);
-
- lttng_free_event_notifier_filter_runtime(event_notifier);
-
- /* Free event_notifier enabler refs */
- cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
- &event_notifier->enablers_ref_head, node)
- free(enabler_ref);
- free(event_notifier);
-}
-
-static
-int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_star_glob_enabler(const struct lttng_ust_event_desc *desc,
struct lttng_enabler *enabler)
{
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
int loglevel = 0;
unsigned int has_loglevel = 0;
+ lttng_ust_format_event_name(desc, name);
assert(enabler->format_type == LTTNG_ENABLER_FORMAT_STAR_GLOB);
if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX,
- desc->name, SIZE_MAX))
+ name, SIZE_MAX))
return 0;
if (desc->loglevel) {
loglevel = *(*desc->loglevel);
}
static
-int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_event_enabler(const struct lttng_ust_event_desc *desc,
struct lttng_enabler *enabler)
{
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
int loglevel = 0;
unsigned int has_loglevel = 0;
+ lttng_ust_format_event_name(desc, name);
assert(enabler->format_type == LTTNG_ENABLER_FORMAT_EVENT);
- if (strcmp(desc->name, enabler->event_param.name))
+ if (strcmp(name, enabler->event_param.name))
return 0;
if (desc->loglevel) {
loglevel = *(*desc->loglevel);
}
static
-int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_enabler(const struct lttng_ust_event_desc *desc,
struct lttng_enabler *enabler)
{
switch (enabler->format_type) {
char *excluder_name;
excluder_name = (char *) (excluder->excluder.names)
- + count * LTTNG_UST_SYM_NAME_LEN;
- len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
- if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX))
- return 0;
+ + count * LTTNG_UST_ABI_SYM_NAME_LEN;
+ len = strnlen(excluder_name, LTTNG_UST_ABI_SYM_NAME_LEN);
+ if (len > 0) {
+ char name[LTTNG_UST_ABI_SYM_NAME_LEN];
+
+ lttng_ust_format_event_name(desc, name);
+ if (strutils_star_glob_match(excluder_name, len, name, SIZE_MAX)) {
+ return 0;
+ }
+ }
}
}
return 1;
static
int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
- struct lttng_event *event)
+ struct lttng_ust_event_recorder *event_recorder)
{
- if (lttng_desc_match_enabler(event->parent->priv->desc,
+ if (lttng_desc_match_enabler(event_recorder->parent->priv->desc,
lttng_event_enabler_as_enabler(event_enabler))
- && event->chan == event_enabler->chan)
+ && event_recorder->chan == event_enabler->chan)
return 1;
else
return 0;
static
int lttng_event_notifier_enabler_match_event_notifier(
struct lttng_event_notifier_enabler *event_notifier_enabler,
- struct lttng_event_notifier *event_notifier)
+ struct lttng_ust_event_notifier *event_notifier)
{
- int desc_matches = lttng_desc_match_enabler(event_notifier->desc,
+ int desc_matches = lttng_desc_match_enabler(event_notifier->priv->parent.desc,
lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
- if (desc_matches && event_notifier->group == event_notifier_enabler->group &&
- event_notifier->user_token == event_notifier_enabler->user_token)
+ if (desc_matches && event_notifier->priv->group == event_notifier_enabler->group &&
+ event_notifier->priv->parent.user_token == event_notifier_enabler->user_token)
return 1;
else
return 0;
* tracepoint probes.
*/
static
-void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_event_recorder_if_missing(struct lttng_event_enabler *event_enabler)
{
- struct lttng_session *session = event_enabler->chan->session;
- struct lttng_probe_desc *probe_desc;
- const struct lttng_event_desc *desc;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_session *session = event_enabler->chan->parent->session;
+ struct lttng_ust_registered_probe *reg_probe;
+ const struct lttng_ust_event_desc *desc;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
int i;
struct cds_list_head *probe_list;
* our enabler, create an associated lttng_event if not
* already present.
*/
- cds_list_for_each_entry(probe_desc, probe_list, head) {
+ cds_list_for_each_entry(reg_probe, probe_list, head) {
+ const struct lttng_ust_probe_desc *probe_desc = reg_probe->desc;
+
for (i = 0; i < probe_desc->nr_events; i++) {
int ret;
bool found = false;
session->priv->events_ht.table,
LTTNG_UST_EVENT_HT_SIZE, desc);
- cds_hlist_for_each_entry(event_priv, node, head, hlist) {
- if (event_priv->parent.desc == desc
- && event_priv->pub->chan == event_enabler->chan) {
+ cds_hlist_for_each_entry(event_recorder_priv, node, head, hlist) {
+ if (event_recorder_priv->parent.desc == desc
+ && event_recorder_priv->pub->chan == event_enabler->chan) {
found = true;
break;
}
* We need to create an event for this
* event probe.
*/
- ret = lttng_event_create(probe_desc->event_desc[i],
+ ret = lttng_event_recorder_create(probe_desc->event_desc[i],
event_enabler->chan);
if (ret) {
- DBG("Unable to create event %s, error %d\n",
- probe_desc->event_desc[i]->name, ret);
+ DBG("Unable to create event \"%s:%s\", error %d\n",
+ probe_desc->provider_name,
+ probe_desc->event_desc[i]->event_name, ret);
}
}
}
}
static
-void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
- void (*event_func)(struct lttng_session *session,
- struct lttng_event *event),
- void (*event_notifier_func)(struct lttng_event_notifier *event_notifier))
+void probe_provider_event_for_each(const struct lttng_ust_probe_desc *provider_desc,
+ void (*event_func)(struct lttng_ust_event_common *event))
{
struct cds_hlist_node *node, *tmp_node;
struct cds_list_head *sessionsp;
* sessions to queue the unregistration of the events.
*/
for (i = 0; i < provider_desc->nr_events; i++) {
- const struct lttng_event_desc *event_desc;
+ const struct lttng_ust_event_desc *event_desc;
struct lttng_event_notifier_group *event_notifier_group;
- struct lttng_event_notifier *event_notifier;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
+ struct lttng_ust_event_notifier_private *event_notifier_priv;
struct lttng_ust_session_private *session_priv;
struct cds_hlist_head *head;
- struct lttng_ust_event_private *event_priv;
event_desc = provider_desc->event_desc[i];
session_priv->events_ht.table,
LTTNG_UST_EVENT_HT_SIZE, event_desc);
- cds_hlist_for_each_entry_safe(event_priv, node, tmp_node, head, hlist) {
- if (event_desc == event_priv->parent.desc) {
- event_func(session_priv->pub, event_priv->pub);
+ cds_hlist_for_each_entry_safe(event_recorder_priv, node, tmp_node, head, hlist) {
+ if (event_desc == event_recorder_priv->parent.desc) {
+ event_func(event_recorder_priv->parent.pub);
break;
}
}
event_notifier_group->event_notifiers_ht.table,
LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, event_desc);
- cds_hlist_for_each_entry_safe(event_notifier, node, tmp_node, head, hlist) {
- if (event_desc == event_notifier->desc) {
- event_notifier_func(event_notifier);
+ cds_hlist_for_each_entry_safe(event_notifier_priv, node, tmp_node, head, hlist) {
+ if (event_desc == event_notifier_priv->parent.desc) {
+ event_func(event_notifier_priv->parent.pub);
break;
}
}
}
static
-void _unregister_event(struct lttng_session *session,
- struct lttng_event *event)
-{
- _lttng_event_unregister(event);
-}
-
-static
-void _event_enum_destroy(struct lttng_session *session,
- struct lttng_event *event)
+void _event_enum_destroy(struct lttng_ust_event_common *event)
{
- unsigned int i;
- /* Destroy enums of the current event. */
- for (i = 0; i < event->parent->priv->desc->nr_fields; i++) {
- const struct lttng_enum_desc *enum_desc;
- const struct lttng_event_field *field;
- struct lttng_enum *curr_enum;
-
- field = &(event->parent->priv->desc->fields[i]);
- switch (field->type.atype) {
- case atype_enum_nestable:
- enum_desc = field->type.u.enum_nestable.desc;
- break;
- default:
- continue;
- }
+ switch (event->type) {
+ case LTTNG_UST_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_ust_event_recorder *event_recorder = event->child;
+ struct lttng_ust_session *session = event_recorder->chan->parent->session;
+ unsigned int i;
+
+ /* Destroy enums of the current event. */
+ for (i = 0; i < event_recorder->parent->priv->desc->nr_fields; i++) {
+ const struct lttng_ust_enum_desc *enum_desc;
+ const struct lttng_ust_event_field *field;
+ struct lttng_enum *curr_enum;
+
+ field = event_recorder->parent->priv->desc->fields[i];
+ switch (field->type->type) {
+ case lttng_ust_type_enum:
+ enum_desc = lttng_ust_get_type_enum(field->type)->desc;
+ break;
+ default:
+ continue;
+ }
- curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc);
- if (curr_enum) {
- _lttng_enum_destroy(curr_enum);
+ curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc);
+ if (curr_enum) {
+ _lttng_enum_destroy(curr_enum);
+ }
}
+ break;
+ }
+ case LTTNG_UST_EVENT_TYPE_NOTIFIER:
+ break;
+ default:
+ abort();
}
-
/* Destroy event. */
_lttng_event_destroy(event);
}
* ust_lock held.
*/
void lttng_probe_provider_unregister_events(
- struct lttng_probe_desc *provider_desc)
+ const struct lttng_ust_probe_desc *provider_desc)
{
/*
* Iterate over all events in the probe provider descriptions and sessions
* to queue the unregistration of the events.
*/
- probe_provider_event_for_each(provider_desc, _unregister_event,
- _lttng_event_notifier_unregister);
+ probe_provider_event_for_each(provider_desc, _lttng_event_unregister);
/* Wait for grace period. */
lttng_ust_urcu_synchronize_rcu();
/* Prune the unregistration queue. */
- __tracepoint_probe_prune_release_queue();
+ lttng_ust_tp_probe_prune_release_queue();
/*
* It is now safe to destroy the events and remove them from the event list
* and hashtables.
*/
- probe_provider_event_for_each(provider_desc, _event_enum_destroy,
- _lttng_event_notifier_destroy);
+ probe_provider_event_for_each(provider_desc, _event_enum_destroy);
}
/*
* and add backward reference from the event to the enabler.
*/
static
-int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
+int lttng_event_enabler_ref_event_recorders(struct lttng_event_enabler *event_enabler)
{
- struct lttng_session *session = event_enabler->chan->session;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_session *session = event_enabler->chan->parent->session;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
if (!lttng_event_enabler_as_enabler(event_enabler)->enabled)
goto end;
/* First ensure that probe events are created for this enabler. */
- lttng_create_event_if_missing(event_enabler);
+ lttng_create_event_recorder_if_missing(event_enabler);
/* For each event matching enabler in session event list. */
- cds_list_for_each_entry(event_priv, &session->priv->events_head, node) {
+ cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_enabler_match_event(event_enabler, event_priv->pub))
+ if (!lttng_event_enabler_match_event(event_enabler, event_recorder_priv->pub))
continue;
- enabler_ref = lttng_enabler_ref(&event_priv->parent.enablers_ref_head,
+ enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head,
lttng_event_enabler_as_enabler(event_enabler));
if (!enabler_ref) {
/*
enabler_ref->ref = lttng_event_enabler_as_enabler(
event_enabler);
cds_list_add(&enabler_ref->node,
- &event_priv->parent.enablers_ref_head);
+ &event_recorder_priv->parent.enablers_ref_head);
}
/*
* Link filter bytecodes if not linked yet.
*/
- lttng_enabler_link_bytecode(event_priv->parent.desc,
+ lttng_enabler_link_bytecode(event_recorder_priv->parent.desc,
&session->priv->ctx,
- &event_priv->pub->parent->filter_bytecode_runtime_head,
+ &event_recorder_priv->parent.filter_bytecode_runtime_head,
<tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
/* TODO: merge event context. */
return;
}
-/*
- * Only used internally at session destruction.
- */
static
-void _lttng_event_destroy(struct lttng_event *event)
+void _lttng_event_destroy(struct lttng_ust_event_common *event)
{
struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
- /* Remove from event list. */
- cds_list_del(&event->priv->node);
- /* Remove from event hash table. */
- cds_hlist_del(&event->priv->hlist);
-
- lttng_destroy_context(event->ctx);
lttng_free_event_filter_runtime(event);
/* Free event enabler refs */
cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
- &event->parent->priv->enablers_ref_head, node)
+ &event->priv->enablers_ref_head, node)
free(enabler_ref);
- free(event->priv);
- free(event->parent);
- free(event);
+
+ switch (event->type) {
+ case LTTNG_UST_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_ust_event_recorder *event_recorder = event->child;
+
+ /* Remove from event list. */
+ cds_list_del(&event_recorder->priv->node);
+ /* Remove from event hash table. */
+ cds_hlist_del(&event_recorder->priv->hlist);
+
+ lttng_destroy_context(event_recorder->priv->ctx);
+ free(event_recorder->parent);
+ free(event_recorder->priv);
+ free(event_recorder);
+ break;
+ }
+ case LTTNG_UST_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_ust_event_notifier *event_notifier = event->child;
+
+ /* Remove from event list. */
+ cds_list_del(&event_notifier->priv->node);
+ /* Remove from event hash table. */
+ cds_hlist_del(&event_notifier->priv->hlist);
+
+ free(event_notifier->priv);
+ free(event_notifier->parent);
+ free(event_notifier);
+ break;
+ }
+ default:
+ abort();
+ }
}
static
free(_enum);
}
-void lttng_ust_events_exit(void)
+void lttng_ust_abi_events_exit(void)
{
struct lttng_ust_session_private *session_priv, *tmpsession_priv;
*/
struct lttng_event_enabler *lttng_event_enabler_create(
enum lttng_enabler_format_type format_type,
- struct lttng_ust_event *event_param,
- struct lttng_channel *chan)
+ struct lttng_ust_abi_event *event_param,
+ struct lttng_ust_channel_buffer *chan)
{
struct lttng_event_enabler *event_enabler;
event_enabler->chan = chan;
/* ctx left NULL */
event_enabler->base.enabled = 0;
- cds_list_add(&event_enabler->node, &event_enabler->chan->session->priv->enablers_head);
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ cds_list_add(&event_enabler->node, &event_enabler->chan->parent->session->priv->enablers_head);
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent->session);
return event_enabler;
}
struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
struct lttng_event_notifier_group *event_notifier_group,
enum lttng_enabler_format_type format_type,
- struct lttng_ust_event_notifier *event_notifier_param)
+ struct lttng_ust_abi_event_notifier *event_notifier_param)
{
struct lttng_event_notifier_enabler *event_notifier_enabler;
int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler)
{
lttng_event_enabler_as_enabler(event_enabler)->enabled = 1;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent->session);
return 0;
}
int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
{
lttng_event_enabler_as_enabler(event_enabler)->enabled = 0;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent->session);
return 0;
}
_lttng_enabler_attach_filter_bytecode(
lttng_event_enabler_as_enabler(event_enabler), bytecode);
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent->session);
return 0;
}
_lttng_enabler_attach_exclusion(
lttng_event_enabler_as_enabler(event_enabler), excluder);
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent->session);
return 0;
}
return 0;
}
-int lttng_attach_context(struct lttng_ust_context *context_param,
- union ust_args *uargs,
- struct lttng_ctx **ctx, struct lttng_session *session)
+int lttng_attach_context(struct lttng_ust_abi_context *context_param,
+ union lttng_ust_abi_args *uargs,
+ struct lttng_ust_ctx **ctx, struct lttng_ust_session *session)
{
/*
* We cannot attach a context after trace has been started for a
return -EPERM;
switch (context_param->ctx) {
- case LTTNG_UST_CONTEXT_PTHREAD_ID:
+ case LTTNG_UST_ABI_CONTEXT_PTHREAD_ID:
return lttng_add_pthread_id_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+ case LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER:
{
- struct lttng_ust_perf_counter_ctx *perf_ctx_param;
+ struct lttng_ust_abi_perf_counter_ctx *perf_ctx_param;
perf_ctx_param = &context_param->u.perf_counter;
return lttng_add_perf_counter_to_ctx(
perf_ctx_param->name,
ctx);
}
- case LTTNG_UST_CONTEXT_VTID:
+ case LTTNG_UST_ABI_CONTEXT_VTID:
return lttng_add_vtid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VPID:
+ case LTTNG_UST_ABI_CONTEXT_VPID:
return lttng_add_vpid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_PROCNAME:
+ case LTTNG_UST_ABI_CONTEXT_PROCNAME:
return lttng_add_procname_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_IP:
+ case LTTNG_UST_ABI_CONTEXT_IP:
return lttng_add_ip_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_CPU_ID:
+ case LTTNG_UST_ABI_CONTEXT_CPU_ID:
return lttng_add_cpu_id_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_APP_CONTEXT:
+ case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT:
return lttng_ust_add_app_context_to_ctx_rcu(uargs->app_context.ctxname,
ctx);
- case LTTNG_UST_CONTEXT_CGROUP_NS:
+ case LTTNG_UST_ABI_CONTEXT_CGROUP_NS:
return lttng_add_cgroup_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_IPC_NS:
+ case LTTNG_UST_ABI_CONTEXT_IPC_NS:
return lttng_add_ipc_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_MNT_NS:
+ case LTTNG_UST_ABI_CONTEXT_MNT_NS:
return lttng_add_mnt_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_NET_NS:
+ case LTTNG_UST_ABI_CONTEXT_NET_NS:
return lttng_add_net_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_PID_NS:
+ case LTTNG_UST_ABI_CONTEXT_PID_NS:
return lttng_add_pid_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_TIME_NS:
+ case LTTNG_UST_ABI_CONTEXT_TIME_NS:
return lttng_add_time_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_USER_NS:
+ case LTTNG_UST_ABI_CONTEXT_USER_NS:
return lttng_add_user_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_UTS_NS:
+ case LTTNG_UST_ABI_CONTEXT_UTS_NS:
return lttng_add_uts_ns_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VUID:
+ case LTTNG_UST_ABI_CONTEXT_VUID:
return lttng_add_vuid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VEUID:
+ case LTTNG_UST_ABI_CONTEXT_VEUID:
return lttng_add_veuid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VSUID:
+ case LTTNG_UST_ABI_CONTEXT_VSUID:
return lttng_add_vsuid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VGID:
+ case LTTNG_UST_ABI_CONTEXT_VGID:
return lttng_add_vgid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VEGID:
+ case LTTNG_UST_ABI_CONTEXT_VEGID:
return lttng_add_vegid_to_ctx(ctx);
- case LTTNG_UST_CONTEXT_VSGID:
+ case LTTNG_UST_ABI_CONTEXT_VSGID:
return lttng_add_vsgid_to_ctx(ctx);
default:
return -EINVAL;
}
}
-int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler,
- struct lttng_ust_context *context_param)
+int lttng_event_enabler_attach_context(
+ struct lttng_event_enabler *enabler __attribute__((unused)),
+ struct lttng_ust_abi_context *context_param __attribute__((unused)))
{
return -ENOSYS;
}
* session.
*/
static
-void lttng_session_sync_event_enablers(struct lttng_session *session)
+void lttng_session_sync_event_enablers(struct lttng_ust_session *session)
{
struct lttng_event_enabler *event_enabler;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
cds_list_for_each_entry(event_enabler, &session->priv->enablers_head, node)
- lttng_event_enabler_ref_events(event_enabler);
+ lttng_event_enabler_ref_event_recorders(event_enabler);
/*
* For each event, if at least one of its enablers is enabled,
* and its channel and session transient states are enabled, we
* enable the event, else we disable it.
*/
- cds_list_for_each_entry(event_priv, &session->priv->events_head, node) {
+ cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
struct lttng_enabler_ref *enabler_ref;
- struct lttng_bytecode_runtime *runtime;
- int enabled = 0, has_enablers_without_bytecode = 0;
+ struct lttng_ust_bytecode_runtime *runtime;
+ int enabled = 0, has_enablers_without_filter_bytecode = 0;
+ int nr_filters = 0;
/* Enable events */
cds_list_for_each_entry(enabler_ref,
- &event_priv->parent.enablers_ref_head, node) {
+ &event_recorder_priv->parent.enablers_ref_head, node) {
if (enabler_ref->ref->enabled) {
enabled = 1;
break;
* intesection of session and channel transient enable
* states.
*/
- enabled = enabled && session->priv->tstate && event_priv->pub->chan->tstate;
+ enabled = enabled && session->priv->tstate && event_recorder_priv->pub->chan->priv->parent.tstate;
- CMM_STORE_SHARED(event_priv->pub->parent->enabled, enabled);
+ CMM_STORE_SHARED(event_recorder_priv->pub->parent->enabled, enabled);
/*
* Sync tracepoint registration with event enabled
* state.
*/
if (enabled) {
- if (!event_priv->parent.registered)
- register_event(event_priv->pub);
+ if (!event_recorder_priv->parent.registered)
+ register_event(event_recorder_priv->parent.pub);
} else {
- if (event_priv->parent.registered)
- unregister_event(event_priv->pub);
+ if (event_recorder_priv->parent.registered)
+ unregister_event(event_recorder_priv->parent.pub);
}
/* Check if has enablers without bytecode enabled */
cds_list_for_each_entry(enabler_ref,
- &event_priv->parent.enablers_ref_head, node) {
+ &event_recorder_priv->parent.enablers_ref_head, node) {
if (enabler_ref->ref->enabled
&& cds_list_empty(&enabler_ref->ref->filter_bytecode_head)) {
- has_enablers_without_bytecode = 1;
+ has_enablers_without_filter_bytecode = 1;
break;
}
}
- event_priv->pub->parent->has_enablers_without_bytecode =
- has_enablers_without_bytecode;
+ event_recorder_priv->parent.has_enablers_without_filter_bytecode =
+ has_enablers_without_filter_bytecode;
/* Enable filters */
cds_list_for_each_entry(runtime,
- &event_priv->pub->parent->filter_bytecode_runtime_head, node) {
- lttng_bytecode_filter_sync_state(runtime);
+ &event_recorder_priv->parent.filter_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_filters++;
}
+ CMM_STORE_SHARED(event_recorder_priv->parent.pub->eval_filter,
+ !(has_enablers_without_filter_bytecode || !nr_filters));
}
- __tracepoint_probe_prune_release_queue();
+ lttng_ust_tp_probe_prune_release_queue();
}
/* Support for event notifier is introduced by probe provider major version 2. */
static
-bool lttng_ust_probe_supports_event_notifier(struct lttng_probe_desc *probe_desc)
+bool lttng_ust_probe_supports_event_notifier(const struct lttng_ust_probe_desc *probe_desc)
{
return probe_desc->major >= 2;
}
struct lttng_event_notifier_enabler *event_notifier_enabler)
{
struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
- struct lttng_probe_desc *probe_desc;
+ struct lttng_ust_registered_probe *reg_probe;
struct cds_list_head *probe_list;
int i;
probe_list = lttng_get_probe_list_head();
- cds_list_for_each_entry(probe_desc, probe_list, head) {
+ cds_list_for_each_entry(reg_probe, probe_list, head) {
+ const struct lttng_ust_probe_desc *probe_desc = reg_probe->desc;
+
for (i = 0; i < probe_desc->nr_events; i++) {
int ret;
bool found = false;
- const struct lttng_event_desc *desc;
- struct lttng_event_notifier *event_notifier;
+ const struct lttng_ust_event_desc *desc;
+ struct lttng_ust_event_notifier_private *event_notifier_priv;
struct cds_hlist_head *head;
struct cds_hlist_node *node;
event_notifier_group->event_notifiers_ht.table,
LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc);
- cds_hlist_for_each_entry(event_notifier, node, head, hlist) {
+ cds_hlist_for_each_entry(event_notifier_priv, node, head, hlist) {
/*
* Check if event_notifier already exists by checking
* if the event_notifier and enabler share the same
* description and id.
*/
- if (event_notifier->desc == desc &&
- event_notifier->user_token == event_notifier_enabler->user_token) {
+ if (event_notifier_priv->parent.desc == desc &&
+ event_notifier_priv->parent.user_token == event_notifier_enabler->user_token) {
found = true;
break;
}
/* Check that the probe supports event notifiers, else report the error. */
if (!lttng_ust_probe_supports_event_notifier(probe_desc)) {
- ERR("Probe \"%s\" contains event \"%s\" which matches an enabled event notifier, "
+ ERR("Probe \"%s\" contains event \"%s:%s\" which matches an enabled event notifier, "
"but its version (%u.%u) is too old and does not implement event notifiers. "
"It needs to be recompiled against a newer version of LTTng-UST, otherwise "
"this event will not generate any notification.",
- probe_desc->provider,
- desc->name,
+ probe_desc->provider_name,
+ probe_desc->provider_name, desc->event_name,
probe_desc->major,
probe_desc->minor);
continue;
event_notifier_enabler->error_counter_index,
event_notifier_group);
if (ret) {
- DBG("Unable to create event_notifier %s, error %d\n",
- probe_desc->event_desc[i]->name, ret);
+ DBG("Unable to create event_notifier \"%s:%s\", error %d\n",
+ probe_desc->provider_name,
+ probe_desc->event_desc[i]->event_name, ret);
}
}
}
struct lttng_event_notifier_enabler *event_notifier_enabler)
{
struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
- struct lttng_event_notifier *event_notifier;
+ struct lttng_ust_event_notifier_private *event_notifier_priv;
/*
* Only try to create event_notifiers for enablers that are enabled, the user
lttng_create_event_notifier_if_missing(event_notifier_enabler);
/* Link the created event_notifier with its associated enabler. */
- cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) {
+ cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier))
+ if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier_priv->pub))
continue;
- enabler_ref = lttng_enabler_ref(&event_notifier->enablers_ref_head,
+ enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head,
lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
if (!enabler_ref) {
/*
enabler_ref->ref = lttng_event_notifier_enabler_as_enabler(
event_notifier_enabler);
cds_list_add(&enabler_ref->node,
- &event_notifier->enablers_ref_head);
+ &event_notifier_priv->parent.enablers_ref_head);
}
/*
* Link filter bytecodes if not linked yet.
*/
- lttng_enabler_link_bytecode(event_notifier->desc,
+ lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
&event_notifier_group->ctx,
- &event_notifier->filter_bytecode_runtime_head,
+ &event_notifier_priv->parent.filter_bytecode_runtime_head,
<tng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head);
/*
* Link capture bytecodes if not linked yet.
*/
- lttng_enabler_link_bytecode(event_notifier->desc,
- &event_notifier_group->ctx, &event_notifier->capture_bytecode_runtime_head,
+ lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
+ &event_notifier_group->ctx, &event_notifier_priv->capture_bytecode_runtime_head,
&event_notifier_enabler->capture_bytecode_head);
- event_notifier->num_captures = event_notifier_enabler->num_captures;
+ event_notifier_priv->num_captures = event_notifier_enabler->num_captures;
}
end:
return 0;
void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group)
{
struct lttng_event_notifier_enabler *event_notifier_enabler;
- struct lttng_event_notifier *event_notifier;
+ struct lttng_ust_event_notifier_private *event_notifier_priv;
cds_list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node)
lttng_event_notifier_enabler_ref_event_notifiers(event_notifier_enabler);
* For each event_notifier, if at least one of its enablers is enabled,
* we enable the event_notifier, else we disable it.
*/
- cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) {
+ cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
struct lttng_enabler_ref *enabler_ref;
- struct lttng_bytecode_runtime *runtime;
- int enabled = 0, has_enablers_without_bytecode = 0;
+ struct lttng_ust_bytecode_runtime *runtime;
+ int enabled = 0, has_enablers_without_filter_bytecode = 0;
+ int nr_filters = 0, nr_captures = 0;
/* Enable event_notifiers */
cds_list_for_each_entry(enabler_ref,
- &event_notifier->enablers_ref_head, node) {
+ &event_notifier_priv->parent.enablers_ref_head, node) {
if (enabler_ref->ref->enabled) {
enabled = 1;
break;
}
}
- CMM_STORE_SHARED(event_notifier->enabled, enabled);
+ CMM_STORE_SHARED(event_notifier_priv->pub->parent->enabled, enabled);
/*
* Sync tracepoint registration with event_notifier enabled
* state.
*/
if (enabled) {
- if (!event_notifier->registered)
- register_event_notifier(event_notifier);
+ if (!event_notifier_priv->parent.registered)
+ register_event(event_notifier_priv->parent.pub);
} else {
- if (event_notifier->registered)
- unregister_event_notifier(event_notifier);
+ if (event_notifier_priv->parent.registered)
+ unregister_event(event_notifier_priv->parent.pub);
}
/* Check if has enablers without bytecode enabled */
cds_list_for_each_entry(enabler_ref,
- &event_notifier->enablers_ref_head, node) {
+ &event_notifier_priv->parent.enablers_ref_head, node) {
if (enabler_ref->ref->enabled
&& cds_list_empty(&enabler_ref->ref->filter_bytecode_head)) {
- has_enablers_without_bytecode = 1;
+ has_enablers_without_filter_bytecode = 1;
break;
}
}
- event_notifier->has_enablers_without_bytecode =
- has_enablers_without_bytecode;
+ event_notifier_priv->parent.has_enablers_without_filter_bytecode =
+ has_enablers_without_filter_bytecode;
/* Enable filters */
cds_list_for_each_entry(runtime,
- &event_notifier->filter_bytecode_runtime_head, node) {
- lttng_bytecode_filter_sync_state(runtime);
+ &event_notifier_priv->parent.filter_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_filters++;
}
+ CMM_STORE_SHARED(event_notifier_priv->parent.pub->eval_filter,
+ !(has_enablers_without_filter_bytecode || !nr_filters));
/* Enable captures. */
cds_list_for_each_entry(runtime,
- &event_notifier->capture_bytecode_runtime_head, node) {
- lttng_bytecode_capture_sync_state(runtime);
+ &event_notifier_priv->capture_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_captures++;
}
+ CMM_STORE_SHARED(event_notifier_priv->pub->eval_capture,
+ !!nr_captures);
}
- __tracepoint_probe_prune_release_queue();
+ lttng_ust_tp_probe_prune_release_queue();
}
/*
* "lazy" sync means we only sync if required.
*/
static
-void lttng_session_lazy_sync_event_enablers(struct lttng_session *session)
+void lttng_session_lazy_sync_event_enablers(struct lttng_ust_session *session)
{
/* We can skip if session is not active */
if (!session->active)
* context (either app context callbacks, or dummy callbacks).
*/
void lttng_ust_context_set_session_provider(const char *name,
- size_t (*get_size)(struct lttng_ctx_field *field, size_t offset),
- void (*record)(struct lttng_ctx_field *field,
- struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_channel *chan),
- void (*get_value)(struct lttng_ctx_field *field,
- struct lttng_ctx_value *value))
+ size_t (*get_size)(void *priv, size_t offset),
+ void (*record)(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ struct lttng_ust_channel_buffer *chan),
+ void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
+ void *priv)
{
struct lttng_ust_session_private *session_priv;
cds_list_for_each_entry(session_priv, &sessions, node) {
- struct lttng_channel *chan;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_channel_buffer_private *chan;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
int ret;
ret = lttng_ust_context_set_provider_rcu(&session_priv->ctx,
- name, get_size, record, get_value);
+ name, get_size, record, get_value, priv);
if (ret)
abort();
cds_list_for_each_entry(chan, &session_priv->chan_head, node) {
ret = lttng_ust_context_set_provider_rcu(&chan->ctx,
- name, get_size, record, get_value);
+ name, get_size, record, get_value, priv);
if (ret)
abort();
}
- cds_list_for_each_entry(event_priv, &session_priv->events_head, node) {
- ret = lttng_ust_context_set_provider_rcu(&event_priv->pub->ctx,
- name, get_size, record, get_value);
+ cds_list_for_each_entry(event_recorder_priv, &session_priv->events_head, node) {
+ ret = lttng_ust_context_set_provider_rcu(&event_recorder_priv->ctx,
+ name, get_size, record, get_value, priv);
if (ret)
abort();
}
* context (either app context callbacks, or dummy callbacks).
*/
void lttng_ust_context_set_event_notifier_group_provider(const char *name,
- size_t (*get_size)(struct lttng_ctx_field *field, size_t offset),
- void (*record)(struct lttng_ctx_field *field,
- struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_channel *chan),
- void (*get_value)(struct lttng_ctx_field *field,
- struct lttng_ctx_value *value))
+ size_t (*get_size)(void *priv, size_t offset),
+ void (*record)(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ struct lttng_ust_channel_buffer *chan),
+ void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
+ void *priv)
{
struct lttng_event_notifier_group *event_notifier_group;
ret = lttng_ust_context_set_provider_rcu(
&event_notifier_group->ctx,
- name, get_size, record, get_value);
+ name, get_size, record, get_value, priv);
if (ret)
abort();
}
}
+
+int lttng_ust_session_uuid_validate(struct lttng_ust_session *session,
+ unsigned char *uuid)
+{
+ if (!session)
+ return 0;
+ /* Compare UUID with session. */
+ if (session->priv->uuid_set) {
+ if (memcmp(session->priv->uuid, uuid, LTTNG_UST_UUID_LEN)) {
+ return -1;
+ }
+ } else {
+ memcpy(session->priv->uuid, uuid, LTTNG_UST_UUID_LEN);
+ session->priv->uuid_set = true;
+ }
+ return 0;
+
+}
projects / lttng-ust.git / blobdiff