return &sessions;
}
-static void _lttng_event_destroy(struct lttng_event *event);
+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);
+ struct lttng_ust_event_notifier *event_notifier);
static void _lttng_enum_destroy(struct lttng_enum *_enum);
static
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;
}
static
-void register_event(struct lttng_event *event)
+void register_event_recorder(struct lttng_ust_event_recorder *event_recorder)
{
int ret;
const struct lttng_event_desc *desc;
- assert(event->parent->priv->registered == 0);
- desc = event->parent->priv->desc;
+ assert(event_recorder->parent->priv->registered == 0);
+ desc = event_recorder->parent->priv->desc;
ret = __tracepoint_probe_register_queue_release(desc->name,
desc->probe_callback,
- event, desc->signature);
+ event_recorder, desc->signature);
WARN_ON_ONCE(ret);
if (!ret)
- event->parent->priv->registered = 1;
+ event_recorder->parent->priv->registered = 1;
}
static
-void register_event_notifier(struct lttng_event_notifier *event_notifier)
+void register_event_notifier(struct lttng_ust_event_notifier *event_notifier)
{
int ret;
const struct lttng_event_desc *desc;
- assert(event_notifier->registered == 0);
- desc = event_notifier->desc;
+ assert(event_notifier->parent->priv->registered == 0);
+ desc = event_notifier->parent->priv->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;
+ event_notifier->parent->priv->registered = 1;
}
static
-void unregister_event(struct lttng_event *event)
+void unregister_event_recorder(struct lttng_ust_event_recorder *event_recorder)
{
int ret;
const struct lttng_event_desc *desc;
- assert(event->parent->priv->registered == 1);
- desc = event->parent->priv->desc;
+ assert(event_recorder->parent->priv->registered == 1);
+ desc = event_recorder->parent->priv->desc;
ret = __tracepoint_probe_unregister_queue_release(desc->name,
desc->probe_callback,
- event);
+ event_recorder);
WARN_ON_ONCE(ret);
if (!ret)
- event->parent->priv->registered = 0;
+ event_recorder->parent->priv->registered = 0;
}
static
-void unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+void unregister_event_notifier(struct lttng_ust_event_notifier *event_notifier)
{
int ret;
const struct lttng_event_desc *desc;
- assert(event_notifier->registered == 1);
- desc = event_notifier->desc;
+ assert(event_notifier->parent->priv->registered == 1);
+ desc = event_notifier->parent->priv->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;
+ event_notifier->parent->priv->registered = 0;
}
/*
* Only used internally at session destruction.
*/
static
-void _lttng_event_unregister(struct lttng_event *event)
+void _lttng_event_recorder_unregister(struct lttng_ust_event_recorder *event_recorder)
{
- if (event->parent->priv->registered)
- unregister_event(event);
+ if (event_recorder->parent->priv->registered)
+ unregister_event_recorder(event_recorder);
}
/*
* Only used internally at session destruction.
*/
static
-void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier)
+void _lttng_event_notifier_unregister(struct lttng_ust_event_notifier *event_notifier)
{
- if (event_notifier->registered)
+ if (event_notifier->parent->priv->registered)
unregister_event_notifier(event_notifier);
}
void lttng_session_destroy(struct lttng_session *session)
{
struct lttng_channel *chan, *tmpchan;
- struct lttng_ust_event_private *event_priv, *tmpevent_priv;
+ 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_recorder_unregister(event_recorder_priv->pub);
}
lttng_ust_urcu_synchronize_rcu(); /* Wait for in-flight events to complete */
__tracepoint_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_recorder_destroy(event_recorder_priv->pub);
cds_list_for_each_entry_safe(_enum, tmp_enum,
&session->priv->enums_head, node)
_lttng_enum_destroy(_enum);
{
int close_ret;
struct lttng_event_notifier_enabler *notifier_enabler, *tmpnotifier_enabler;
- struct lttng_event_notifier *notifier, *tmpnotifier;
+ struct lttng_ust_event_notifier_private *notifier_priv, *tmpnotifier_priv;
if (!event_notifier_group) {
return;
}
- cds_list_for_each_entry(notifier,
+ cds_list_for_each_entry(notifier_priv,
&event_notifier_group->event_notifiers_head, node)
- _lttng_event_notifier_unregister(notifier);
+ _lttng_event_notifier_unregister(notifier_priv->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(notifier_priv, tmpnotifier_priv,
&event_notifier_group->event_notifiers_head, node)
- _lttng_event_notifier_destroy(notifier);
+ _lttng_event_notifier_destroy(notifier_priv->pub);
if (event_notifier_group->error_counter)
lttng_ust_counter_destroy(event_notifier_group->error_counter);
* Supports event creation while tracing session is active.
*/
static
-int lttng_event_create(const struct lttng_event_desc *desc,
+int lttng_event_recorder_create(const struct lttng_event_desc *desc,
struct lttng_channel *chan)
{
- struct lttng_event *event;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_event_recorder *event_recorder;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
struct lttng_session *session = chan->session;
struct cds_hlist_head *head;
int ret = 0;
/*
* 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_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->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->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)
desc->nr_fields,
desc->fields,
uri,
- &event->id);
+ &event_recorder->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->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:
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_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;
/* Event notifier will be enabled by enabler sync. */
- event_notifier->enabled = 0;
- event_notifier->registered = 0;
+ event_notifier->parent->enabled = 0;
+ event_notifier_priv->parent.registered = 0;
- CDS_INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head);
+ CDS_INIT_LIST_HEAD(&event_notifier->parent->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;
+ 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)
+void _lttng_event_notifier_destroy(struct lttng_ust_event_notifier *event_notifier)
{
struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
/* Remove from event_notifier list. */
- cds_list_del(&event_notifier->node);
+ cds_list_del(&event_notifier->priv->node);
/* Remove from event_notifier hash table. */
- cds_hlist_del(&event_notifier->hlist);
+ cds_hlist_del(&event_notifier->priv->hlist);
- lttng_free_event_notifier_filter_runtime(event_notifier);
+ lttng_free_event_filter_runtime(event_notifier->parent);
/* Free event_notifier enabler refs */
cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
- &event_notifier->enablers_ref_head, node)
+ &event_notifier->priv->parent.enablers_ref_head, node)
free(enabler_ref);
+ free(event_notifier->priv);
+ free(event_notifier->parent);
free(event_notifier);
}
char *excluder_name;
excluder_name = (char *) (excluder->excluder.names)
- + count * LTTNG_UST_SYM_NAME_LEN;
- len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
+ + count * LTTNG_UST_ABI_SYM_NAME_LEN;
+ len = strnlen(excluder_name, LTTNG_UST_ABI_SYM_NAME_LEN);
if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX))
return 0;
}
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;
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_event_recorder_private *event_recorder_priv;
int i;
struct cds_list_head *probe_list;
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",
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))
+ struct lttng_ust_event_recorder *event_recorder),
+ void (*event_notifier_func)(struct lttng_ust_event_notifier *event_notifier))
{
struct cds_hlist_node *node, *tmp_node;
struct cds_list_head *sessionsp;
for (i = 0; i < provider_desc->nr_events; i++) {
const struct lttng_event_desc *event_desc;
struct lttng_event_notifier_group *event_notifier_group;
- struct lttng_event_notifier *event_notifier;
+ 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;
+ struct lttng_ust_event_recorder_private *event_recorder_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(session_priv->pub, event_recorder_priv->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_notifier_func(event_notifier_priv->pub);
break;
}
}
}
static
-void _unregister_event(struct lttng_session *session,
- struct lttng_event *event)
+void _unregister_event_recorder(struct lttng_session *session,
+ struct lttng_ust_event_recorder *event_recorder)
{
- _lttng_event_unregister(event);
+ _lttng_event_recorder_unregister(event_recorder);
}
static
void _event_enum_destroy(struct lttng_session *session,
- struct lttng_event *event)
+ struct lttng_ust_event_recorder *event_recorder)
{
unsigned int i;
/* Destroy enums of the current event. */
- for (i = 0; i < event->parent->priv->desc->nr_fields; i++) {
+ 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->parent->priv->desc->fields[i]);
+ field = &(event_recorder->parent->priv->desc->fields[i]);
switch (field->type.atype) {
case atype_enum_nestable:
enum_desc = field->type.u.enum_nestable.desc;
}
/* Destroy event. */
- _lttng_event_destroy(event);
+ _lttng_event_recorder_destroy(event_recorder);
}
/*
* 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,
+ probe_provider_event_for_each(provider_desc, _unregister_event_recorder,
_lttng_event_notifier_unregister);
/* Wait for grace period. */
int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
{
struct lttng_session *session = event_enabler->chan->session;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
if (!lttng_event_enabler_as_enabler(event_enabler)->enabled)
goto end;
lttng_create_event_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->pub->parent->filter_bytecode_runtime_head,
<tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
/* TODO: merge event context. */
* Only used internally at session destruction.
*/
static
-void _lttng_event_destroy(struct lttng_event *event)
+void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder)
{
struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
/* Remove from event list. */
- cds_list_del(&event->priv->node);
+ cds_list_del(&event_recorder->priv->node);
/* Remove from event hash table. */
- cds_hlist_del(&event->priv->hlist);
+ cds_hlist_del(&event_recorder->priv->hlist);
- lttng_destroy_context(event->ctx);
- lttng_free_event_filter_runtime(event);
+ lttng_destroy_context(event_recorder->ctx);
+ lttng_free_event_filter_runtime(event_recorder->parent);
/* Free event enabler refs */
cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
- &event->parent->priv->enablers_ref_head, node)
+ &event_recorder->parent->priv->enablers_ref_head, node)
free(enabler_ref);
- free(event->priv);
- free(event->parent);
- free(event);
+ free(event_recorder->priv);
+ free(event_recorder->parent);
+ free(event_recorder);
}
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_ust_abi_event *event_param,
struct lttng_channel *chan)
{
struct lttng_event_enabler *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;
return 0;
}
-int lttng_attach_context(struct lttng_ust_context *context_param,
- union ust_args *uargs,
+int lttng_attach_context(struct lttng_ust_abi_context *context_param,
+ union lttng_ust_abi_args *uargs,
struct lttng_ctx **ctx, struct lttng_session *session)
{
/*
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)
+ struct lttng_ust_abi_context *context_param)
{
return -ENOSYS;
}
void lttng_session_sync_event_enablers(struct lttng_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);
* 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;
/* 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->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_recorder(event_recorder_priv->pub);
} else {
- if (event_priv->parent.registered)
- unregister_event(event_priv->pub);
+ if (event_recorder_priv->parent.registered)
+ unregister_event_recorder(event_recorder_priv->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;
break;
}
}
- event_priv->pub->parent->has_enablers_without_bytecode =
+ event_recorder_priv->pub->parent->has_enablers_without_bytecode =
has_enablers_without_bytecode;
/* Enable filters */
cds_list_for_each_entry(runtime,
- &event_priv->pub->parent->filter_bytecode_runtime_head, node) {
+ &event_recorder_priv->pub->parent->filter_bytecode_runtime_head, node) {
lttng_bytecode_filter_sync_state(runtime);
}
}
int ret;
bool found = false;
const struct lttng_event_desc *desc;
- struct lttng_event_notifier *event_notifier;
+ 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;
}
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->pub->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->pub->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;
/* 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_notifier(event_notifier_priv->pub);
} else {
- if (event_notifier->registered)
- unregister_event_notifier(event_notifier);
+ if (event_notifier_priv->parent.registered)
+ unregister_event_notifier(event_notifier_priv->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;
break;
}
}
- event_notifier->has_enablers_without_bytecode =
+ event_notifier_priv->pub->parent->has_enablers_without_bytecode =
has_enablers_without_bytecode;
/* Enable filters */
cds_list_for_each_entry(runtime,
- &event_notifier->filter_bytecode_runtime_head, node) {
+ &event_notifier_priv->pub->parent->filter_bytecode_runtime_head, node) {
lttng_bytecode_filter_sync_state(runtime);
}
/* Enable captures. */
cds_list_for_each_entry(runtime,
- &event_notifier->capture_bytecode_runtime_head, node) {
+ &event_notifier_priv->pub->capture_bytecode_runtime_head, node) {
lttng_bytecode_capture_sync_state(runtime);
}
}
cds_list_for_each_entry(session_priv, &sessions, node) {
struct lttng_channel *chan;
- struct lttng_ust_event_private *event_priv;
+ struct lttng_ust_event_recorder_private *event_recorder_priv;
int ret;
ret = lttng_ust_context_set_provider_rcu(&session_priv->ctx,
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,
+ 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,
name, get_size, record, get_value);
if (ret)
abort();
projects / lttng-ust.git / blobdiff