projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sink.ctf.fs: remove unusued _is_variant_field_class_tag_valid()
[babeltrace.git]
/
src
/
plugins
/
ctf
/
common
/
metadata
/
ctf-meta-translate.c
diff --git
a/src/plugins/ctf/common/metadata/ctf-meta-translate.c
b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
index b8372f245bf12e97964567cd95b20ea54585b215..c79e0d943f5dc715f9b0bd15a71a3eb39de62299 100644
(file)
--- a/
src/plugins/ctf/common/metadata/ctf-meta-translate.c
+++ b/
src/plugins/ctf/common/metadata/ctf-meta-translate.c
@@
-53,9
+53,9
@@
bt_field_class *ctf_field_class_int_to_ir(struct ctx *ctx,
bt_field_class *ir_fc;
if (fc->is_signed) {
bt_field_class *ir_fc;
if (fc->is_signed) {
- ir_fc = bt_field_class_
signed_integer
_create(ctx->ir_tc);
+ ir_fc = bt_field_class_
integer_signed
_create(ctx->ir_tc);
} else {
} else {
- ir_fc = bt_field_class_
unsigned_integer
_create(ctx->ir_tc);
+ ir_fc = bt_field_class_
integer_unsigned
_create(ctx->ir_tc);
}
BT_ASSERT(ir_fc);
}
BT_ASSERT(ir_fc);
@@
-72,9
+72,9
@@
bt_field_class *ctf_field_class_enum_to_ir(struct ctx *ctx,
uint64_t i;
if (fc->base.is_signed) {
uint64_t i;
if (fc->base.is_signed) {
- ir_fc = bt_field_class_
signed_enumeration
_create(ctx->ir_tc);
+ ir_fc = bt_field_class_
enumeration_signed
_create(ctx->ir_tc);
} else {
} else {
- ir_fc = bt_field_class_
unsigned_enumeration
_create(ctx->ir_tc);
+ ir_fc = bt_field_class_
enumeration_unsigned
_create(ctx->ir_tc);
}
BT_ASSERT(ir_fc);
}
BT_ASSERT(ir_fc);
@@
-113,11
+113,11
@@
bt_field_class *ctf_field_class_enum_to_ir(struct ctx *ctx,
}
if (fc->base.is_signed) {
}
if (fc->base.is_signed) {
- ret = bt_field_class_
signed_enumeration
_add_mapping(
+ ret = bt_field_class_
enumeration_signed
_add_mapping(
ir_fc, mapping->label->str, range_set);
BT_RANGE_SET_SIGNED_PUT_REF_AND_RESET(range_set);
} else {
ir_fc, mapping->label->str, range_set);
BT_RANGE_SET_SIGNED_PUT_REF_AND_RESET(range_set);
} else {
- ret = bt_field_class_
unsigned_enumeration
_add_mapping(
+ ret = bt_field_class_
enumeration_unsigned
_add_mapping(
ir_fc, mapping->label->str, range_set);
BT_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(range_set);
}
ir_fc, mapping->label->str, range_set);
BT_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(range_set);
}
@@
-224,17
+224,17
@@
const void *find_ir_enum_field_class_mapping_by_label(const bt_field_class *fc,
if (is_signed) {
spec_this_mapping =
if (is_signed) {
spec_this_mapping =
- bt_field_class_
signed_enumeration
_borrow_mapping_by_index_const(
+ bt_field_class_
enumeration_signed
_borrow_mapping_by_index_const(
fc, i);
this_mapping =
fc, i);
this_mapping =
- bt_field_class_
signed_enumeration
_mapping_as_mapping_const(
+ bt_field_class_
enumeration_signed
_mapping_as_mapping_const(
spec_this_mapping);
} else {
spec_this_mapping =
spec_this_mapping);
} else {
spec_this_mapping =
- bt_field_class_
unsigned_enumeration
_borrow_mapping_by_index_const(
+ bt_field_class_
enumeration_unsigned
_borrow_mapping_by_index_const(
fc, i);
this_mapping =
fc, i);
this_mapping =
- bt_field_class_
unsigned_enumeration
_mapping_as_mapping_const(
+ bt_field_class_
enumeration_unsigned
_mapping_as_mapping_const(
spec_this_mapping);
}
spec_this_mapping);
}
@@
-292,7
+292,7
@@
bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx,
* mapping name.
*/
if (fc->tag_fc->base.is_signed) {
* mapping name.
*/
if (fc->tag_fc->base.is_signed) {
- const bt_field_class_
signed_enumeration
_mapping *mapping =
+ const bt_field_class_
enumeration_signed
_mapping *mapping =
find_ir_enum_field_class_mapping_by_label(
ir_tag_fc,
named_fc->orig_name->str, true);
find_ir_enum_field_class_mapping_by_label(
ir_tag_fc,
named_fc->orig_name->str, true);
@@
-300,14
+300,14
@@
bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx,
BT_ASSERT(mapping);
range_set =
BT_ASSERT(mapping);
range_set =
- bt_field_class_
signed_enumeration
_mapping_borrow_ranges_const(
+ bt_field_class_
enumeration_signed
_mapping_borrow_ranges_const(
mapping);
BT_ASSERT(range_set);
mapping);
BT_ASSERT(range_set);
- ret = bt_field_class_variant_with_s
igned_selector
_append_option(
+ ret = bt_field_class_variant_with_s
elector_signed
_append_option(
ir_fc, named_fc->name->str,
option_ir_fc, range_set);
} else {
ir_fc, named_fc->name->str,
option_ir_fc, range_set);
} else {
- const bt_field_class_
unsigned_enumeration
_mapping *mapping =
+ const bt_field_class_
enumeration_unsigned
_mapping *mapping =
find_ir_enum_field_class_mapping_by_label(
ir_tag_fc,
named_fc->orig_name->str,
find_ir_enum_field_class_mapping_by_label(
ir_tag_fc,
named_fc->orig_name->str,
@@
-316,10
+316,10
@@
bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx,
BT_ASSERT(mapping);
range_set =
BT_ASSERT(mapping);
range_set =
- bt_field_class_
unsigned_enumeration
_mapping_borrow_ranges_const(
+ bt_field_class_
enumeration_unsigned
_mapping_borrow_ranges_const(
mapping);
BT_ASSERT(range_set);
mapping);
BT_ASSERT(range_set);
- ret = bt_field_class_variant_with_
unsigned_selector
_append_option(
+ ret = bt_field_class_variant_with_
selector_unsigned
_append_option(
ir_fc, named_fc->name->str,
option_ir_fc, range_set);
}
ir_fc, named_fc->name->str,
option_ir_fc, range_set);
}
@@
-350,7
+350,7
@@
bt_field_class *ctf_field_class_array_to_ir(struct ctx *ctx,
elem_ir_fc = ctf_field_class_to_ir(ctx, fc->base.elem_fc);
BT_ASSERT(elem_ir_fc);
elem_ir_fc = ctf_field_class_to_ir(ctx, fc->base.elem_fc);
BT_ASSERT(elem_ir_fc);
- ir_fc = bt_field_class_
static_array
_create(ctx->ir_tc, elem_ir_fc,
+ ir_fc = bt_field_class_
array_static
_create(ctx->ir_tc, elem_ir_fc,
fc->length);
BT_ASSERT(ir_fc);
bt_field_class_put_ref(elem_ir_fc);
fc->length);
BT_ASSERT(ir_fc);
bt_field_class_put_ref(elem_ir_fc);
@@
-363,9
+363,9
@@
static inline
bt_field_class *ctf_field_class_sequence_to_ir(struct ctx *ctx,
struct ctf_field_class_sequence *fc)
{
bt_field_class *ctf_field_class_sequence_to_ir(struct ctx *ctx,
struct ctf_field_class_sequence *fc)
{
- int ret;
bt_field_class *ir_fc;
bt_field_class *elem_ir_fc;
bt_field_class *ir_fc;
bt_field_class *elem_ir_fc;
+ bt_field_class *length_fc = NULL;
if (fc->base.is_text) {
ir_fc = bt_field_class_string_create(ctx->ir_tc);
if (fc->base.is_text) {
ir_fc = bt_field_class_string_create(ctx->ir_tc);
@@
-375,18
+375,19
@@
bt_field_class *ctf_field_class_sequence_to_ir(struct ctx *ctx,
elem_ir_fc = ctf_field_class_to_ir(ctx, fc->base.elem_fc);
BT_ASSERT(elem_ir_fc);
elem_ir_fc = ctf_field_class_to_ir(ctx, fc->base.elem_fc);
BT_ASSERT(elem_ir_fc);
- ir_fc = bt_field_class_dynamic_array_create(ctx->ir_tc, elem_ir_fc);
- BT_ASSERT(ir_fc);
- bt_field_class_put_ref(elem_ir_fc);
- BT_ASSERT(ir_fc);
if (fc->length_path.root != CTF_SCOPE_PACKET_HEADER &&
fc->length_path.root != CTF_SCOPE_EVENT_HEADER) {
if (fc->length_path.root != CTF_SCOPE_PACKET_HEADER &&
fc->length_path.root != CTF_SCOPE_EVENT_HEADER) {
- ret = bt_field_class_dynamic_array_set_length_field_class(
- ir_fc, borrow_ir_fc_from_field_path(ctx, &fc->length_path));
- BT_ASSERT(ret == 0);
+ length_fc = borrow_ir_fc_from_field_path(ctx, &fc->length_path);
+ BT_ASSERT(length_fc);
}
}
+ ir_fc = bt_field_class_array_dynamic_create(ctx->ir_tc, elem_ir_fc,
+ length_fc);
+ BT_ASSERT(ir_fc);
+ bt_field_class_put_ref(elem_ir_fc);
+ BT_ASSERT(ir_fc);
+
end:
return ir_fc;
}
end:
return ir_fc;
}
This page took
0.02606 seconds
and
4
git commands to generate.