static
int _lttng_field_statedump(struct ust_registry_session *session,
- const struct ustctl_field *fields, size_t nr_fields,
+ const struct lttng_ust_ctl_field *fields, size_t nr_fields,
size_t *iter_field, size_t nesting);
static inline
{
size_t i;
- for (i = 0; i < LTTNG_UST_SYM_NAME_LEN; i++) {
+ for (i = 0; i < LTTNG_UST_ABI_SYM_NAME_LEN; i++) {
switch (in[i]) {
case '.':
case '$':
int ust_metadata_enum_statedump(struct ust_registry_session *session,
const char *enum_name,
uint64_t enum_id,
- const struct ustctl_integer_type *container_type,
+ const struct lttng_ust_ctl_integer_type *container_type,
const char *field_name, size_t *iter_field, size_t nesting)
{
struct ust_registry_enum *reg_enum;
- const struct ustctl_enum_entry *entries;
+ const struct lttng_ust_ctl_enum_entry *entries;
size_t nr_entries;
int ret = 0;
size_t i;
- char identifier[LTTNG_UST_SYM_NAME_LEN];
+ char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
rcu_read_lock();
reg_enum = ust_registry_lookup_enum_by_id(session, enum_name, enum_id);
container_type->size,
container_type->alignment,
container_type->signedness,
- (container_type->encoding == ustctl_encode_none)
+ (container_type->encoding == lttng_ust_ctl_encode_none)
? "none"
- : (container_type->encoding == ustctl_encode_UTF8)
+ : (container_type->encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII",
container_type->base);
nesting++;
/* Dump all entries */
for (i = 0; i < nr_entries; i++) {
- const struct ustctl_enum_entry *entry = &entries[i];
+ const struct lttng_ust_ctl_enum_entry *entry = &entries[i];
int j, len;
ret = print_tabs(session, nesting);
}
if (entry->u.extra.options &
- USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO) {
+ LTTNG_UST_CTL_UST_ENUM_ENTRY_OPTION_IS_AUTO) {
ret = lttng_metadata_printf(session, ",\n");
if (ret) {
goto end;
int _lttng_variant_statedump(struct ust_registry_session *session,
uint32_t nr_choices, const char *tag_name,
uint32_t alignment,
- const struct ustctl_field *fields, size_t nr_fields,
+ const struct lttng_ust_ctl_field *fields, size_t nr_fields,
size_t *iter_field, size_t nesting)
{
- const struct ustctl_field *variant = &fields[*iter_field];
+ const struct lttng_ust_ctl_field *variant = &fields[*iter_field];
uint32_t i;
int ret;
- char identifier[LTTNG_UST_SYM_NAME_LEN];
+ char identifier[LTTNG_UST_ABI_SYM_NAME_LEN];
- if (variant->type.atype != ustctl_atype_variant) {
+ if (variant->type.atype != lttng_ust_ctl_atype_variant) {
ret = -EINVAL;
goto end;
}
static
int _lttng_field_statedump(struct ust_registry_session *session,
- const struct ustctl_field *fields, size_t nr_fields,
+ const struct lttng_ust_ctl_field *fields, size_t nr_fields,
size_t *iter_field, size_t nesting)
{
int ret = 0;
const char *bo_le = " byte_order = le;";
const char *bo_native = "";
const char *bo_reverse;
- const struct ustctl_field *field;
+ const struct lttng_ust_ctl_field *field;
if (*iter_field >= nr_fields) {
ret = -EOVERFLOW;
}
switch (field->type.atype) {
- case ustctl_atype_integer:
+ case lttng_ust_ctl_atype_integer:
ret = print_tabs(session, nesting);
if (ret) {
goto end;
field->type.u.integer.size,
field->type.u.integer.alignment,
field->type.u.integer.signedness,
- (field->type.u.integer.encoding == ustctl_encode_none)
+ (field->type.u.integer.encoding == lttng_ust_ctl_encode_none)
? "none"
- : (field->type.u.integer.encoding == ustctl_encode_UTF8)
+ : (field->type.u.integer.encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII",
field->type.u.integer.base,
field->name);
(*iter_field)++;
break;
- case ustctl_atype_enum:
+ case lttng_ust_ctl_atype_enum:
ret = ust_metadata_enum_statedump(session,
field->type.u.legacy.basic.enumeration.name,
field->type.u.legacy.basic.enumeration.id,
&field->type.u.legacy.basic.enumeration.container_type,
field->name, iter_field, nesting);
break;
- case ustctl_atype_float:
+ case lttng_ust_ctl_atype_float:
ret = print_tabs(session, nesting);
if (ret) {
goto end;
field->name);
(*iter_field)++;
break;
- case ustctl_atype_array:
+ case lttng_ust_ctl_atype_array:
{
- const struct ustctl_basic_type *elem_type;
+ const struct lttng_ust_ctl_basic_type *elem_type;
ret = print_tabs(session, nesting);
if (ret) {
}
elem_type = &field->type.u.legacy.array.elem_type;
/* Only integers are currently supported in arrays. */
- if (elem_type->atype != ustctl_atype_integer) {
+ if (elem_type->atype != lttng_ust_ctl_atype_integer) {
ret = -EINVAL;
goto end;
}
elem_type->u.basic.integer.size,
elem_type->u.basic.integer.alignment,
elem_type->u.basic.integer.signedness,
- (elem_type->u.basic.integer.encoding == ustctl_encode_none)
+ (elem_type->u.basic.integer.encoding == lttng_ust_ctl_encode_none)
? "none"
- : (elem_type->u.basic.integer.encoding == ustctl_encode_UTF8)
+ : (elem_type->u.basic.integer.encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII",
elem_type->u.basic.integer.base,
(*iter_field)++;
break;
}
- case ustctl_atype_array_nestable:
+ case lttng_ust_ctl_atype_array_nestable:
{
uint32_t array_length;
- const struct ustctl_field *array_nestable;
- const struct ustctl_type *elem_type;
+ const struct lttng_ust_ctl_field *array_nestable;
+ const struct lttng_ust_ctl_type *elem_type;
array_length = field->type.u.array_nestable.length;
(*iter_field)++;
elem_type = &array_nestable->type;
/* Only integers are currently supported in arrays. */
- if (elem_type->atype != ustctl_atype_integer) {
+ if (elem_type->atype != lttng_ust_ctl_atype_integer) {
ret = -EINVAL;
goto end;
}
elem_type->u.integer.size,
elem_type->u.integer.alignment,
elem_type->u.integer.signedness,
- (elem_type->u.integer.encoding == ustctl_encode_none)
+ (elem_type->u.integer.encoding == lttng_ust_ctl_encode_none)
? "none"
- : (elem_type->u.integer.encoding == ustctl_encode_UTF8)
+ : (elem_type->u.integer.encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII",
elem_type->u.integer.base,
(*iter_field)++;
break;
}
- case ustctl_atype_sequence:
+ case lttng_ust_ctl_atype_sequence:
{
- const struct ustctl_basic_type *elem_type;
- const struct ustctl_basic_type *length_type;
+ const struct lttng_ust_ctl_basic_type *elem_type;
+ const struct lttng_ust_ctl_basic_type *length_type;
elem_type = &field->type.u.legacy.sequence.elem_type;
length_type = &field->type.u.legacy.sequence.length_type;
}
/* Only integers are currently supported in sequences. */
- if (elem_type->atype != ustctl_atype_integer) {
+ if (elem_type->atype != lttng_ust_ctl_atype_integer) {
ret = -EINVAL;
goto end;
}
length_type->u.basic.integer.size,
(unsigned int) length_type->u.basic.integer.alignment,
length_type->u.basic.integer.signedness,
- (length_type->u.basic.integer.encoding == ustctl_encode_none)
+ (length_type->u.basic.integer.encoding == lttng_ust_ctl_encode_none)
? "none"
- : ((length_type->u.basic.integer.encoding == ustctl_encode_UTF8)
+ : ((length_type->u.basic.integer.encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII"),
length_type->u.basic.integer.base,
elem_type->u.basic.integer.size,
(unsigned int) elem_type->u.basic.integer.alignment,
elem_type->u.basic.integer.signedness,
- (elem_type->u.basic.integer.encoding == ustctl_encode_none)
+ (elem_type->u.basic.integer.encoding == lttng_ust_ctl_encode_none)
? "none"
- : ((elem_type->u.basic.integer.encoding == ustctl_encode_UTF8)
+ : ((elem_type->u.basic.integer.encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII"),
elem_type->u.basic.integer.base,
(*iter_field)++;
break;
}
- case ustctl_atype_sequence_nestable:
+ case lttng_ust_ctl_atype_sequence_nestable:
{
- const struct ustctl_field *sequence_nestable;
- const struct ustctl_type *elem_type;
+ const struct lttng_ust_ctl_field *sequence_nestable;
+ const struct lttng_ust_ctl_type *elem_type;
(*iter_field)++;
if (*iter_field >= nr_fields) {
elem_type = &sequence_nestable->type;
/* Only integers are currently supported in sequences. */
- if (elem_type->atype != ustctl_atype_integer) {
+ if (elem_type->atype != lttng_ust_ctl_atype_integer) {
ret = -EINVAL;
goto end;
}
elem_type->u.integer.size,
(unsigned int) elem_type->u.integer.alignment,
elem_type->u.integer.signedness,
- (elem_type->u.integer.encoding == ustctl_encode_none)
+ (elem_type->u.integer.encoding == lttng_ust_ctl_encode_none)
? "none"
- : ((elem_type->u.integer.encoding == ustctl_encode_UTF8)
+ : ((elem_type->u.integer.encoding == lttng_ust_ctl_encode_UTF8)
? "UTF8"
: "ASCII"),
elem_type->u.integer.base,
(*iter_field)++;
break;
}
- case ustctl_atype_string:
+ case lttng_ust_ctl_atype_string:
/* Default encoding is UTF8 */
ret = print_tabs(session, nesting);
if (ret) {
}
ret = lttng_metadata_printf(session,
"string%s _%s;\n",
- field->type.u.string.encoding == ustctl_encode_ASCII ?
+ field->type.u.string.encoding == lttng_ust_ctl_encode_ASCII ?
" { encoding = ASCII; }" : "",
field->name);
(*iter_field)++;
break;
- case ustctl_atype_variant:
+ case lttng_ust_ctl_atype_variant:
ret = _lttng_variant_statedump(session,
field->type.u.legacy.variant.nr_choices,
field->type.u.legacy.variant.tag_name,
goto end;
}
break;
- case ustctl_atype_variant_nestable:
+ case lttng_ust_ctl_atype_variant_nestable:
ret = _lttng_variant_statedump(session,
field->type.u.variant_nestable.nr_choices,
field->type.u.variant_nestable.tag_name,
goto end;
}
break;
- case ustctl_atype_struct:
+ case lttng_ust_ctl_atype_struct:
if (field->type.u.legacy._struct.nr_fields != 0) {
/* Currently only 0-length structures are supported. */
ret = -EINVAL;
field->name);
(*iter_field)++;
break;
- case ustctl_atype_struct_nestable:
+ case lttng_ust_ctl_atype_struct_nestable:
if (field->type.u.struct_nestable.nr_fields != 0) {
/* Currently only 0-length structures are supported. */
ret = -EINVAL;
}
(*iter_field)++;
break;
- case ustctl_atype_enum_nestable:
+ case lttng_ust_ctl_atype_enum_nestable:
{
- const struct ustctl_field *container_field;
- const struct ustctl_type *container_type;
+ const struct lttng_ust_ctl_field *container_field;
+ const struct lttng_ust_ctl_type *container_type;
(*iter_field)++;
if (*iter_field >= nr_fields) {
container_type = &container_field->type;
/* Only integers are supported as container types. */
- if (container_type->atype != ustctl_atype_integer) {
+ if (container_type->atype != lttng_ust_ctl_atype_integer) {
ret = -EINVAL;
goto end;
}
static
int _lttng_context_metadata_statedump(struct ust_registry_session *session,
size_t nr_ctx_fields,
- struct ustctl_field *ctx)
+ struct lttng_ust_ctl_field *ctx)
{
int ret = 0;
size_t i = 0;
" event.header := %s;\n"
" packet.context := struct packet_context;\n",
chan->chan_id,
- chan->header_type == USTCTL_CHANNEL_HEADER_COMPACT ?
+ chan->header_type == LTTNG_UST_CTL_CHANNEL_HEADER_COMPACT ?
"struct event_header_compact" :
"struct event_header_large");
if (ret) {