X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-probes.c;h=95a1c12bbe2ff2d5cf331f08c7d3d6c2e05d002f;hb=8da9deee450bf62c6c3abb1f44f9414c0667dd6f;hp=3d3e60e7193369fb0a1562e8dee21be33c269d91;hpb=fd17d7cecd427479c035cd99cb2b2fb622bb3a38;p=lttng-ust.git diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c index 3d3e60e7..95a1c12b 100644 --- a/liblttng-ust/lttng-probes.c +++ b/liblttng-ust/lttng-probes.c @@ -41,42 +41,40 @@ static CDS_LIST_HEAD(lazy_probe_init); static int lazy_nesting; /* - * Called under ust lock. + * Validate that each event within the probe provider refers to the + * right probe, and that the resulting name is not too long. */ static -int check_event_provider(struct lttng_probe_desc *desc) +bool check_event_provider(struct lttng_ust_probe_desc *probe_desc) { int i; - size_t provider_name_len; - - provider_name_len = strnlen(desc->provider, - LTTNG_UST_ABI_SYM_NAME_LEN - 1); - for (i = 0; i < desc->nr_events; i++) { - if (strncmp(desc->event_desc[i]->name, - desc->provider, - provider_name_len)) - return 0; /* provider mismatch */ + + for (i = 0; i < probe_desc->nr_events; i++) { + const struct lttng_ust_event_desc *event_desc = probe_desc->event_desc[i]; + + if (event_desc->probe_desc != probe_desc) { + ERR("Error registering probe provider '%s'. Event '%s:%s' refers to the wrong provider descriptor.", + probe_desc->provider_name, probe_desc->provider_name, event_desc->event_name); + return false; /* provider mismatch */ + } + if (!lttng_ust_validate_event_name(event_desc)) { + ERR("Error registering probe provider '%s'. Event '%s:%s' name is too long.", + probe_desc->provider_name, probe_desc->provider_name, event_desc->event_name); + return false; /* provider mismatch */ + } } - return 1; + return true; } /* * Called under ust lock. */ static -void lttng_lazy_probe_register(struct lttng_probe_desc *desc) +void lttng_lazy_probe_register(struct lttng_ust_probe_desc *desc) { - struct lttng_probe_desc *iter; + struct lttng_ust_probe_desc *iter; struct cds_list_head *probe_list; - /* - * Each provider enforce that every event name begins with the - * provider name. Check this in an assertion for extra - * carefulness. This ensures we cannot have duplicate event - * names across providers. - */ - assert(check_event_provider(desc)); - /* * The provider ensures there are no duplicate event names. * Duplicated TRACEPOINT_EVENT event names would generate a @@ -84,7 +82,7 @@ void lttng_lazy_probe_register(struct lttng_probe_desc *desc) */ /* - * We sort the providers by struct lttng_probe_desc pointer + * We sort the providers by struct lttng_ust_probe_desc pointer * address. */ probe_list = &_probe_list; @@ -100,7 +98,7 @@ void lttng_lazy_probe_register(struct lttng_probe_desc *desc) cds_list_add(&desc->head, probe_list); desc_added: DBG("just registered probe %s containing %u events", - desc->provider, desc->nr_events); + desc->provider_name, desc->nr_events); } /* @@ -109,7 +107,7 @@ desc_added: static void fixup_lazy_probes(void) { - struct lttng_probe_desc *iter, *tmp; + struct lttng_ust_probe_desc *iter, *tmp; int ret; lazy_nesting++; @@ -135,7 +133,7 @@ struct cds_list_head *lttng_get_probe_list_head(void) } static -int check_provider_version(struct lttng_probe_desc *desc) +int check_provider_version(struct lttng_ust_probe_desc *desc) { /* * Check tracepoint provider version compatibility. @@ -143,7 +141,7 @@ int check_provider_version(struct lttng_probe_desc *desc) if (desc->major <= LTTNG_UST_PROVIDER_MAJOR) { DBG("Provider \"%s\" accepted, version %u.%u is compatible " "with LTTng UST provider version %u.%u.", - desc->provider, desc->major, desc->minor, + desc->provider_name, desc->major, desc->minor, LTTNG_UST_PROVIDER_MAJOR, LTTNG_UST_PROVIDER_MINOR); if (desc->major < LTTNG_UST_PROVIDER_MAJOR) { @@ -156,7 +154,7 @@ int check_provider_version(struct lttng_probe_desc *desc) ERR("Provider \"%s\" rejected, version %u.%u is incompatible " "with LTTng UST provider version %u.%u. Please upgrade " "LTTng UST.", - desc->provider, desc->major, desc->minor, + desc->provider_name, desc->major, desc->minor, LTTNG_UST_PROVIDER_MAJOR, LTTNG_UST_PROVIDER_MINOR); return 0; /* reject */ @@ -164,7 +162,7 @@ int check_provider_version(struct lttng_probe_desc *desc) } -int lttng_probe_register(struct lttng_probe_desc *desc) +int lttng_ust_probe_register(struct lttng_ust_probe_desc *desc) { int ret = 0; @@ -176,13 +174,15 @@ int lttng_probe_register(struct lttng_probe_desc *desc) */ if (!check_provider_version(desc)) return 0; + if (!check_event_provider(desc)) + return 0; ust_lock_nocheck(); cds_list_add(&desc->lazy_init_head, &lazy_probe_init); desc->lazy = 1; DBG("adding probe %s containing %u events to lazy registration list", - desc->provider, desc->nr_events); + desc->provider_name, desc->nr_events); /* * If there is at least one active session, we need to register * the probe immediately, since we cannot delay event @@ -197,7 +197,7 @@ int lttng_probe_register(struct lttng_probe_desc *desc) return ret; } -void lttng_probe_unregister(struct lttng_probe_desc *desc) +void lttng_ust_probe_unregister(struct lttng_ust_probe_desc *desc) { lttng_ust_fixup_tls(); @@ -211,7 +211,7 @@ void lttng_probe_unregister(struct lttng_probe_desc *desc) cds_list_del(&desc->lazy_init_head); lttng_probe_provider_unregister_events(desc); - DBG("just unregistered probes of provider %s", desc->provider); + DBG("just unregistered probes of provider %s", desc->provider_name); ust_unlock(); } @@ -231,7 +231,7 @@ void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list) */ int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list) { - struct lttng_probe_desc *probe_desc; + struct lttng_ust_probe_desc *probe_desc; int i; struct cds_list_head *probe_list; @@ -239,20 +239,22 @@ int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list) CDS_INIT_LIST_HEAD(&list->head); cds_list_for_each_entry(probe_desc, probe_list, head) { for (i = 0; i < probe_desc->nr_events; i++) { + const struct lttng_ust_event_desc *event_desc = + probe_desc->event_desc[i]; struct tp_list_entry *list_entry; + /* Skip event if name is too long. */ + if (!lttng_ust_validate_event_name(event_desc)) + continue; list_entry = zmalloc(sizeof(*list_entry)); if (!list_entry) goto err_nomem; cds_list_add(&list_entry->head, &list->head); - strncpy(list_entry->tp.name, - probe_desc->event_desc[i]->name, - LTTNG_UST_ABI_SYM_NAME_LEN); - list_entry->tp.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; - if (!probe_desc->event_desc[i]->loglevel) { + lttng_ust_format_event_name(event_desc, list_entry->tp.name); + if (!event_desc->loglevel) { list_entry->tp.loglevel = TRACE_DEFAULT; } else { - list_entry->tp.loglevel = *(*probe_desc->event_desc[i]->loglevel); + list_entry->tp.loglevel = *(*event_desc->loglevel); } } } @@ -303,7 +305,7 @@ void lttng_probes_prune_field_list(struct lttng_ust_field_list *list) */ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) { - struct lttng_probe_desc *probe_desc; + struct lttng_ust_probe_desc *probe_desc; int i; struct cds_list_head *probe_list; @@ -311,7 +313,7 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) CDS_INIT_LIST_HEAD(&list->head); cds_list_for_each_entry(probe_desc, probe_list, head) { for (i = 0; i < probe_desc->nr_events; i++) { - const struct lttng_event_desc *event_desc = + const struct lttng_ust_event_desc *event_desc = probe_desc->event_desc[i]; int j; @@ -319,14 +321,14 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) /* Events without fields. */ struct tp_field_list_entry *list_entry; + /* Skip event if name is too long. */ + if (!lttng_ust_validate_event_name(event_desc)) + continue; list_entry = zmalloc(sizeof(*list_entry)); if (!list_entry) goto err_nomem; cds_list_add(&list_entry->head, &list->head); - strncpy(list_entry->field.event_name, - event_desc->name, - LTTNG_UST_ABI_SYM_NAME_LEN); - list_entry->field.event_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; + lttng_ust_format_event_name(event_desc, list_entry->field.event_name); list_entry->field.field_name[0] = '\0'; list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; if (!event_desc->loglevel) { @@ -338,47 +340,45 @@ int lttng_probes_get_field_list(struct lttng_ust_field_list *list) } for (j = 0; j < event_desc->nr_fields; j++) { - const struct lttng_event_field *event_field = - &event_desc->fields[j]; + const struct lttng_ust_event_field *event_field = + event_desc->fields[j]; struct tp_field_list_entry *list_entry; + /* Skip event if name is too long. */ + if (!lttng_ust_validate_event_name(event_desc)) + continue; list_entry = zmalloc(sizeof(*list_entry)); if (!list_entry) goto err_nomem; cds_list_add(&list_entry->head, &list->head); - strncpy(list_entry->field.event_name, - event_desc->name, - LTTNG_UST_ABI_SYM_NAME_LEN); - list_entry->field.event_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; + lttng_ust_format_event_name(event_desc, list_entry->field.event_name); strncpy(list_entry->field.field_name, event_field->name, LTTNG_UST_ABI_SYM_NAME_LEN); list_entry->field.field_name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; - switch (event_field->type.atype) { - case atype_integer: + switch (event_field->type->type) { + case lttng_ust_type_integer: list_entry->field.type = LTTNG_UST_ABI_FIELD_INTEGER; break; - case atype_string: + case lttng_ust_type_string: list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING; break; - case atype_array_nestable: - if (event_field->type.u.array_nestable.elem_type->atype != atype_integer - || event_field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) + case lttng_ust_type_array: + if (lttng_ust_get_type_array(event_field->type)->encoding == lttng_ust_string_encoding_none) list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; else list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING; break; - case atype_sequence_nestable: - if (event_field->type.u.sequence_nestable.elem_type->atype != atype_integer - || event_field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) + case lttng_ust_type_sequence: + if (lttng_ust_get_type_sequence(event_field->type)->encoding == lttng_ust_string_encoding_none) list_entry->field.type = LTTNG_UST_ABI_FIELD_OTHER; else list_entry->field.type = LTTNG_UST_ABI_FIELD_STRING; break; - case atype_float: + case lttng_ust_type_float: list_entry->field.type = LTTNG_UST_ABI_FIELD_FLOAT; break; - case atype_enum_nestable: + case lttng_ust_type_enum: list_entry->field.type = LTTNG_UST_ABI_FIELD_ENUM; break; default: