* 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)
{
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);
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
+bool lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+ struct lttng_event_enabler_common *enabler)
+{
+ int ret;
+
+ ret = lttng_desc_match_enabler_check(desc, enabler);
+ if (ret < 0) {
+ WARN_ON_ONCE(1);
+ return false;
+ }
+ return ret;
+}
+
bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler,
struct lttng_kernel_event_common *event)
{
}
}
-static
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)
}
static
-void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler)
+void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler_common *event_enabler)
{
- struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
struct lttng_kernel_probe_desc *probe_desc;
const struct lttng_kernel_event_desc *desc;
- int i;
struct list_head *probe_list;
+ int i;
probe_list = lttng_get_probe_list_head();
/*
for (i = 0; i < probe_desc->nr_events; i++) {
int found = 0;
struct hlist_head *head;
- 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,
- lttng_event_recorder_enabler_as_enabler(event_enabler)))
+ if (!lttng_desc_match_enabler(desc, event_enabler))
continue;
/*
*/
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))
+ if (lttng_event_enabler_desc_match_event(event_enabler, 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, 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_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;
- struct list_head *probe_list;
-
- probe_list = lttng_get_probe_list_head();
- /*
- * For each probe event, if we find that a probe event matches
- * our enabler, create an associated lttng_event_notifier if not
- * already present.
- */
- list_for_each_entry(probe_desc, probe_list, head) {
- for (i = 0; i < probe_desc->nr_events; i++) {
- int found = 0;
- struct hlist_head *head;
- struct lttng_kernel_event_notifier *event_notifier;
- struct lttng_kernel_event_common_private *event_priv;
-
- desc = probe_desc->event_desc[i];
- if (!lttng_desc_match_enabler(desc,
- lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)))
- continue;
-
- /*
- * Check if already created.
- */
- 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_notifier_enabler->parent, desc, event_priv->pub))
- found = 1;
- }
- if (found)
- continue;
-
- /*
- * 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)) {
- printk(KERN_INFO "Unable to create event_notifier %s\n",
- probe_desc->event_desc[i]->event_name);
- }
- }
- }
-}
-
static
void lttng_create_syscall_event_if_missing(struct lttng_event_enabler_common *event_enabler)
{
{
switch (event_enabler->parent.event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
- lttng_create_tracepoint_event_if_missing(event_enabler);
+ lttng_create_tracepoint_event_if_missing(&event_enabler->parent);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
{
switch (event_notifier_enabler->parent.event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
- lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler);
+ lttng_create_tracepoint_event_if_missing(&event_notifier_enabler->parent);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
projects / lttng-modules.git / blobdiff