X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-data-copy.c;h=ac6c08ed8b02a4808842512a0d8f4ebd145b80a4;hb=8bc207afcf9695b096a0a8e8405f06b6328f069b;hp=2d27b85b0b6c5bc7d006a5288c0acfe6ef40e1b2;hpb=978237e99d511e68c5f3eb0ce9514dc8619de38b;p=babeltrace.git diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c index 2d27b85b..ac6c08ed 100644 --- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c +++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c @@ -57,6 +57,13 @@ void copy_trace_content(const bt_trace *in_trace, bt_trace *out_trace, } } + /* + * Safe to use the same value object because it's frozen at this + * point. + */ + bt_trace_set_user_attributes(out_trace, + bt_trace_borrow_user_attributes_const(in_trace)); + /* * Do not copy the trace UUID as it may be modified and should * no longer have the same UUID. @@ -83,22 +90,18 @@ void copy_trace_content(const bt_trace *in_trace, bt_trace *out_trace, BT_ASSERT(value); if (bt_value_is_signed_integer(value)) { - set_env_status = - bt_trace_set_environment_entry_integer( - out_trace, value_name, - bt_value_integer_signed_get( - value)); + set_env_status = bt_trace_set_environment_entry_integer( + out_trace, value_name, + bt_value_integer_signed_get( value)); } else if (bt_value_is_string(value)) { - set_env_status = - bt_trace_set_environment_entry_string( - out_trace, value_name, - bt_value_string_get(value)); + set_env_status = bt_trace_set_environment_entry_string( + out_trace, value_name, + bt_value_string_get(value)); } else { abort(); } - if (set_env_status != - BT_TRACE_SET_ENVIRONMENT_ENTRY_STATUS_OK) { + if (set_env_status != BT_TRACE_SET_ENVIRONMENT_ENTRY_STATUS_OK) { BT_COMP_LOGE("Cannot copy trace's environment: " "trace-addr=%p, name=\"%s\"", out_trace, trace_name); @@ -133,6 +136,12 @@ void copy_stream_content(const bt_stream *in_stream, bt_stream *out_stream, } } + /* + * Safe to use the same value object because it's frozen at this + * point. + */ + bt_stream_set_user_attributes(out_stream, + bt_stream_borrow_user_attributes_const(in_stream)); BT_COMP_LOGD("Copied content of stream: in-s-addr=%p, out-s-addr=%p", in_stream, out_stream); end: @@ -223,6 +232,10 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, bt_field_bool_set_value(out_field, bt_field_bool_get_value(in_field)); break; + case BT_FIELD_CLASS_TYPE_BIT_ARRAY: + bt_field_bit_array_set_value_as_integer(out_field, + bt_field_bit_array_get_value_as_integer(in_field)); + break; case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER: case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION: bt_field_integer_unsigned_set_value(out_field, @@ -233,9 +246,13 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, bt_field_integer_signed_set_value(out_field, bt_field_integer_signed_get_value(in_field)); break; - case BT_FIELD_CLASS_TYPE_REAL: - bt_field_real_set_value(out_field, - bt_field_real_get_value(in_field)); + case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL: + bt_field_real_single_precision_set_value(out_field, + bt_field_real_single_precision_get_value(in_field)); + break; + case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL: + bt_field_real_double_precision_set_value(out_field, + bt_field_real_double_precision_get_value(in_field)); break; case BT_FIELD_CLASS_TYPE_STRING: { @@ -278,17 +295,18 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, member); in_member_field = bt_field_structure_borrow_member_field_by_name_const( - in_field, in_member_name); + in_field, in_member_name); out_member_field = bt_field_structure_borrow_member_field_by_name( - out_field, in_member_name); + out_field, in_member_name); copy_field_content(in_member_field, out_member_field, log_level, self_comp); } break; } - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD: /* fall through */ case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: { @@ -299,7 +317,8 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, array_len = bt_field_array_get_length(in_field); - if (in_fc_type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY) { + if (in_fc_type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD || + in_fc_type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD) { set_len_status = bt_field_array_dynamic_set_length( out_field, array_len); if (set_len_status != @@ -323,7 +342,10 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, } break; } - case BT_FIELD_CLASS_TYPE_OPTION: + case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { const bt_field *in_option_field; bt_field *out_option_field; @@ -343,9 +365,9 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, break; } - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: + case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { bt_field_variant_select_option_field_by_index_status sel_opt_status; uint64_t in_selected_option_idx; @@ -354,9 +376,9 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, in_selected_option_idx = bt_field_variant_get_selected_option_field_index( - in_field); + in_field); sel_opt_status = bt_field_variant_select_option_field_by_index(out_field, - in_selected_option_idx); + in_selected_option_idx); if (sel_opt_status != BT_FIELD_VARIANT_SELECT_OPTION_FIELD_STATUS_OK) { BT_COMP_LOGE("Cannot select variant field's option field: "