* Supports event creation while tracing session is active.
* Needs to be called with sessions mutex held.
*/
+static
struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler,
const struct lttng_kernel_event_desc *event_desc)
{
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
- struct lttng_kernel_session *session = chan->parent.session;
struct lttng_kernel_event_recorder *event_recorder;
struct lttng_kernel_event_recorder_private *event_recorder_priv;
+ struct lttng_kernel_event_common_private *event_priv;
const char *event_name;
struct hlist_head *head;
int ret;
goto type_error;
}
- head = utils_borrow_hash_table_bucket(session->priv->events_ht.table,
- LTTNG_EVENT_HT_SIZE, event_name);
- lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) {
- WARN_ON_ONCE(!event_recorder_priv->parent.desc);
- if (!strncmp(event_recorder_priv->parent.desc->event_name, event_name,
+ head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+ event_recorder_priv = container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+
+ WARN_ON_ONCE(!event_priv->desc);
+ if (!strncmp(event_priv->desc->event_name, event_name,
LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1)
&& chan == event_recorder_priv->pub->chan) {
ret = -EEXIST;
if (ret) {
goto statedump_error;
}
- hlist_add_head(&event_recorder->priv->hlist, head);
+ hlist_add_head(&event_recorder->priv->parent.hlist_node, head);
list_add(&event_recorder->priv->node, &chan->parent.session->priv->events);
return event_recorder;
return ERR_PTR(ret);
}
-struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler,
+static
+struct lttng_kernel_event_notifier *_lttng_kernel_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler,
const struct lttng_kernel_event_desc *event_desc)
{
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
struct lttng_event_notifier_group *event_notifier_group = event_enabler->group;
struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
uint64_t token = event_enabler->parent.user_token;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
struct lttng_kernel_event_notifier *event_notifier;
struct lttng_kernel_event_notifier_private *event_notifier_priv;
+ struct lttng_kernel_event_common_private *event_priv;
struct lttng_counter *error_counter;
const char *event_name;
struct hlist_head *head;
goto type_error;
}
- head = utils_borrow_hash_table_bucket(event_notifier_group->events_ht.table,
- LTTNG_EVENT_HT_SIZE, event_name);
- lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
- WARN_ON_ONCE(!event_notifier_priv->parent.desc);
- if (!strncmp(event_notifier_priv->parent.desc->event_name, event_name,
+ head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+ event_notifier_priv = container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+
+ WARN_ON_ONCE(!event_priv->desc);
+ if (!strncmp(event_priv->desc->event_name, event_name,
LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1)
&& event_notifier_group == event_notifier_priv->group
- && token == event_notifier_priv->parent.user_token) {
+ && token == event_priv->user_token) {
ret = -EEXIST;
goto exist;
}
}
list_add(&event_notifier->priv->node, &event_notifier_group->event_notifiers_head);
- hlist_add_head(&event_notifier->priv->hlist, head);
+ hlist_add_head(&event_notifier->priv->parent.hlist_node, head);
/*
* Clear the error counter bucket. The sessiond keeps track of which
return ERR_PTR(ret);
}
+struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
+ const struct lttng_kernel_event_desc *event_desc)
+{
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+ struct lttng_kernel_event_recorder *event_recorder;
+
+ event_recorder = _lttng_kernel_event_recorder_create(event_recorder_enabler, event_desc);
+ if (!event_recorder)
+ return NULL;
+ return &event_recorder->parent;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+ struct lttng_kernel_event_notifier *event_notifier;
+
+ event_notifier = _lttng_kernel_event_notifier_create(event_notifier_enabler, event_desc);
+ if (!event_notifier)
+ return NULL;
+ return &event_notifier->parent;
+ }
+ default:
+ return NULL;
+ }
+}
+
+struct lttng_kernel_event_common *lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
+ const struct lttng_kernel_event_desc *event_desc)
+{
+ struct lttng_kernel_event_common *event;
+
+ mutex_lock(&sessions_mutex);
+ event = _lttng_kernel_event_create(event_enabler, event_desc);
+ mutex_unlock(&sessions_mutex);
+ return event;
+}
+
+
+
int lttng_kernel_counter_read(struct lttng_counter *counter,
const size_t *dim_indexes, int32_t cpu,
int64_t *val, bool *overflow, bool *underflow)
return counter->ops->counter_clear(counter->counter, dim_indexes);
}
-struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler,
- const struct lttng_kernel_event_desc *event_desc)
-{
- struct lttng_kernel_event_recorder *event;
-
- mutex_lock(&sessions_mutex);
- event = _lttng_kernel_event_recorder_create(event_enabler, event_desc);
- mutex_unlock(&sessions_mutex);
- return event;
-}
-
-struct lttng_kernel_event_notifier *lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler,
- const struct lttng_kernel_event_desc *event_desc)
-{
- struct lttng_kernel_event_notifier *event_notifier;
-
- mutex_lock(&sessions_mutex);
- event_notifier = _lttng_event_notifier_create(event_enabler, event_desc);
- mutex_unlock(&sessions_mutex);
- return event_notifier;
-}
-
/* Only used for tracepoints for now. */
static
void register_event(struct lttng_kernel_event_common *event)
return 1;
}
-int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+static
+int lttng_desc_match_enabler_check(const struct lttng_kernel_event_desc *desc,
struct lttng_event_enabler_common *enabler)
{
const char *desc_name, *enabler_name;
}
}
-static
-int lttng_event_enabler_match_event(struct lttng_event_recorder_enabler *event_enabler,
- struct lttng_kernel_event_recorder *event_recorder)
+bool lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+ struct lttng_event_enabler_common *enabler)
{
- struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler(
- event_enabler);
+ int ret;
- if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation)
- return 0;
- if (lttng_desc_match_enabler(event_recorder->priv->parent.desc, base_enabler)
- && event_recorder->chan == event_enabler->chan)
- return 1;
- else
- return 0;
+ ret = lttng_desc_match_enabler_check(desc, enabler);
+ if (ret < 0) {
+ WARN_ON_ONCE(1);
+ return false;
+ }
+ return ret;
}
-static
-int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler,
- struct lttng_kernel_event_notifier *event_notifier)
+bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler,
+ struct lttng_kernel_event_common *event)
{
- struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(
- event_notifier_enabler);
+ if (event_enabler->event_param.instrumentation != event->priv->instrumentation)
+ return false;
- if (base_enabler->event_param.instrumentation != event_notifier->priv->parent.instrumentation)
- return 0;
- if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler)
- && event_notifier->priv->group == event_notifier_enabler->group
- && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token)
- return 1;
- else
- return 0;
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ if (lttng_desc_match_enabler(event->priv->desc, event_enabler)
+ && event_recorder->chan == event_recorder_enabler->chan)
+ return true;
+ else
+ return false;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+
+ if (lttng_desc_match_enabler(event->priv->desc, event_enabler)
+ && event_notifier->priv->group == event_notifier_enabler->group
+ && event->priv->user_token == event_enabler->user_token)
+ return true;
+ else
+ return false;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
+}
+
+bool lttng_event_enabler_desc_match_event(struct lttng_event_enabler_common *event_enabler,
+ const struct lttng_kernel_event_desc *desc,
+ struct lttng_kernel_event_common *event)
+{
+ if (event_enabler->event_param.instrumentation != event->priv->instrumentation)
+ return false;
+
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ if (event->priv->desc == desc && event_recorder->chan == event_recorder_enabler->chan)
+ return true;
+ else
+ return false;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+
+ if (event->priv->desc == desc
+ && event_notifier->priv->group == event_notifier_enabler->group
+ && event->priv->user_token == event_enabler->user_token)
+ return true;
+ else
+ return false;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
}
static
static
void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler)
{
- struct lttng_kernel_session *session = event_enabler->chan->parent.session;
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
struct lttng_kernel_probe_desc *probe_desc;
const struct lttng_kernel_event_desc *desc;
int i;
for (i = 0; i < probe_desc->nr_events; i++) {
int found = 0;
struct hlist_head *head;
- struct lttng_kernel_event_recorder_private *event_recorder_private;
- struct lttng_kernel_event_recorder *event_recorder;
+ struct lttng_kernel_event_common *event;
+ struct lttng_kernel_event_common_private *event_priv;
desc = probe_desc->event_desc[i];
if (!lttng_desc_match_enabler(desc,
/*
* Check if already created.
*/
- head = utils_borrow_hash_table_bucket(
- session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE,
- desc->event_name);
- lttng_hlist_for_each_entry(event_recorder_private, head, hlist) {
- if (event_recorder_private->parent.desc == desc
- && event_recorder_private->pub->chan == event_enabler->chan)
+ head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+ if (lttng_event_enabler_desc_match_event(&event_enabler->parent, desc, event_priv->pub))
found = 1;
}
if (found)
continue;
/*
- * We need to create an event for this
- * event probe.
+ * We need to create an event for this event probe.
*/
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- if (!event_recorder) {
+ event = _lttng_kernel_event_create(&event_enabler->parent, desc);
+ if (!event) {
printk(KERN_INFO "LTTng: Unable to create event %s\n",
probe_desc->event_desc[i]->event_name);
}
static
void lttng_create_tracepoint_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_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_notifier_enabler->parent);
struct lttng_kernel_probe_desc *probe_desc;
const struct lttng_kernel_event_desc *desc;
int i;
for (i = 0; i < probe_desc->nr_events; i++) {
int found = 0;
struct hlist_head *head;
- struct lttng_kernel_event_notifier_private *event_notifier_priv;
- struct lttng_kernel_event_notifier *event_notifier;
+ struct lttng_kernel_event_common *event;
+ struct lttng_kernel_event_common_private *event_priv;
desc = probe_desc->event_desc[i];
if (!lttng_desc_match_enabler(desc,
/*
* Check if already created.
*/
- head = utils_borrow_hash_table_bucket(
- event_notifier_group->events_ht.table,
+ head = utils_borrow_hash_table_bucket(events_ht->table,
LTTNG_EVENT_HT_SIZE, desc->event_name);
- lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
- if (event_notifier_priv->parent.desc == desc
- && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token)
+ lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+ if (lttng_event_enabler_desc_match_event(&event_notifier_enabler->parent, desc, event_priv->pub))
found = 1;
}
if (found)
/*
* We need to create a event_notifier for this event probe.
*/
- event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc);
- if (IS_ERR(event_notifier)) {
+ event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc);
+ if (IS_ERR(event)) {
printk(KERN_INFO "Unable to create event_notifier %s\n",
probe_desc->event_desc[i]->event_name);
}
struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_enabler_match_event(event_enabler, event_recorder))
+ if (!lttng_event_enabler_match_event(&event_enabler->parent, &event_recorder->parent))
continue;
enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head,
lttng_event_recorder_enabler_as_enabler(event_enabler));
struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier))
+ if (!lttng_event_enabler_match_event(&event_notifier_enabler->parent, &event_notifier->parent))
continue;
enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head,
projects / lttng-modules.git / blobdiff