{
struct agent_event *event;
const struct agent_ht_key *key;
+ int ll_match;
assert(node);
assert(_key);
goto no_match;
}
- if (event->loglevel_value != key->loglevel_value) {
- if (event->loglevel_type == LTTNG_EVENT_LOGLEVEL_ALL &&
- key->loglevel_value == 0 &&
- event->loglevel_value == -1) {
- goto match;
- }
+ /* Event loglevel value and type. */
+ ll_match = loglevels_match(event->loglevel_type,
+ event->loglevel_value, key->loglevel_type,
+ key->loglevel_value, LTTNG_EVENT_LOGLEVEL_ALL);
+
+ if (!ll_match) {
goto no_match;
}
-match:
+
return 1;
no_match:
key.name = event->name;
key.loglevel_value = event->loglevel_value;
+ key.loglevel_type = event->loglevel_type;
node_ptr = cds_lfht_add_unique(ht->ht,
ht->hash_fct(event->node.key, lttng_ht_seed),
* Return a new object else NULL on error.
*/
struct agent_event *agent_create_event(const char *name,
- int loglevel_value, enum lttng_loglevel_type loglevel_type,
+ enum lttng_loglevel_type loglevel_type, int loglevel_value,
struct lttng_filter_bytecode *filter, char *filter_expression)
{
struct agent_event *event = NULL;
- DBG3("Agent create new event with name %s", name);
+ DBG3("Agent create new event with name %s, loglevel type %d and loglevel value %d",
+ name, loglevel_type, loglevel_value);
if (!name) {
ERR("Failed to create agent event; no name provided.");
*
* Return object if found else NULL.
*/
-struct agent_event *agent_find_event(const char *name, int loglevel_value,
+struct agent_event *agent_find_event(const char *name,
+ enum lttng_loglevel_type loglevel_type, int loglevel_value,
struct agent *agt)
{
struct lttng_ht_node_str *node;
ht = agt->events;
key.name = name;
key.loglevel_value = loglevel_value;
+ key.loglevel_type = loglevel_type;
cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
ht_match_event, &key, &iter.iter);