};
static void _ltt_event_destroy(struct ltt_event *event);
-static void _ltt_loglevel_destroy(struct loglevel_entry *entry);
+static void _ltt_loglevel_destroy(struct session_loglevel *sl);
+static void _ltt_wildcard_destroy(struct session_wildcard *sw);
static void _ltt_channel_destroy(struct ltt_channel *chan);
static int _ltt_event_unregister(struct ltt_event *event);
static
size_t name_len = strlen(name) + 1;
uint32_t hash = jhash(name, name_len - 1, 0);
int ret = 0;
+ struct lttng_ust_event event_param;
- /* TODO:
+ /*
* For this event, we need to lookup the loglevel. If active (in
* the active loglevels hash table), we must create the event.
*/
+ if (desc->loglevel) {
+ const struct tracepoint_loglevel_entry *ev_ll;
+ struct loglevel_entry *loglevel;
+
+ ev_ll = *desc->loglevel;
+ loglevel = get_loglevel(ev_ll->identifier);
+ if (!loglevel)
+ loglevel = get_loglevel_value(ev_ll->value);
+ if (loglevel) {
+ struct session_loglevel *sl;
+
+ cds_list_for_each_entry(sl, &loglevel->session_list,
+ session_list) {
+ struct ltt_event *ev;
+ int ret;
+
+ memcpy(&event_param, &sl->event_param,
+ sizeof(event_param));
+ memcpy(event_param.name,
+ desc->name,
+ sizeof(event_param.name));
+ /* create event */
+ ret = ltt_event_create(sl->chan,
+ &event_param, NULL,
+ &ev);
+ if (ret) {
+ DBG("Error creating event");
+ continue;
+ }
+ cds_list_add(&ev->loglevel_list,
+ &sl->events);
+ }
+ }
+ }
+
+ /* Wildcard */
+ {
+ struct wildcard_entry *wildcard;
+
+ wildcard = match_wildcard(desc->name);
+ if (strcmp(desc->name, "lttng_ust:metadata") && wildcard) {
+ struct session_wildcard *sw;
+
+ cds_list_for_each_entry(sw, &wildcard->session_list,
+ session_list) {
+ struct ltt_event *ev;
+ int ret;
+
+ memcpy(&event_param, &sw->event_param,
+ sizeof(event_param));
+ memcpy(event_param.name,
+ desc->name,
+ sizeof(event_param.name));
+ /* create event */
+ ret = ltt_event_create(sw->chan,
+ &event_param, NULL,
+ &ev);
+ if (ret) {
+ DBG("Error creating event");
+ continue;
+ }
+ cds_list_add(&ev->wildcard_list,
+ &sw->events);
+ }
+ }
+ }
head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
cds_hlist_for_each_entry_safe(e, node, p, head, node) {
CDS_INIT_LIST_HEAD(&session->chan);
CDS_INIT_LIST_HEAD(&session->events);
CDS_INIT_LIST_HEAD(&session->loglevels);
+ CDS_INIT_LIST_HEAD(&session->wildcards);
uuid_generate(session->uuid);
cds_list_add(&session->list, &sessions);
return session;
{
struct ltt_channel *chan, *tmpchan;
struct ltt_event *event, *tmpevent;
- struct loglevel_entry *loglevel, *tmploglevel;
+ struct session_loglevel *loglevel, *tmploglevel;
+ struct session_wildcard *wildcard, *tmpwildcard;
int ret;
CMM_ACCESS_ONCE(session->active) = 0;
synchronize_trace(); /* Wait for in-flight events to complete */
cds_list_for_each_entry_safe(loglevel, tmploglevel, &session->loglevels, list)
_ltt_loglevel_destroy(loglevel);
+ cds_list_for_each_entry_safe(wildcard, tmpwildcard, &session->wildcards, list)
+ _ltt_wildcard_destroy(wildcard);
cds_list_for_each_entry_safe(event, tmpevent, &session->events, list)
_ltt_event_destroy(event);
cds_list_for_each_entry_safe(chan, tmpchan, &session->chan, list)
int ltt_loglevel_create(struct ltt_channel *chan,
struct lttng_ust_event *event_param,
- struct loglevel_entry **_entry)
+ struct session_loglevel **_sl)
+{
+ struct session_loglevel *sl;
+
+ sl = add_loglevel(event_param->name, chan, event_param);
+ if (!sl || IS_ERR(sl)) {
+ return PTR_ERR(sl);
+ }
+ *_sl = sl;
+ return 0;
+}
+
+static
+void _ltt_loglevel_destroy(struct session_loglevel *sl)
+{
+ _remove_loglevel(sl);
+}
+
+int ltt_wildcard_create(struct ltt_channel *chan,
+ struct lttng_ust_event *event_param,
+ struct session_wildcard **_sw)
{
- struct loglevel_entry *entry;
+ struct session_wildcard *sw;
- entry = add_loglevel(event_param->name, chan, event_param);
- if (!entry || IS_ERR(entry)) {
- return PTR_ERR(entry);
+ sw = add_wildcard(event_param->name, chan, event_param);
+ if (!sw || IS_ERR(sw)) {
+ return PTR_ERR(sw);
}
- *_entry = entry;
+ *_sw = sw;
return 0;
}
static
-void _ltt_loglevel_destroy(struct loglevel_entry *entry)
+void _ltt_wildcard_destroy(struct session_wildcard *sw)
{
- _remove_loglevel(entry);
+ _remove_wildcard(sw);
}
/*
if (ret)
goto end;
+ if (event->desc->loglevel) {
+ const struct tracepoint_loglevel_entry *ll_entry;
+
+ ll_entry = *event->desc->loglevel;
+ ret = lttng_metadata_printf(session,
+ " loglevel.identifier = \"%s\";\n"
+ " loglevel.value = %lld;\n",
+ ll_entry->identifier,
+ (long long) ll_entry->value);
+ if (ret)
+ goto end;
+ }
+
if (event->ctx) {
ret = lttng_metadata_printf(session,
" context := struct {\n");