struct ltt_ust_event *event;
const struct ltt_ust_ht_key *key;
int ev_loglevel_value;
+ int ll_match;
assert(node);
assert(_key);
}
/* Event loglevel value and type. */
- if (event->attr.loglevel_type == key->loglevel_type) {
- /* Same loglevel type. */
- if (key->loglevel_type != LTTNG_UST_LOGLEVEL_ALL) {
- /*
- * Loglevel value must also match since the loglevel
- * type is not all.
- */
- if (ev_loglevel_value != key->loglevel_value) {
- goto no_match;
- }
- }
- } else {
- /* Loglevel type is different: no match. */
+ ll_match = loglevels_match(event->attr.loglevel_type,
+ ev_loglevel_value, key->loglevel_type,
+ key->loglevel_value, LTTNG_UST_LOGLEVEL_ALL);
+
+ if (!ll_match) {
goto no_match;
}
}
break;
default:
- ERR("Invalid UST context");
utype = -1;
break;
}
utype = trace_ust_context_type_event_to_ust(ctx->ctx);
if (utype < 0) {
+ ERR("Invalid UST context");
return NULL;
}