X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=e92d057490a93bdaad274721c85a5a3084ffc63f;hb=b89c5899ef86060111a6814c13df2684dc352737;hp=cf6f4dad897cb86a413bb5bb6dbdb03ebfef8e61;hpb=7ee76145ae6a7efc03968571b9e4a22d46e92929;p=lttng-ust.git diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c index cf6f4dad..e92d0574 100644 --- a/liblttng-ust/lttng-events.c +++ b/liblttng-ust/lttng-events.c @@ -53,6 +53,8 @@ #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 @@ -70,21 +72,35 @@ struct cds_list_head *lttng_get_sessions(void) return &sessions; } -static void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder); -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. */ @@ -102,25 +118,25 @@ int lttng_session_active(void) 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; @@ -129,16 +145,16 @@ int lttng_loglevel_match(int loglevel, } } -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); @@ -232,128 +248,88 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void) * 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_recorder(struct lttng_ust_event_recorder *event_recorder) +void register_event(struct lttng_ust_event_common *event) { int ret; - const struct lttng_event_desc *desc; + struct lttng_ust_event_desc *desc; + char name[LTTNG_UST_ABI_SYM_NAME_LEN]; - assert(event_recorder->parent->priv->registered == 0); - desc = event_recorder->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_recorder, desc->signature); - WARN_ON_ONCE(ret); - if (!ret) - event_recorder->parent->priv->registered = 1; -} - -static -void register_event_notifier(struct lttng_event_notifier *event_notifier) -{ - int ret; - const struct lttng_event_desc *desc; - - 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); + event, desc->signature); WARN_ON_ONCE(ret); if (!ret) - event_notifier->registered = 1; + event->priv->registered = 1; } static -void unregister_event_recorder(struct lttng_ust_event_recorder *event_recorder) +void unregister_event(struct lttng_ust_event_common *event) { int ret; - const struct lttng_event_desc *desc; + struct lttng_ust_event_desc *desc; + char name[LTTNG_UST_ABI_SYM_NAME_LEN]; - assert(event_recorder->parent->priv->registered == 1); - desc = event_recorder->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_recorder); - WARN_ON_ONCE(ret); - if (!ret) - event_recorder->parent->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); + event); WARN_ON_ONCE(ret); if (!ret) - event_notifier->registered = 0; -} - -/* - * Only used internally at session destruction. - */ -static -void _lttng_event_recorder_unregister(struct lttng_ust_event_recorder *event_recorder) -{ - if (event_recorder->parent->priv->registered) - unregister_event_recorder(event_recorder); + event->priv->registered = 0; } -/* - * Only used internally at session destruction. - */ static -void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier) +void _lttng_event_unregister(struct lttng_ust_event_common *event) { - if (event_notifier->registered) - unregister_event_notifier(event_notifier); + if (event->priv->registered) + unregister_event(event); } -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_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_recorder_priv, &session->priv->events_head, node) { - _lttng_event_recorder_unregister(event_recorder_priv->pub); + _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_recorder_priv, tmpevent_recorder_priv, &session->priv->events_head, node) - _lttng_event_recorder_destroy(event_recorder_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); @@ -365,15 +341,15 @@ void lttng_event_notifier_group_destroy( { 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(); @@ -381,9 +357,9 @@ void lttng_event_notifier_group_destroy( &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); @@ -443,8 +419,8 @@ void lttng_enabler_destroy(struct lttng_enabler *enabler) } static -int lttng_enum_create(const struct lttng_enum_desc *desc, - struct lttng_session *session) +int lttng_enum_create(struct lttng_ust_enum_desc *desc, + struct lttng_ust_session *session) { const char *enum_name = desc->name; struct lttng_enum *_enum; @@ -501,16 +477,16 @@ exist: } static -int lttng_create_enum_check(const struct lttng_type *type, - struct lttng_session *session) +int lttng_create_enum_check(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; + 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); @@ -518,14 +494,14 @@ int lttng_create_enum_check(const struct lttng_type *type, } break; } - case atype_dynamic: + case lttng_ust_type_dynamic: { - const struct lttng_event_field *tag_field_generic; - const struct lttng_enum_desc *enum_desc; + struct lttng_ust_event_field *tag_field_generic; + 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); @@ -542,15 +518,15 @@ int lttng_create_enum_check(const struct lttng_type *type, static int lttng_create_all_event_enums(size_t nr_fields, - const struct lttng_event_field *event_fields, - struct lttng_session *session) + 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; + struct lttng_ust_type_common *type = event_fields[i]->type; ret = lttng_create_enum_check(type, session); if (ret) @@ -561,15 +537,15 @@ int lttng_create_all_event_enums(size_t nr_fields, 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; + struct lttng_ust_type_common *type = ctx_fields[i]->event_field->type; ret = lttng_create_enum_check(type, session); if (ret) @@ -582,17 +558,17 @@ int lttng_create_all_ctx_enums(size_t nr_fields, * 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) { @@ -615,8 +591,8 @@ int lttng_session_enable(struct lttng_session *session) * 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; @@ -637,7 +613,7 @@ int lttng_session_enable(struct lttng_session *session) ret = ustcomm_register_channel(notify_socket, session, session->priv->objd, - chan->objd, + chan->parent.objd, nr_fields, fields, &chan_id, @@ -664,7 +640,7 @@ end: return ret; } -int lttng_session_disable(struct lttng_session *session) +int lttng_session_disable(struct lttng_ust_session *session) { int ret = 0; @@ -682,36 +658,36 @@ end: 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; } @@ -720,16 +696,16 @@ static inline 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) + 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)]; } @@ -737,18 +713,19 @@ struct cds_hlist_head *borrow_hash_table_bucket( * Supports event creation while tracing session is active. */ static -int lttng_event_recorder_create(const struct lttng_event_desc *desc, - struct lttng_channel *chan) +int lttng_event_recorder_create(struct lttng_ust_event_desc *desc, + struct lttng_ust_channel_buffer *chan) { + 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_session *session = chan->session; + 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); @@ -780,6 +757,8 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc, goto parent_error; } 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_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private)); if (!event_recorder_priv) { @@ -794,9 +773,10 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc, event_recorder->chan = chan; /* Event will be enabled by enabler sync. */ + 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->filter_bytecode_runtime_head); + 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; @@ -804,30 +784,32 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc, 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_recorder->id); + &event_recorder->priv->id); if (ret < 0) { DBG("Error (%d) registering event to sessiond", ret); goto sessiond_register_error; } - cds_list_add(&event_recorder->priv->node, &chan->session->priv->events_head); - cds_hlist_add_head(&event_recorder->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: @@ -843,11 +825,12 @@ socket_error: } static -int lttng_event_notifier_create(const struct lttng_event_desc *desc, +int lttng_event_notifier_create(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; @@ -859,65 +842,73 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc, 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; - 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_priv->group = event_notifier_group; + event_notifier_priv->parent.user_token = token; + event_notifier_priv->error_counter_index = error_counter_index; + + /* 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(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); @@ -932,14 +923,16 @@ int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc, } static -int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc, +int lttng_desc_match_event_enabler(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); @@ -954,7 +947,7 @@ int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc, } static -int lttng_desc_match_enabler(const struct lttng_event_desc *desc, +int lttng_desc_match_enabler(struct lttng_ust_event_desc *desc, struct lttng_enabler *enabler) { switch (enabler->format_type) { @@ -978,10 +971,16 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc, 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; @@ -1008,13 +1007,13 @@ int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler, 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; @@ -1039,11 +1038,11 @@ struct lttng_enabler_ref *lttng_enabler_ref( * 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_session *session = event_enabler->chan->parent->session; + struct lttng_ust_probe_desc *probe_desc; + struct lttng_ust_event_desc *desc; struct lttng_ust_event_recorder_private *event_recorder_priv; int i; struct cds_list_head *probe_list; @@ -1087,18 +1086,17 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) 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_ust_event_recorder *event_recorder), - void (*event_notifier_func)(struct lttng_event_notifier *event_notifier)) +void probe_provider_event_for_each(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; @@ -1112,12 +1110,12 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc, * sessions to queue the unregistration of the events. */ for (i = 0; i < provider_desc->nr_events; i++) { - const struct lttng_event_desc *event_desc; + 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_recorder_private *event_recorder_priv; event_desc = provider_desc->event_desc[i]; @@ -1136,7 +1134,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc, cds_hlist_for_each_entry_safe(event_recorder_priv, node, tmp_node, head, hlist) { if (event_desc == event_recorder_priv->parent.desc) { - event_func(session_priv->pub, event_recorder_priv->pub); + event_func(event_recorder_priv->parent.pub); break; } } @@ -1156,9 +1154,9 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc, 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; } } @@ -1167,41 +1165,45 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc, } static -void _unregister_event_recorder(struct lttng_session *session, - struct lttng_ust_event_recorder *event_recorder) -{ - _lttng_event_recorder_unregister(event_recorder); -} - -static -void _event_enum_destroy(struct lttng_session *session, - struct lttng_ust_event_recorder *event_recorder) +void _event_enum_destroy(struct lttng_ust_event_common *event) { - unsigned int i; - /* Destroy enums of the current event. */ - for (i = 0; i < event_recorder->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_recorder->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++) { + struct lttng_ust_enum_desc *enum_desc; + 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_recorder_destroy(event_recorder); + _lttng_event_destroy(event); } /* @@ -1210,26 +1212,24 @@ void _event_enum_destroy(struct lttng_session *session, * ust_lock held. */ void lttng_probe_provider_unregister_events( - struct lttng_probe_desc *provider_desc) + 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_recorder, - _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); } /* @@ -1237,16 +1237,16 @@ void lttng_probe_provider_unregister_events( * 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_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_recorder_priv, &session->priv->events_head, node) { @@ -1276,7 +1276,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) */ lttng_enabler_link_bytecode(event_recorder_priv->parent.desc, &session->priv->ctx, - &event_recorder_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. */ @@ -1338,28 +1338,50 @@ end: return; } -/* - * Only used internally at session destruction. - */ static -void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder) +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_recorder->priv->node); - /* Remove from event hash table. */ - cds_hlist_del(&event_recorder->priv->hlist); - - lttng_destroy_context(event_recorder->ctx); - lttng_free_event_recorder_filter_runtime(event_recorder); + lttng_free_event_filter_runtime(event); /* Free event enabler refs */ cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref, - &event_recorder->parent->priv->enablers_ref_head, node) + &event->priv->enablers_ref_head, node) free(enabler_ref); - free(event_recorder->priv); - free(event_recorder->parent); - free(event_recorder); + + 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 @@ -1370,7 +1392,7 @@ void _lttng_enum_destroy(struct lttng_enum *_enum) free(_enum); } -void lttng_ust_events_exit(void) +void lttng_ust_abi_events_exit(void) { struct lttng_ust_session_private *session_priv, *tmpsession_priv; @@ -1383,8 +1405,8 @@ void lttng_ust_events_exit(void) */ 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; @@ -1399,8 +1421,8 @@ struct lttng_event_enabler *lttng_event_enabler_create( 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; } @@ -1408,7 +1430,7 @@ struct lttng_event_enabler *lttng_event_enabler_create( 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; @@ -1448,7 +1470,7 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( 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; } @@ -1456,7 +1478,7 @@ int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler) 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; } @@ -1477,7 +1499,7 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event _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; } @@ -1497,7 +1519,7 @@ int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *event_enabl _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; } @@ -1559,9 +1581,9 @@ int lttng_event_notifier_enabler_attach_exclusion( 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 @@ -1572,11 +1594,11 @@ int lttng_attach_context(struct lttng_ust_context *context_param, 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( @@ -1585,46 +1607,46 @@ int lttng_attach_context(struct lttng_ust_context *context_param, 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; @@ -1632,7 +1654,7 @@ int lttng_attach_context(struct lttng_ust_context *context_param, } int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler, - struct lttng_ust_context *context_param) + struct lttng_ust_abi_context *context_param) { return -ENOSYS; } @@ -1655,13 +1677,13 @@ void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler) * 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_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 @@ -1669,8 +1691,9 @@ void lttng_session_sync_event_enablers(struct lttng_session *session) */ 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, @@ -1685,7 +1708,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session) * intesection of session and channel transient enable * states. */ - enabled = enabled && session->priv->tstate && event_recorder_priv->pub->chan->tstate; + enabled = enabled && session->priv->tstate && event_recorder_priv->pub->chan->priv->parent.tstate; CMM_STORE_SHARED(event_recorder_priv->pub->parent->enabled, enabled); /* @@ -1694,10 +1717,10 @@ void lttng_session_sync_event_enablers(struct lttng_session *session) */ if (enabled) { if (!event_recorder_priv->parent.registered) - register_event_recorder(event_recorder_priv->pub); + register_event(event_recorder_priv->parent.pub); } else { if (event_recorder_priv->parent.registered) - unregister_event_recorder(event_recorder_priv->pub); + unregister_event(event_recorder_priv->parent.pub); } /* Check if has enablers without bytecode enabled */ @@ -1705,25 +1728,28 @@ void lttng_session_sync_event_enablers(struct lttng_session *session) &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_recorder_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_recorder_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(struct lttng_ust_probe_desc *probe_desc) { return probe_desc->major >= 2; } @@ -1733,7 +1759,7 @@ void lttng_create_event_notifier_if_missing( 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_probe_desc *probe_desc; struct cds_list_head *probe_list; int i; @@ -1743,8 +1769,8 @@ void lttng_create_event_notifier_if_missing( 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; + 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; @@ -1763,14 +1789,14 @@ void lttng_create_event_notifier_if_missing( 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; } @@ -1781,12 +1807,12 @@ void lttng_create_event_notifier_if_missing( /* 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; @@ -1799,8 +1825,9 @@ void lttng_create_event_notifier_if_missing( 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); } } } @@ -1814,7 +1841,7 @@ int lttng_event_notifier_enabler_ref_event_notifiers( 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 @@ -1828,13 +1855,13 @@ int lttng_event_notifier_enabler_ref_event_notifiers( 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) { /* @@ -1848,25 +1875,25 @@ int lttng_event_notifier_enabler_ref_event_notifiers( 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; @@ -1876,7 +1903,7 @@ static 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); @@ -1885,58 +1912,65 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group * 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(); } /* @@ -1946,7 +1980,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group * "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) @@ -1962,17 +1996,17 @@ void lttng_session_lazy_sync_event_enablers(struct lttng_session *session) * 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, + size_t (*get_size)(struct lttng_ust_ctx_field *field, size_t offset), + void (*record)(struct lttng_ust_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)) + struct lttng_ust_channel_buffer *chan), + void (*get_value)(struct lttng_ust_ctx_field *field, + struct lttng_ust_ctx_value *value)) { struct lttng_ust_session_private *session_priv; cds_list_for_each_entry(session_priv, &sessions, node) { - struct lttng_channel *chan; + struct lttng_ust_channel_buffer_private *chan; struct lttng_ust_event_recorder_private *event_recorder_priv; int ret; @@ -1987,7 +2021,7 @@ void lttng_ust_context_set_session_provider(const char *name, abort(); } cds_list_for_each_entry(event_recorder_priv, &session_priv->events_head, node) { - ret = lttng_ust_context_set_provider_rcu(&event_recorder_priv->pub->ctx, + ret = lttng_ust_context_set_provider_rcu(&event_recorder_priv->ctx, name, get_size, record, get_value); if (ret) abort(); @@ -2003,12 +2037,12 @@ void lttng_ust_context_set_session_provider(const char *name, * 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, + size_t (*get_size)(struct lttng_ust_ctx_field *field, size_t offset), + void (*record)(struct lttng_ust_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)) + struct lttng_ust_channel_buffer *chan), + void (*get_value)(struct lttng_ust_ctx_field *field, + struct lttng_ust_ctx_value *value)) { struct lttng_event_notifier_group *event_notifier_group; @@ -2022,3 +2056,21 @@ void lttng_ust_context_set_event_notifier_group_provider(const char *name, 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; + +}