X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Ftracepoint.c;h=58757bb24a4851cb9dd007b5fdcbce9a88ab9fea;hb=cade690d4a2d1c398be9a519295de5b959c3f8bc;hp=93de1e98ce936c28ffe1dfb6a634595e51b8353b;hpb=cb6096aac522cc9b005eb704d40c6aac00e384ab;p=lttng-tools.git diff --git a/src/common/event-rule/tracepoint.c b/src/common/event-rule/tracepoint.c index 93de1e98c..58757bb24 100644 --- a/src/common/event-rule/tracepoint.c +++ b/src/common/event-rule/tracepoint.c @@ -9,13 +9,16 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include +#include #include #define IS_TRACEPOINT_EVENT_RULE(rule) \ @@ -75,23 +78,27 @@ static int lttng_event_rule_tracepoint_serialize( struct lttng_payload *payload) { int ret, i; - size_t pattern_len, filter_expression_len, exclusions_len; + size_t pattern_len, filter_expression_len, exclusions_len, header_offset; + size_t size_before_log_level_rule; struct lttng_event_rule_tracepoint *tracepoint; struct lttng_event_rule_tracepoint_comm tracepoint_comm; enum lttng_event_rule_status status; unsigned int exclusion_count; size_t exclusions_appended_len = 0; + struct lttng_event_rule_tracepoint_comm *header; if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule)) { ret = -1; goto end; } + header_offset = payload->buffer.size; + DBG("Serializing tracepoint event rule."); tracepoint = container_of( rule, struct lttng_event_rule_tracepoint, parent); - status = lttng_event_rule_tracepoint_get_exclusions_count(rule, &exclusion_count); + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_count(rule, &exclusion_count); assert(status == LTTNG_EVENT_RULE_STATUS_OK); pattern_len = strlen(tracepoint->pattern) + 1; @@ -107,7 +114,7 @@ static int lttng_event_rule_tracepoint_serialize( for (i = 0; i < exclusion_count; i++) { const char *exclusion; - status = lttng_event_rule_tracepoint_get_exclusion_at_index( + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( rule, i, &exclusion); assert(status == LTTNG_EVENT_RULE_STATUS_OK); @@ -118,8 +125,6 @@ static int lttng_event_rule_tracepoint_serialize( } tracepoint_comm.domain_type = (int8_t) tracepoint->domain; - tracepoint_comm.loglevel_type = (int8_t) tracepoint->loglevel.type; - tracepoint_comm.loglevel_value = tracepoint->loglevel.value; tracepoint_comm.pattern_len = pattern_len; tracepoint_comm.filter_expression_len = filter_expression_len; tracepoint_comm.exclusions_count = exclusion_count; @@ -143,11 +148,22 @@ static int lttng_event_rule_tracepoint_serialize( goto end; } + size_before_log_level_rule = payload->buffer.size; + + ret = lttng_log_level_rule_serialize(tracepoint->log_level_rule, payload); + if (ret < 0) { + goto end; + } + + header = (typeof(header)) ((char *) payload->buffer.data + header_offset); + header->log_level_rule_len = + payload->buffer.size - size_before_log_level_rule; + for (i = 0; i < exclusion_count; i++) { size_t len; const char *exclusion; - status = lttng_event_rule_tracepoint_get_exclusion_at_index( + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( rule, i, &exclusion); assert(status == LTTNG_EVENT_RULE_STATUS_OK); @@ -190,9 +206,9 @@ static bool lttng_event_rule_tracepoint_is_equal( a = container_of(_a, struct lttng_event_rule_tracepoint, parent); b = container_of(_b, struct lttng_event_rule_tracepoint, parent); - status = lttng_event_rule_tracepoint_get_exclusions_count(_a, &count_a); + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_count(_a, &count_a); assert(status == LTTNG_EVENT_RULE_STATUS_OK); - status = lttng_event_rule_tracepoint_get_exclusions_count(_b, &count_b); + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_count(_b, &count_b); assert(status == LTTNG_EVENT_RULE_STATUS_OK); /* Quick checks. */ @@ -224,21 +240,18 @@ static bool lttng_event_rule_tracepoint_is_equal( goto end; } - if (a->loglevel.type != b->loglevel.type) { - goto end; - } - - if (a->loglevel.value != b->loglevel.value) { + if (!lttng_log_level_rule_is_equal( + a->log_level_rule, b->log_level_rule)) { goto end; } for (i = 0; i < count_a; i++) { const char *exclusion_a, *exclusion_b; - status = lttng_event_rule_tracepoint_get_exclusion_at_index( + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( _a, i, &exclusion_a); assert(status == LTTNG_EVENT_RULE_STATUS_OK); - status = lttng_event_rule_tracepoint_get_exclusion_at_index( + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( _b, i, &exclusion_b); assert(status == LTTNG_EVENT_RULE_STATUS_OK); if (strcmp(exclusion_a, exclusion_b)) { @@ -266,13 +279,13 @@ static int generate_agent_filter( char *agent_filter = NULL; const char *pattern; const char *filter; - enum lttng_loglevel_type loglevel_type; + const struct lttng_log_level_rule *log_level_rule = NULL; enum lttng_event_rule_status status; assert(rule); assert(_agent_filter); - status = lttng_event_rule_tracepoint_get_pattern(rule, &pattern); + status = lttng_event_rule_tracepoint_get_name_pattern(rule, &pattern); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ret = -1; goto end; @@ -286,12 +299,6 @@ static int generate_agent_filter( goto end; } - status = lttng_event_rule_tracepoint_get_log_level_type( - rule, &loglevel_type); - if (status != LTTNG_EVENT_RULE_STATUS_OK) { - ret = -1; - goto end; - } /* Don't add filter for the '*' event. */ if (strcmp(pattern, "*") != 0) { @@ -311,21 +318,32 @@ static int generate_agent_filter( } } - if (loglevel_type != LTTNG_EVENT_LOGLEVEL_ALL) { + status = lttng_event_rule_tracepoint_get_log_level_rule( + rule, &log_level_rule); + if (status == LTTNG_EVENT_RULE_STATUS_OK) { + enum lttng_log_level_rule_status llr_status; const char *op; - int loglevel_value; + int level; - status = lttng_event_rule_tracepoint_get_log_level( - rule, &loglevel_value); - if (status != LTTNG_EVENT_RULE_STATUS_OK) { - ret = -1; - goto end; + switch (lttng_log_level_rule_get_type(log_level_rule)) + { + case LTTNG_LOG_LEVEL_RULE_TYPE_EXACTLY: + llr_status = lttng_log_level_rule_exactly_get_level( + log_level_rule, &level); + op = "=="; + break; + case LTTNG_LOG_LEVEL_RULE_TYPE_AT_LEAST_AS_SEVERE_AS: + llr_status = lttng_log_level_rule_at_least_as_severe_as_get_level( + log_level_rule, &level); + op = ">="; + break; + default: + abort(); } - if (loglevel_type == LTTNG_EVENT_LOGLEVEL_RANGE) { - op = ">="; - } else { - op = "=="; + if (llr_status != LTTNG_LOG_LEVEL_RULE_STATUS_OK) { + ret = -1; + goto end; } if (filter || agent_filter) { @@ -334,14 +352,14 @@ static int generate_agent_filter( err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)", agent_filter ? agent_filter : filter, - op, loglevel_value); + op, level); if (agent_filter) { free(agent_filter); } agent_filter = new_filter; } else { err = asprintf(&agent_filter, "int_loglevel %s %d", op, - loglevel_value); + level); } if (err < 0) { @@ -508,7 +526,7 @@ lttng_event_rule_tracepoint_generate_exclusions( abort(); } - event_rule_status = lttng_event_rule_tracepoint_get_exclusions_count( + event_rule_status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_count( rule, &nb_exclusions); assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK); if (nb_exclusions == 0) { @@ -532,7 +550,7 @@ lttng_event_rule_tracepoint_generate_exclusions( const char *exclusion_str; event_rule_status = - lttng_event_rule_tracepoint_get_exclusion_at_index( + lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( rule, i, &exclusion_str); assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK); @@ -576,22 +594,18 @@ static unsigned long lttng_event_rule_tracepoint_hash( hash ^= hash_key_str(tp_rule->filter_expression, lttng_ht_seed); } - hash ^= hash_key_ulong((void *) tp_rule->loglevel.type, - lttng_ht_seed); - if (tp_rule->loglevel.type != LTTNG_EVENT_LOGLEVEL_ALL) { - hash ^= hash_key_ulong( - (void *) (unsigned long) tp_rule->loglevel.value, - lttng_ht_seed); + if (tp_rule->log_level_rule) { + hash ^= lttng_log_level_rule_hash(tp_rule->log_level_rule); } - status = lttng_event_rule_tracepoint_get_exclusions_count(rule, + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_count(rule, &exclusion_count); assert(status == LTTNG_EVENT_RULE_STATUS_OK); for (i = 0; i < exclusion_count; i++) { const char *exclusion; - status = lttng_event_rule_tracepoint_get_exclusion_at_index( + status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( rule, i, &exclusion); assert(status == LTTNG_EVENT_RULE_STATUS_OK); hash ^= hash_key_str(exclusion, lttng_ht_seed); @@ -607,6 +621,10 @@ static struct lttng_event *lttng_event_rule_tracepoint_generate_lttng_event( const struct lttng_event_rule_tracepoint *tracepoint; struct lttng_event *local_event = NULL; struct lttng_event *event = NULL; + enum lttng_loglevel_type loglevel_type; + int loglevel_value = 0; + enum lttng_event_rule_status status; + const struct lttng_log_level_rule *log_level_rule; tracepoint = container_of( rule, const struct lttng_event_rule_tracepoint, parent); @@ -625,8 +643,41 @@ static struct lttng_event *lttng_event_rule_tracepoint_generate_lttng_event( goto error; } - local_event->loglevel_type = tracepoint->loglevel.type; - local_event->loglevel = tracepoint->loglevel.value; + + /* Map the log level rule to an equivalent lttng_loglevel. */ + status = lttng_event_rule_tracepoint_get_log_level_rule( + rule, &log_level_rule); + if (status == LTTNG_EVENT_RULE_STATUS_UNSET) { + loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; + loglevel_value = 0; + } else if (status == LTTNG_EVENT_RULE_STATUS_OK) { + enum lttng_log_level_rule_status llr_status; + + switch (lttng_log_level_rule_get_type(log_level_rule)) { + case LTTNG_LOG_LEVEL_RULE_TYPE_EXACTLY: + llr_status = lttng_log_level_rule_exactly_get_level( + log_level_rule, &loglevel_value); + loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE; + break; + case LTTNG_LOG_LEVEL_RULE_TYPE_AT_LEAST_AS_SEVERE_AS: + llr_status = lttng_log_level_rule_at_least_as_severe_as_get_level( + log_level_rule, &loglevel_value); + loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE; + break; + default: + abort(); + break; + } + + if (llr_status != LTTNG_LOG_LEVEL_RULE_STATUS_OK) { + goto error; + } + } else { + goto error; + } + + local_event->loglevel_type = loglevel_type; + local_event->loglevel = loglevel_value; event = local_event; local_event = NULL; @@ -670,13 +721,13 @@ struct lttng_event_rule *lttng_event_rule_tracepoint_create( lttng_event_rule_tracepoint_generate_lttng_event; tp_rule->domain = domain_type; - tp_rule->loglevel.type = LTTNG_EVENT_LOGLEVEL_ALL; + tp_rule->log_level_rule = NULL; lttng_dynamic_pointer_array_init(&tp_rule->exclusions, destroy_lttng_exclusions_element); /* Default pattern is '*'. */ - status = lttng_event_rule_tracepoint_set_pattern(rule, "*"); + status = lttng_event_rule_tracepoint_set_name_pattern(rule, "*"); if (status != LTTNG_EVENT_RULE_STATUS_OK) { lttng_event_rule_destroy(rule); rule = NULL; @@ -695,7 +746,6 @@ ssize_t lttng_event_rule_tracepoint_create_from_payload( int i; enum lttng_event_rule_status status; enum lttng_domain_type domain_type; - enum lttng_loglevel_type loglevel_type; const struct lttng_event_rule_tracepoint_comm *tracepoint_comm; const char *pattern; const char *filter_expression = NULL; @@ -704,6 +754,7 @@ ssize_t lttng_event_rule_tracepoint_create_from_payload( const char *exclusion; struct lttng_buffer_view current_buffer_view; struct lttng_event_rule *rule = NULL; + struct lttng_log_level_rule *log_level_rule = NULL; if (!_event_rule) { ret = -1; @@ -737,32 +788,6 @@ ssize_t lttng_event_rule_tracepoint_create_from_payload( goto end; } - loglevel_type = (enum lttng_loglevel_type) - tracepoint_comm->loglevel_type; - switch (loglevel_type) { - case LTTNG_EVENT_LOGLEVEL_ALL: - status = lttng_event_rule_tracepoint_set_log_level_all(rule); - break; - case LTTNG_EVENT_LOGLEVEL_RANGE: - status = lttng_event_rule_tracepoint_set_log_level_range_lower_bound(rule, - (enum lttng_loglevel_type) tracepoint_comm - ->loglevel_value); - break; - case LTTNG_EVENT_LOGLEVEL_SINGLE: - status = lttng_event_rule_tracepoint_set_log_level(rule, - (enum lttng_loglevel_type) tracepoint_comm - ->loglevel_value); - break; - default: - ERR("Failed to set event rule tracepoint loglevel: unknown loglevel type."); - ret = -1; - goto end; - } - - if (status != LTTNG_EVENT_RULE_STATUS_OK) { - ERR("Failed to set event rule tracepoint loglevel."); - } - /* Skip to payload. */ offset += current_buffer_view.size; @@ -809,6 +834,30 @@ ssize_t lttng_event_rule_tracepoint_create_from_payload( offset += tracepoint_comm->filter_expression_len; skip_filter_expression: + if (!tracepoint_comm->log_level_rule_len) { + goto skip_log_level_rule; + } + + { + /* Map the log level rule. */ + struct lttng_payload_view current_payload_view = + lttng_payload_view_from_view(view, offset, + tracepoint_comm->log_level_rule_len); + + ret = lttng_log_level_rule_create_from_payload( + ¤t_payload_view, &log_level_rule); + if (ret < 0) { + ret = -1; + goto end; + } + + assert(ret == tracepoint_comm->log_level_rule_len); + } + + /* Skip after the log level rule. */ + offset += tracepoint_comm->log_level_rule_len; + +skip_log_level_rule: for (i = 0; i < tracepoint_comm->exclusions_count; i++) { current_buffer_view = lttng_buffer_view_from_view( &view->buffer, offset, sizeof(*exclusion_len)); @@ -834,7 +883,7 @@ skip_filter_expression: goto end; } - status = lttng_event_rule_tracepoint_add_exclusion(rule, exclusion); + status = lttng_event_rule_tracepoint_add_name_pattern_exclusion(rule, exclusion); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to add event rule tracepoint exclusion \"%s\".", exclusion); @@ -846,7 +895,7 @@ skip_filter_expression: offset += *exclusion_len; } - status = lttng_event_rule_tracepoint_set_pattern(rule, pattern); + status = lttng_event_rule_tracepoint_set_name_pattern(rule, pattern); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to set event rule tracepoint pattern."); ret = -1; @@ -863,16 +912,27 @@ skip_filter_expression: } } + if (log_level_rule) { + status = lttng_event_rule_tracepoint_set_log_level_rule( + rule, log_level_rule); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + ERR("Failed to set event rule tracepoint log level rule."); + ret = -1; + goto end; + } + } + *_event_rule = rule; rule = NULL; ret = offset; end: free(exclusions); + lttng_log_level_rule_destroy(log_level_rule); lttng_event_rule_destroy(rule); return ret; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_set_pattern( +enum lttng_event_rule_status lttng_event_rule_tracepoint_set_name_pattern( struct lttng_event_rule *rule, const char *pattern) { char *pattern_copy = NULL; @@ -893,6 +953,9 @@ enum lttng_event_rule_status lttng_event_rule_tracepoint_set_pattern( goto end; } + /* Normalize the pattern. */ + strutils_normalize_star_glob_pattern(pattern_copy); + free(tracepoint->pattern); tracepoint->pattern = pattern_copy; @@ -901,7 +964,7 @@ end: return status; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_get_pattern( +enum lttng_event_rule_status lttng_event_rule_tracepoint_get_name_pattern( const struct lttng_event_rule *rule, const char **pattern) { struct lttng_event_rule_tracepoint *tracepoint; @@ -998,13 +1061,31 @@ end: return status; } -static bool log_level_value_valid( - int level, enum lttng_domain_type domain) +static bool log_level_rule_valid(const struct lttng_log_level_rule *rule, + enum lttng_domain_type domain) { bool valid = false; + enum lttng_log_level_rule_status status; + int level; + + switch (lttng_log_level_rule_get_type(rule)) { + case LTTNG_LOG_LEVEL_RULE_TYPE_EXACTLY: + status = lttng_log_level_rule_exactly_get_level(rule, &level); + break; + case LTTNG_LOG_LEVEL_RULE_TYPE_AT_LEAST_AS_SEVERE_AS: + status = lttng_log_level_rule_at_least_as_severe_as_get_level( + rule, &level); + break; + default: + abort(); + } + + assert(status == LTTNG_LOG_LEVEL_RULE_STATUS_OK); switch (domain) { case LTTNG_DOMAIN_KERNEL: + valid = false; + break; case LTTNG_DOMAIN_UST: if (level < LTTNG_LOGLEVEL_EMERG) { /* Invalid. */ @@ -1022,15 +1103,15 @@ static bool log_level_value_valid( case LTTNG_DOMAIN_PYTHON: /* * For both JUL and LOG4J custom log level are possible and can - * spawn the entire int32 range. + * span the entire int32 range. + * * For python, custom log level are possible, it is not clear if * negative value are accepted (NOTSET == 0) but the source code - * validate against the int type implying that negative values + * validates against the int type implying that negative values * are accepted. */ valid = true; goto end; - case LTTNG_DOMAIN_NONE: default: abort(); @@ -1040,37 +1121,34 @@ end: return valid; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_set_log_level( - struct lttng_event_rule *rule, int level) +static bool domain_supports_log_levels(enum lttng_domain_type domain) { - struct lttng_event_rule_tracepoint *tracepoint; - enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; - - if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule)) { - status = LTTNG_EVENT_RULE_STATUS_INVALID; - goto end; - } + bool supported; - tracepoint = container_of( - rule, struct lttng_event_rule_tracepoint, parent); - - if (!log_level_value_valid(level, tracepoint->domain)) { - status = LTTNG_EVENT_RULE_STATUS_INVALID; - goto end; + switch (domain) { + case LTTNG_DOMAIN_KERNEL: + supported = false; + break; + case LTTNG_DOMAIN_UST: + case LTTNG_DOMAIN_JUL: + case LTTNG_DOMAIN_LOG4J: + case LTTNG_DOMAIN_PYTHON: + supported = true; + break; + default: + abort(); } - tracepoint->loglevel.value = level; - tracepoint->loglevel.type = LTTNG_EVENT_LOGLEVEL_SINGLE; -end: - return status; + return supported; } -enum lttng_event_rule_status -lttng_event_rule_tracepoint_set_log_level_range_lower_bound( - struct lttng_event_rule *rule, int level) +enum lttng_event_rule_status lttng_event_rule_tracepoint_set_log_level_rule( + struct lttng_event_rule *rule, + const struct lttng_log_level_rule *log_level_rule) { struct lttng_event_rule_tracepoint *tracepoint; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; + struct lttng_log_level_rule *copy = NULL; if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule)) { status = LTTNG_EVENT_RULE_STATUS_INVALID; @@ -1080,78 +1158,58 @@ lttng_event_rule_tracepoint_set_log_level_range_lower_bound( tracepoint = container_of( rule, struct lttng_event_rule_tracepoint, parent); - if (!log_level_value_valid(level, tracepoint->domain)) { - status = LTTNG_EVENT_RULE_STATUS_INVALID; + if (!domain_supports_log_levels(tracepoint->domain)) { + status = LTTNG_EVENT_RULE_STATUS_UNSUPPORTED; goto end; } - tracepoint->loglevel.value = level; - tracepoint->loglevel.type = LTTNG_EVENT_LOGLEVEL_RANGE; -end: - return status; -} - -enum lttng_event_rule_status lttng_event_rule_tracepoint_set_log_level_all( - struct lttng_event_rule *rule) -{ - struct lttng_event_rule_tracepoint *tracepoint; - enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; - - if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule)) { + if (!log_level_rule_valid(log_level_rule, tracepoint->domain)) { status = LTTNG_EVENT_RULE_STATUS_INVALID; goto end; } - tracepoint = container_of( - rule, struct lttng_event_rule_tracepoint, parent); - tracepoint->loglevel.type = LTTNG_EVENT_LOGLEVEL_ALL; -end: - return status; -} - -enum lttng_event_rule_status lttng_event_rule_tracepoint_get_log_level_type( - const struct lttng_event_rule *rule, - enum lttng_loglevel_type *type) -{ - struct lttng_event_rule_tracepoint *tracepoint; - enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; - - if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule) || !type) { - status = LTTNG_EVENT_RULE_STATUS_INVALID; + copy = lttng_log_level_rule_copy(log_level_rule); + if (copy == NULL) { + status = LTTNG_EVENT_RULE_STATUS_ERROR; goto end; } - tracepoint = container_of( - rule, struct lttng_event_rule_tracepoint, parent); - *type = tracepoint->loglevel.type; + if (tracepoint->log_level_rule) { + lttng_log_level_rule_destroy(tracepoint->log_level_rule); + } + + tracepoint->log_level_rule = copy; + end: return status; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_get_log_level( - const struct lttng_event_rule *rule, int *level) +enum lttng_event_rule_status lttng_event_rule_tracepoint_get_log_level_rule( + const struct lttng_event_rule *rule, + const struct lttng_log_level_rule **log_level_rule + ) { struct lttng_event_rule_tracepoint *tracepoint; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; - if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule) || !level) { + if (!rule || !IS_TRACEPOINT_EVENT_RULE(rule) || !log_level_rule) { status = LTTNG_EVENT_RULE_STATUS_INVALID; goto end; } tracepoint = container_of( rule, struct lttng_event_rule_tracepoint, parent); - if (tracepoint->loglevel.type == LTTNG_EVENT_LOGLEVEL_ALL) { + if (tracepoint->log_level_rule == NULL) { status = LTTNG_EVENT_RULE_STATUS_UNSET; goto end; } - *level = tracepoint->loglevel.value; + *log_level_rule = tracepoint->log_level_rule; end: return status; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_add_exclusion( +enum lttng_event_rule_status lttng_event_rule_tracepoint_add_name_pattern_exclusion( struct lttng_event_rule *rule, const char *exclusion) { @@ -1214,7 +1272,7 @@ end: return status; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_get_exclusions_count( +enum lttng_event_rule_status lttng_event_rule_tracepoint_get_name_pattern_exclusion_count( const struct lttng_event_rule *rule, unsigned int *count) { struct lttng_event_rule_tracepoint *tracepoint; @@ -1232,7 +1290,7 @@ end: return status; } -enum lttng_event_rule_status lttng_event_rule_tracepoint_get_exclusion_at_index( +enum lttng_event_rule_status lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index( const struct lttng_event_rule *rule, unsigned int index, const char **exclusion) @@ -1248,7 +1306,7 @@ enum lttng_event_rule_status lttng_event_rule_tracepoint_get_exclusion_at_index( tracepoint = container_of( rule, struct lttng_event_rule_tracepoint, parent); - if (lttng_event_rule_tracepoint_get_exclusions_count(rule, &count) != + if (lttng_event_rule_tracepoint_get_name_pattern_exclusion_count(rule, &count) != LTTNG_EVENT_RULE_STATUS_OK) { goto end; }