X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Ftracepoint.c;h=62a53f9783de0626a150e13a9529120fa6fa02fe;hp=f750af47f8ced8e496462daa9acd6a9b70b32e56;hb=2222db742ae4bde755b2327e46a99dd0bfaed411;hpb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3 diff --git a/src/common/event-rule/tracepoint.c b/src/common/event-rule/tracepoint.c index f750af47f..62a53f978 100644 --- a/src/common/event-rule/tracepoint.c +++ b/src/common/event-rule/tracepoint.c @@ -6,13 +6,19 @@ */ #include +#include #include #include +#include #include #include #include +#include +#include #include #include +#include +#include #define IS_TRACEPOINT_EVENT_RULE(rule) \ (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_TRACEPOINT) @@ -71,18 +77,22 @@ 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); @@ -114,8 +124,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; @@ -139,6 +147,17 @@ 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; @@ -220,11 +239,8 @@ 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; } @@ -262,7 +278,7 @@ 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); @@ -282,12 +298,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) { @@ -307,21 +317,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) { @@ -330,14 +351,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) { @@ -357,7 +378,8 @@ end: static enum lttng_error_code lttng_event_rule_tracepoint_generate_filter_bytecode( - struct lttng_event_rule *rule, uid_t uid, gid_t gid) + struct lttng_event_rule *rule, + const struct lttng_credentials *creds) { int ret; enum lttng_error_code ret_code; @@ -365,7 +387,7 @@ lttng_event_rule_tracepoint_generate_filter_bytecode( enum lttng_domain_type domain_type; enum lttng_event_rule_status status; const char *filter; - struct lttng_filter_bytecode *bytecode = NULL; + struct lttng_bytecode *bytecode = NULL; assert(rule); @@ -429,7 +451,7 @@ lttng_event_rule_tracepoint_generate_filter_bytecode( } ret = run_as_generate_filter_bytecode( - tracepoint->internal_filter.filter, uid, gid, + tracepoint->internal_filter.filter, creds, &bytecode); if (ret) { ret_code = LTTNG_ERR_FILTER_INVAL; @@ -457,7 +479,7 @@ static const char *lttng_event_rule_tracepoint_get_internal_filter( return tracepoint->internal_filter.filter; } -static const struct lttng_filter_bytecode * +static const struct lttng_bytecode * lttng_event_rule_tracepoint_get_internal_filter_bytecode( const struct lttng_event_rule *rule) { @@ -469,19 +491,22 @@ lttng_event_rule_tracepoint_get_internal_filter_bytecode( return tracepoint->internal_filter.bytecode; } -static struct lttng_event_exclusion * +static enum lttng_event_rule_generate_exclusions_status lttng_event_rule_tracepoint_generate_exclusions( - const struct lttng_event_rule *rule) + const struct lttng_event_rule *rule, + struct lttng_event_exclusion **_exclusions) { - enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE; - enum lttng_event_rule_status status; - struct lttng_event_exclusion *local_exclusions = NULL; - struct lttng_event_exclusion *ret_exclusions = NULL; - unsigned int nb_exclusions = 0; - unsigned int i; + unsigned int nb_exclusions = 0, i; + enum lttng_domain_type domain_type; + struct lttng_event_exclusion *exclusions; + enum lttng_event_rule_status event_rule_status; + enum lttng_event_rule_generate_exclusions_status ret_status; - status = lttng_event_rule_tracepoint_get_domain_type(rule, &domain_type); - assert(status == LTTNG_EVENT_RULE_STATUS_OK); + assert(_exclusions); + + event_rule_status = lttng_event_rule_tracepoint_get_domain_type( + rule, &domain_type); + assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK); switch (domain_type) { case LTTNG_DOMAIN_KERNEL: @@ -489,50 +514,60 @@ lttng_event_rule_tracepoint_generate_exclusions( case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_PYTHON: /* Not supported. */ - ret_exclusions = NULL; + exclusions = NULL; + ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE; goto end; case LTTNG_DOMAIN_UST: /* Exclusions supported. */ break; default: + /* Unknown domain. */ abort(); } - status = lttng_event_rule_tracepoint_get_exclusions_count( + event_rule_status = lttng_event_rule_tracepoint_get_exclusions_count( rule, &nb_exclusions); - assert(status == LTTNG_EVENT_RULE_STATUS_OK); + assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK); if (nb_exclusions == 0) { /* Nothing to do. */ - ret_exclusions = NULL; + exclusions = NULL; + ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE; goto end; } - local_exclusions = zmalloc(sizeof(struct lttng_event_exclusion) + - (LTTNG_SYMBOL_NAME_LEN * nb_exclusions)); - if (!local_exclusions) { + exclusions = zmalloc(sizeof(struct lttng_event_exclusion) + + (LTTNG_SYMBOL_NAME_LEN * nb_exclusions)); + if (!exclusions) { PERROR("Failed to allocate exclusions buffer"); - ret_exclusions = NULL; + ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_OUT_OF_MEMORY; goto end; } - local_exclusions->count = nb_exclusions; + exclusions->count = nb_exclusions; for (i = 0; i < nb_exclusions; i++) { - /* Truncation is already checked at the setter level. */ - const char *tmp; - - status = lttng_event_rule_tracepoint_get_exclusion_at_index( - rule, i, &tmp); - assert(status == LTTNG_EVENT_RULE_STATUS_OK); - strncpy(local_exclusions->names[i], tmp, LTTNG_SYMBOL_NAME_LEN); - local_exclusions->names[i][LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + int copy_ret; + const char *exclusion_str; + + event_rule_status = + lttng_event_rule_tracepoint_get_exclusion_at_index( + rule, i, &exclusion_str); + assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK); + + copy_ret = lttng_strncpy(exclusions->names[i], exclusion_str, + LTTNG_SYMBOL_NAME_LEN); + if (copy_ret) { + free(exclusions); + exclusions = NULL; + ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_ERROR; + goto end; + } } - /* Pass ownership. */ - ret_exclusions = local_exclusions; - local_exclusions = NULL; + ret_status = LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_OK; + end: - free(local_exclusions); - return ret_exclusions; + *_exclusions = exclusions; + return ret_status; } static void destroy_lttng_exclusions_element(void *ptr) @@ -540,11 +575,122 @@ static void destroy_lttng_exclusions_element(void *ptr) free(ptr); } +static unsigned long lttng_event_rule_tracepoint_hash( + const struct lttng_event_rule *rule) +{ + unsigned long hash; + unsigned int i, exclusion_count; + enum lttng_event_rule_status status; + struct lttng_event_rule_tracepoint *tp_rule = + container_of(rule, typeof(*tp_rule), parent); + + hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_TRACEPOINT, + lttng_ht_seed); + hash ^= hash_key_ulong((void *) tp_rule->domain, lttng_ht_seed); + hash ^= hash_key_str(tp_rule->pattern, lttng_ht_seed); + + if (tp_rule->filter_expression) { + hash ^= hash_key_str(tp_rule->filter_expression, 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, + &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( + rule, i, &exclusion); + assert(status == LTTNG_EVENT_RULE_STATUS_OK); + hash ^= hash_key_str(exclusion, lttng_ht_seed); + } + + return hash; +} + +static struct lttng_event *lttng_event_rule_tracepoint_generate_lttng_event( + const struct lttng_event_rule *rule) +{ + int ret; + 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); + + local_event = zmalloc(sizeof(*local_event)); + if (!local_event) { + goto error; + } + + local_event->type = LTTNG_EVENT_TRACEPOINT; + ret = lttng_strncpy(local_event->name, tracepoint->pattern, + sizeof(local_event->name)); + if (ret) { + ERR("Truncation occurred when copying event rule pattern to `lttng_event` structure: pattern = '%s'", + tracepoint->pattern); + goto error; + } + + + /* 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; +error: + free(local_event); + return event; +} + struct lttng_event_rule *lttng_event_rule_tracepoint_create( enum lttng_domain_type domain_type) { struct lttng_event_rule *rule = NULL; struct lttng_event_rule_tracepoint *tp_rule; + enum lttng_event_rule_status status; if (domain_type == LTTNG_DOMAIN_NONE) { goto end; @@ -569,12 +715,23 @@ struct lttng_event_rule *lttng_event_rule_tracepoint_create( lttng_event_rule_tracepoint_get_internal_filter_bytecode; tp_rule->parent.generate_exclusions = lttng_event_rule_tracepoint_generate_exclusions; + tp_rule->parent.hash = lttng_event_rule_tracepoint_hash; + tp_rule->parent.generate_lttng_event = + 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, "*"); + if (status != LTTNG_EVENT_RULE_STATUS_OK) { + lttng_event_rule_destroy(rule); + rule = NULL; + } + end: return rule; } @@ -588,7 +745,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; @@ -597,6 +753,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; @@ -630,32 +787,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; @@ -702,6 +833,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)); @@ -756,11 +911,22 @@ 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; } @@ -891,13 +1057,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. */ @@ -915,15 +1099,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(); @@ -933,37 +1117,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; - } - - tracepoint = container_of( - rule, struct lttng_event_rule_tracepoint, parent); + bool supported; - 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; @@ -973,73 +1154,53 @@ 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; }