BT_HIDDEN
struct bt_ctf_field *ctf_copy_packet_context(FILE *err,
struct bt_ctf_packet *packet,
- struct bt_ctf_stream *writer_stream)
+ struct bt_ctf_stream *writer_stream,
+ int skip_content_size)
{
enum bt_component_status ret;
struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL;
struct bt_ctf_field_type *struct_type = NULL, *writer_packet_context_type = NULL;
struct bt_ctf_stream_class *writer_stream_class = NULL;
struct bt_ctf_field *field = NULL;
- struct bt_ctf_field_type *field_type;
+ struct bt_ctf_field_type *field_type = NULL;
int nr_fields, i;
packet_context = bt_ctf_packet_get_context(packet);
if (!packet_context) {
- fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
- __LINE__);
- goto error;
+ goto end;
}
writer_stream_class = bt_ctf_stream_get_class(writer_stream);
__FILE__, __LINE__);
goto error;
}
- if (!strncmp(field_name, "content_size", strlen("content_size")) ||
- !strncmp(field_name, "packet_size",
- strlen("packet_size"))) {
+ if (skip_content_size &&
+ (!strncmp(field_name, "content_size", strlen("content_size")) ||
+ !strncmp(field_name, "packet_size", strlen("packet_size")))) {
BT_PUT(field_type);
BT_PUT(field);
continue;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
int field_count, i, int_ret;
struct bt_ctf_field_type *header_type = NULL;
+ enum bt_ctf_byte_order order;
field_count = bt_ctf_trace_get_environment_field_count(trace);
for (i = 0; i < field_count; i++) {
}
}
+ order = bt_ctf_trace_get_native_byte_order(trace);
+ if (order == BT_CTF_BYTE_ORDER_UNKNOWN) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+ ret = BT_COMPONENT_STATUS_ERROR;
+ goto end;
+ }
+
+ /*
+ * Only explicitly set the writer trace's native byte order if
+ * the original trace has a specific one. Otherwise leave what
+ * the CTF writer object chooses, which is the machine's native
+ * byte order.
+ */
+ if (order != BT_CTF_BYTE_ORDER_NONE) {
+ ret = bt_ctf_trace_set_native_byte_order(writer_trace, order);
+ if (ret) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+ ret = BT_COMPONENT_STATUS_ERROR;
+ goto end;
+ }
+ }
+
header_type = bt_ctf_trace_get_packet_header_type(writer_trace);
if (!header_type) {
fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);