From 79697a58b5e4cfc4235b021e19681bbff7b7b0b6 Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Fri, 2 Jun 2017 09:42:20 -0400 Subject: [PATCH] always copy packet/content_size, they are overwritten by the lib when necessary MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Julien Desfossez Signed-off-by: Jérémie Galarneau --- plugins/ctf/fs-sink/write.c | 2 +- plugins/libctfcopytrace/ctfcopytrace.c | 10 +--------- plugins/libctfcopytrace/ctfcopytrace.h | 5 +---- plugins/lttng-utils/copy.c | 2 +- plugins/utils/trimmer/copy.c | 2 +- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c index cf8112fd..305638cb 100644 --- a/plugins/ctf/fs-sink/write.c +++ b/plugins/ctf/fs-sink/write.c @@ -587,7 +587,7 @@ enum bt_component_status writer_new_packet( BT_PUT(stream); writer_packet_context = ctf_copy_packet_context(writer_component->err, - packet, writer_stream, 1); + packet, writer_stream); if (!writer_packet_context) { fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c index d2c78184..a56e8146 100644 --- a/plugins/libctfcopytrace/ctfcopytrace.c +++ b/plugins/libctfcopytrace/ctfcopytrace.c @@ -512,8 +512,7 @@ end: BT_HIDDEN struct bt_ctf_field *ctf_copy_packet_context(FILE *err, struct bt_ctf_packet *packet, - struct bt_ctf_stream *writer_stream, - int skip_content_size) + struct bt_ctf_stream *writer_stream) { enum bt_component_status ret; struct bt_ctf_field *packet_context = NULL, *writer_packet_context = NULL; @@ -575,13 +574,6 @@ struct bt_ctf_field *ctf_copy_packet_context(FILE *err, __FILE__, __LINE__); goto error; } - 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; - } if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_FIELD_TYPE_ID_INTEGER) { fprintf(err, "[error] Unexpected packet context field type\n"); diff --git a/plugins/libctfcopytrace/ctfcopytrace.h b/plugins/libctfcopytrace/ctfcopytrace.h index 417b2d5d..2ca5b789 100644 --- a/plugins/libctfcopytrace/ctfcopytrace.h +++ b/plugins/libctfcopytrace/ctfcopytrace.h @@ -105,8 +105,6 @@ enum bt_component_status ctf_copy_packet_context_field(FILE *err, /* * Copy all the field values of the packet context from the packet passed in * parameter and set it to the current packet in the writer stream. - * The content_size and packet_size fields are not copied if skip_content_size - * is not 0. * * Returns BT_COMPONENT_STATUS_OK on success, and BT_COMPONENT_STATUS_ERROR on * error. @@ -114,8 +112,7 @@ enum bt_component_status ctf_copy_packet_context_field(FILE *err, BT_HIDDEN struct bt_ctf_field *ctf_copy_packet_context(FILE *err, struct bt_ctf_packet *packet, - struct bt_ctf_stream *writer_stream, - int skip_content_size); + struct bt_ctf_stream *writer_stream); /* * Create and return a copy of the event passed in parameter. The caller has to diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c index 972cb369..d06bd888 100644 --- a/plugins/lttng-utils/copy.c +++ b/plugins/lttng-utils/copy.c @@ -1054,7 +1054,7 @@ struct bt_ctf_packet *debug_info_new_packet( } writer_packet_context = ctf_copy_packet_context(debug_it->err, packet, - writer_stream, 0); + writer_stream); if (!writer_packet_context) { fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c index a76f7c05..9d0d8141 100644 --- a/plugins/utils/trimmer/copy.c +++ b/plugins/utils/trimmer/copy.c @@ -194,7 +194,7 @@ struct bt_ctf_packet *trimmer_new_packet( bt_get(writer_packet); writer_packet_context = ctf_copy_packet_context(trim_it->err, packet, - stream, 0); + stream); if (!writer_packet_context) { fprintf(trim_it->err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); -- 2.34.1