/*
* probe list is protected by ust_lock()/ust_unlock().
*/
-static CDS_LIST_HEAD(probe_list);
+CDS_LIST_HEAD(probe_list);
+
+struct cds_list_head *lttng_get_probe_list_head(void)
+{
+ return &probe_list;
+}
static
const struct lttng_probe_desc *find_provider(const char *provider)
}
static
-const struct lttng_event_desc *find_event(const char *name)
+int check_event_provider(struct lttng_probe_desc *desc)
{
- struct lttng_probe_desc *probe_desc;
int i;
+ size_t provider_name_len;
- cds_list_for_each_entry(probe_desc, &probe_list, head) {
- for (i = 0; i < probe_desc->nr_events; i++) {
- if (!strncmp(probe_desc->event_desc[i]->name, name,
- LTTNG_UST_SYM_NAME_LEN - 1))
- return probe_desc->event_desc[i];
- }
+ provider_name_len = strnlen(desc->provider,
+ LTTNG_UST_SYM_NAME_LEN - 1);
+ for (i = 0; i < desc->nr_events; i++) {
+ if (strncmp(desc->event_desc[i]->name,
+ desc->provider,
+ provider_name_len))
+ return 0; /* provider mismatch */
}
- return NULL;
+ return 1;
}
int lttng_probe_register(struct lttng_probe_desc *desc)
int i;
ust_lock();
+
+ /*
+ * Check if the provider has already been registered.
+ */
if (find_provider(desc->provider)) {
ret = -EEXIST;
goto end;
}
+
/*
- * TODO: This is O(N^2). Turn into a hash table when probe registration
- * overhead becomes an issue.
+ * Each provider enforce that every event name begins with the
+ * provider name. Check this in an assertion for extra
+ * carefulness. This ensures we cannot have duplicate event
+ * names across providers.
+ */
+ assert(check_event_provider(desc));
+
+ /*
+ * The provider ensures there are no duplicate event names.
+ * Duplicated TRACEPOINT_EVENT event names would generate a
+ * compile-time error due to duplicated symbol names.
*/
- for (i = 0; i < desc->nr_events; i++) {
- if (find_event(desc->event_desc[i]->name)) {
- ret = -EEXIST;
- goto end;
- }
- }
/*
* We sort the providers by struct lttng_probe_desc pointer
ed = desc->event_desc[i];
DBG("Registered event probe \"%s\" with signature \"%s\"",
ed->name, ed->signature);
- ret = pending_probe_fix_events(ed);
+ ret = lttng_fix_pending_event_desc(ed);
assert(!ret);
}
end:
lttng_probe_unregister(desc);
}
-/*
- * called with UST lock held.
- */
-const struct lttng_event_desc *lttng_event_get(const char *name)
-{
- const struct lttng_event_desc *event;
-
- event = find_event(name);
- if (!event)
- return NULL;
- return event;
-}
-
-void lttng_event_put(const struct lttng_event_desc *event)
-{
-}
-
void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list)
{
struct tp_list_entry *list_entry, *tmp;
struct tp_field_list_entry, head);
return &entry->field;
}
-
-/*
- * marshall all probes/all events and create those that fit the
- * wildcard. Add them to the events list as created.
- */
-void lttng_probes_create_wildcard_events(struct wildcard_entry *entry,
- struct session_wildcard *wildcard)
-{
- struct lttng_probe_desc *probe_desc;
- struct lttng_ust_event event_param;
- int i;
-
- cds_list_for_each_entry(probe_desc, &probe_list, head) {
- for (i = 0; i < probe_desc->nr_events; i++) {
- const struct lttng_event_desc *event_desc;
- int match = 0;
-
- event_desc = probe_desc->event_desc[i];
- /* compare excluding final '*' */
- assert(strlen(entry->name) > 0);
- if (strcmp(event_desc->name, "lttng_ust:metadata")
- && (strlen(entry->name) == 1
- || !strncmp(event_desc->name, entry->name,
- strlen(entry->name) - 1))) {
- if (lttng_loglevel_match(event_desc,
- entry->loglevel_type,
- entry->loglevel)) {
- match = 1;
- }
- }
- if (match) {
- struct lttng_event *ev;
- int ret;
-
- memcpy(&event_param, &wildcard->event_param,
- sizeof(event_param));
- strncpy(event_param.name,
- event_desc->name,
- sizeof(event_param.name));
- event_param.name[sizeof(event_param.name) - 1] = '\0';
- /* create event */
- ret = lttng_event_create(wildcard->chan,
- &event_param, &ev);
- if (ret) {
- DBG("Error creating event");
- continue;
- }
- cds_list_add(&ev->wildcard_list,
- &wildcard->events);
- }
- }
- }
- lttng_filter_wildcard_link_bytecode(wildcard);
-}
-
projects / lttng-ust.git / blobdiff