#include <babeltrace/ctf-writer/trace-internal.h>
#include <babeltrace/ctf-writer/trace.h>
#include <babeltrace/ctf-writer/writer-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/ctf-writer/object.h>
+#include <babeltrace/ctfser-internal.h>
#include <inttypes.h>
#include <stdint.h>
#include <unistd.h>
int bt_ctf_stream_common_initialize(
struct bt_ctf_stream_common *stream,
struct bt_ctf_stream_class_common *stream_class, const char *name,
- uint64_t id, bt_object_release_func release_func)
+ uint64_t id, bt_ctf_object_release_func release_func)
{
int ret = 0;
struct bt_ctf_trace_common *trace = NULL;
- bt_object_init_shared_with_parent(&stream->base, release_func);
+ bt_ctf_object_init_shared_with_parent(&stream->base, release_func);
if (!stream_class) {
BT_LOGW_STR("Invalid parameter: stream class is NULL.");
* Acquire reference to parent since stream will become publicly
* reachable; it needs its parent to remain valid.
*/
- bt_object_set_parent(&stream->base, &trace->base);
+ bt_ctf_object_set_parent(&stream->base, &trace->base);
stream->stream_class = stream_class;
stream->id = (int64_t) id;
}
static
-void bt_ctf_stream_destroy(struct bt_object *obj);
+void bt_ctf_stream_destroy(struct bt_ctf_object *obj);
static
int try_set_structure_field_integer(struct bt_ctf_field *, char *, uint64_t);
}
}
end:
- bt_put(field_type);
+ bt_ctf_object_put_ref(field_type);
return ret;
}
magic_field, (uint64_t) magic_value);
}
end:
- bt_put(magic_field);
+ bt_ctf_object_put_ref(magic_field);
return ret;
}
}
trace = (struct bt_ctf_trace *)
- bt_object_get_parent(&stream->common.base);
+ bt_ctf_object_get_parent(&stream->common.base);
for (i = 0; i < 16; i++) {
struct bt_ctf_field *uuid_element =
ret = bt_ctf_field_integer_unsigned_set_value(
uuid_element, (uint64_t) trace->common.uuid[i]);
- bt_put(uuid_element);
+ bt_ctf_object_put_ref(uuid_element);
if (ret) {
BT_LOGW("Cannot set integer field's value (for `uuid` packet header field): "
"stream-addr=%p, stream-name=\"%s\", field-addr=%p, "
stream, bt_ctf_stream_get_name(stream), uuid_field);
end:
- bt_put(uuid_field);
- BT_PUT(trace);
+ bt_ctf_object_put_ref(uuid_field);
+ BT_CTF_OBJECT_PUT_REF_AND_RESET(trace);
return ret;
}
static
}
end:
- bt_put(stream_id_field);
+ bt_ctf_object_put_ref(stream_id_field);
return ret;
}
}
static
-int set_packet_context_packet_size(struct bt_ctf_stream *stream)
+int set_packet_context_packet_size(struct bt_ctf_stream *stream,
+ uint64_t packet_size_bits)
{
int ret = 0;
struct bt_ctf_field *field = bt_ctf_field_structure_get_field_by_name(
stream->packet_context, "packet_size");
- BT_ASSERT(stream);
-
- if (!field) {
- /* No packet size field found. Not an error, skip. */
- BT_LOGV("No field named `packet_size` in packet context: skipping: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_ctf_stream_get_name(stream));
- goto end;
- }
-
- ret = bt_ctf_field_integer_unsigned_set_value(field,
- stream->pos.packet_size);
+ ret = bt_ctf_field_integer_unsigned_set_value(field, packet_size_bits);
if (ret) {
BT_LOGW("Cannot set packet context field's `packet_size` integer field's value: "
"stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64,
stream, bt_ctf_stream_get_name(stream),
- field, stream->pos.packet_size);
+ field, packet_size_bits);
} else {
BT_LOGV("Set packet context field's `packet_size` field's value: "
"stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64,
stream, bt_ctf_stream_get_name(stream),
- field, stream->pos.packet_size);
+ field, packet_size_bits);
}
-end:
- bt_put(field);
+ bt_ctf_object_put_ref(field);
return ret;
}
static
-int set_packet_context_content_size(struct bt_ctf_stream *stream)
+int set_packet_context_content_size(struct bt_ctf_stream *stream,
+ uint64_t content_size_bits)
{
int ret = 0;
struct bt_ctf_field *field = bt_ctf_field_structure_get_field_by_name(
goto end;
}
- ret = bt_ctf_field_integer_unsigned_set_value(field,
- stream->pos.offset);
+ ret = bt_ctf_field_integer_unsigned_set_value(field, content_size_bits);
if (ret) {
BT_LOGW("Cannot set packet context field's `content_size` integer field's value: "
- "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRId64,
+ "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64,
stream, bt_ctf_stream_get_name(stream),
- field, stream->pos.offset);
+ field, content_size_bits);
} else {
BT_LOGV("Set packet context field's `content_size` field's value: "
- "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRId64,
+ "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64,
stream, bt_ctf_stream_get_name(stream),
- field, stream->pos.offset);
+ field, content_size_bits);
}
end:
- bt_put(field);
+ bt_ctf_object_put_ref(field);
return ret;
}
}
end:
- bt_put(field);
+ bt_ctf_object_put_ref(field);
return ret;
}
goto end;
}
- bt_put(cc);
+ bt_ctf_object_put_ref(cc);
val_size = bt_ctf_field_type_integer_get_size(
(void *) field_common->type);
BT_ASSERT(val_size >= 1);
BT_ASSERT(int_field);
ret = visit_field_update_clock_value(int_field, val);
- bt_put(int_field);
+ bt_ctf_object_put_ref(int_field);
break;
}
case BT_CTF_FIELD_TYPE_ID_ARRAY:
BT_ASSERT(elem_field);
ret = visit_field_update_clock_value(elem_field, val);
- bt_put(elem_field);
+ bt_ctf_object_put_ref(elem_field);
if (ret) {
goto end;
}
BT_ASSERT(elem_field);
ret = visit_field_update_clock_value(elem_field, val);
- bt_put(elem_field);
+ bt_ctf_object_put_ref(elem_field);
if (ret) {
goto end;
}
BT_ASSERT(member_field);
ret = visit_field_update_clock_value(member_field, val);
- bt_put(member_field);
+ bt_ctf_object_put_ref(member_field);
if (ret) {
goto end;
}
}
ret = visit_field_update_clock_value(cur_field, val);
- bt_put(cur_field);
+ bt_ctf_object_put_ref(cur_field);
break;
}
default:
field = bt_ctf_event_get_header(event);
ret = visit_field_update_clock_value(field, val);
- bt_put(field);
+ bt_ctf_object_put_ref(field);
if (ret) {
BT_LOGW_STR("Cannot automatically update clock value in "
"event's header.");
field = bt_ctf_event_get_stream_event_context(event);
ret = visit_field_update_clock_value(field, val);
- bt_put(field);
+ bt_ctf_object_put_ref(field);
if (ret) {
BT_LOGW_STR("Cannot automatically update clock value in "
"event's stream event context.");
field = bt_ctf_event_get_context(event);
ret = visit_field_update_clock_value(field, val);
- bt_put(field);
+ bt_ctf_object_put_ref(field);
if (ret) {
BT_LOGW_STR("Cannot automatically update clock value in "
"event's context.");
field = bt_ctf_event_get_payload_field(event);
ret = visit_field_update_clock_value(field, val);
- bt_put(field);
+ bt_ctf_object_put_ref(field);
if (ret) {
BT_LOGW_STR("Cannot automatically update clock value in "
"event's payload.");
if (strcmp(member_name, "packet_size") == 0 &&
!bt_ctf_field_is_set_recursive(member_field)) {
- bt_put(member_field);
+ bt_ctf_object_put_ref(member_field);
continue;
}
if (strcmp(member_name, "content_size") == 0 &&
!bt_ctf_field_is_set_recursive(member_field)) {
- bt_put(member_field);
+ bt_ctf_object_put_ref(member_field);
continue;
}
if (strcmp(member_name, "events_discarded") == 0 &&
!bt_ctf_field_is_set_recursive(member_field)) {
- bt_put(member_field);
+ bt_ctf_object_put_ref(member_field);
continue;
}
if (strcmp(member_name, "packet_seq_num") == 0 &&
!bt_ctf_field_is_set_recursive(member_field)) {
- bt_put(member_field);
+ bt_ctf_object_put_ref(member_field);
continue;
}
ret = visit_field_update_clock_value(member_field,
&cur_clock_value);
- bt_put(member_field);
+ bt_ctf_object_put_ref(member_field);
if (ret) {
BT_LOGW("Cannot automatically update clock value "
"in stream's packet context: "
}
end:
- bt_put(ts_begin_field);
- bt_put(ts_end_field);
+ bt_ctf_object_put_ref(ts_begin_field);
+ bt_ctf_object_put_ref(ts_end_field);
return ret;
}
static
-int auto_populate_packet_context(struct bt_ctf_stream *stream, bool set_ts)
+int auto_populate_packet_context(struct bt_ctf_stream *stream, bool set_ts,
+ uint64_t packet_size_bits, uint64_t content_size_bits)
{
int ret = 0;
goto end;
}
- ret = set_packet_context_packet_size(stream);
+ ret = set_packet_context_packet_size(stream, packet_size_bits);
if (ret) {
BT_LOGW("Cannot set packet context's packet size field: "
"stream-addr=%p, stream-name=\"%s\"",
goto end;
}
- ret = set_packet_context_content_size(stream);
+ ret = set_packet_context_content_size(stream, content_size_bits);
if (ret) {
BT_LOGW("Cannot set packet context's content size field: "
"stream-addr=%p, stream-name=\"%s\"",
static
void release_event(struct bt_ctf_event *event)
{
- if (bt_object_get_ref_count(&event->common.base)) {
+ if (bt_ctf_object_get_ref_count(&event->common.base)) {
/*
* The event is being orphaned, but it must guarantee the
* existence of its event class for the duration of its
* lifetime.
*/
- bt_get(event->common.class);
- BT_PUT(event->common.base.parent);
+ bt_ctf_object_get_ref(event->common.class);
+ BT_CTF_OBJECT_PUT_REF_AND_RESET(event->common.base.parent);
} else {
- bt_object_try_spec_release(&event->common.base);
+ bt_ctf_object_try_spec_release(&event->common.base);
}
}
int create_stream_file(struct bt_ctf_writer *writer,
struct bt_ctf_stream *stream)
{
- int fd;
+ int ret = 0;
GString *filename = g_string_new(NULL);
int64_t stream_class_id;
char *file_path = NULL;
file_path = g_build_filename(writer->path->str, filename->str, NULL);
if (file_path == NULL) {
- fd = -1;
+ ret = -1;
goto end;
}
- fd = open(file_path,
- O_RDWR | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+ ret = bt_ctfser_init(&stream->ctfser, file_path);
g_free(file_path);
- if (fd < 0) {
- BT_LOGW_ERRNO("Failed to open stream file for writing",
- ": file_path=\"%s\", filename=\"%s\", ret=%d",
- file_path, filename->str, fd);
+ if (ret) {
+ /* bt_ctfser_init() logs errors */
goto end;
}
BT_LOGD("Created stream file for writing: "
"stream-addr=%p, stream-name=\"%s\", "
- "filename=\"%s\", fd=%d", stream, bt_ctf_stream_get_name(stream),
- filename->str, fd);
+ "filename=\"%s\"", stream, bt_ctf_stream_get_name(stream),
+ filename->str);
end:
g_string_free(filename, TRUE);
- return fd;
-}
-
-static
-void set_stream_fd(struct bt_ctf_stream *stream, int fd)
-{
- (void) bt_ctf_stream_pos_init(&stream->pos, fd, O_RDWR);
- stream->pos.fd = fd;
+ return ret;
}
BT_HIDDEN
goto error;
}
- stream->pos.fd = -1;
writer = (struct bt_ctf_writer *)
- bt_object_get_parent(&trace->common.base);
+ bt_ctf_object_get_parent(&trace->common.base);
stream->last_ts_end = -1ULL;
BT_LOGD("CTF writer stream object belongs writer's trace: "
"writer-addr=%p", writer);
goto error;
}
- set_stream_fd(stream, fd);
-
/* Freeze the writer */
BT_LOGD_STR("Freezing stream's CTF writer.");
bt_ctf_writer_freeze(writer);
goto end;
error:
- BT_PUT(stream);
+ BT_CTF_OBJECT_PUT_REF_AND_RESET(stream);
end:
- bt_put(writer);
+ bt_ctf_object_put_ref(writer);
return stream;
}
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW("Invalid parameter: stream is not a CTF writer stream: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_ctf_stream_get_name(stream));
- ret = -1;
- goto end;
- }
-
*count = (uint64_t) stream->discarded_events;
end:
}
end:
- bt_put(events_discarded_field);
+ bt_ctf_object_put_ref(events_discarded_field);
return ret;
}
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW_STR("Invalid parameter: stream is not a CTF writer stream.");
- goto end;
- }
-
events_discarded_field = bt_ctf_field_structure_get_field_by_name(
stream->packet_context, "events_discarded");
if (!events_discarded_field) {
stream, bt_ctf_stream_get_name(stream), event_count);
end:
- bt_put(events_discarded_field);
+ bt_ctf_object_put_ref(events_discarded_field);
}
static int auto_populate_event_header(struct bt_ctf_stream *stream,
stream, bt_ctf_stream_get_name(stream), event);
end:
- bt_put(id_field);
- bt_put(timestamp_field);
- bt_put(mapped_clock_class);
+ bt_ctf_object_put_ref(id_field);
+ bt_ctf_object_put_ref(timestamp_field);
+ bt_ctf_object_put_ref(mapped_clock_class);
return ret;
}
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW_STR("Invalid parameter: stream is not a CTF writer stream.");
- ret = -1;
- goto end;
- }
-
BT_LOGV("Appending event to stream: "
"stream-addr=%p, stream-name=\"%s\", event-addr=%p, "
"event-class-name=\"%s\", event-class-id=%" PRId64,
goto end;
}
- bt_object_set_parent(&event->common.base, &stream->common.base);
+ bt_ctf_object_set_parent(&event->common.base, &stream->common.base);
BT_LOGV_STR("Automatically populating the header of the event to append.");
ret = auto_populate_event_header(stream, event);
if (ret) {
* longer needed.
*/
BT_LOGV_STR("Putting the event's class.");
- bt_put(event->common.class);
+ bt_ctf_object_put_ref(event->common.class);
BT_LOGV("Appended event to stream: "
"stream-addr=%p, stream-name=\"%s\", event-addr=%p, "
"event-class-name=\"%s\", event-class-id=%" PRId64,
* Orphan the event; we were not successful in associating it to
* a stream.
*/
- bt_object_set_parent(&event->common.base, NULL);
+ bt_ctf_object_set_parent(&event->common.base, NULL);
return ret;
}
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW("Invalid parameter: stream is not a CTF writer stream: "
- "stream-addr=%p, stream-name=\"%s\"", stream,
- bt_ctf_stream_get_name(stream));
- goto end;
- }
-
packet_context = stream->packet_context;
if (packet_context) {
- bt_get(packet_context);
+ bt_ctf_object_get_ref(packet_context);
}
end:
return packet_context;
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW_STR("Invalid parameter: stream is not a CTF writer stream.");
- ret = -1;
- goto end;
- }
-
field_type = bt_ctf_field_get_type(field);
if (bt_ctf_field_type_common_compare((void *) field_type,
stream->common.stream_class->packet_context_field_type)) {
goto end;
}
- bt_put(field_type);
- bt_put(stream->packet_context);
- stream->packet_context = bt_get(field);
+ bt_ctf_object_put_ref(field_type);
+ bt_ctf_object_put_ref(stream->packet_context);
+ stream->packet_context = bt_ctf_object_get_ref(field);
BT_LOGV("Set stream's packet context field: "
"stream-addr=%p, stream-name=\"%s\", "
"packet-context-field-addr=%p",
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW("Invalid parameter: stream is not a CTF writer stream: "
- "stream-addr=%p, stream-name=\"%s\"", stream,
- bt_ctf_stream_get_name(stream));
- goto end;
- }
-
packet_header = stream->packet_header;
if (packet_header) {
- bt_get(packet_header);
+ bt_ctf_object_get_ref(packet_header);
}
end:
return packet_header;
goto end;
}
- if (stream->pos.fd < 0) {
- BT_LOGW_STR("Invalid parameter: stream is not a CTF writer stream.");
- ret = -1;
- goto end;
- }
-
trace = (struct bt_ctf_trace *)
- bt_object_get_parent(&stream->common.base);
+ bt_ctf_object_get_parent(&stream->common.base);
if (!field) {
if (trace->common.packet_header_field_type) {
}
skip_validation:
- bt_put(stream->packet_header);
- stream->packet_header = bt_get(field);
+ bt_ctf_object_put_ref(stream->packet_header);
+ stream->packet_header = bt_ctf_object_get_ref(field);
BT_LOGV("Set stream's packet header field: "
"stream-addr=%p, stream-name=\"%s\", "
"packet-header-field-addr=%p",
stream, bt_ctf_stream_get_name(stream), field);
end:
- BT_PUT(trace);
- bt_put(field_type);
+ BT_CTF_OBJECT_PUT_REF_AND_RESET(trace);
+ bt_ctf_object_put_ref(field_type);
return ret;
}
member = bt_ctf_field_structure_get_field_by_name(structure, name);
if (member) {
bt_ctf_field_common_reset_recursive((void *) member);
- bt_put(member);
+ bt_ctf_object_put_ref(member);
}
}
{
int ret = 0;
size_t i;
- struct bt_ctf_stream_pos packet_context_pos;
+ uint64_t packet_context_offset_bits;
struct bt_ctf_trace *trace;
enum bt_ctf_byte_order native_byte_order;
bool has_packet_size = false;
+ uint64_t packet_size_bits = 0;
+ uint64_t content_size_bits = 0;
if (!stream) {
BT_LOGW_STR("Invalid parameter: stream is NULL.");
goto end_no_stream;
}
- if (stream->pos.fd < 0) {
- BT_LOGW_STR("Invalid parameter: stream is not a CTF writer stream.");
- ret = -1;
- goto end;
- }
-
if (stream->packet_context) {
struct bt_ctf_field *packet_size_field;
packet_size_field = bt_ctf_field_structure_get_field_by_name(
stream->packet_context, "packet_size");
has_packet_size = (packet_size_field != NULL);
- bt_put(packet_size_field);
+ bt_ctf_object_put_ref(packet_size_field);
}
if (stream->flushed_packet_count == 1) {
goto end;
}
- ret = auto_populate_packet_context(stream, true);
+ /* Initialize packet/content sizes to `0`; we will overwrite later */
+ ret = auto_populate_packet_context(stream, true, 0, 0);
if (ret) {
BT_LOGW_STR("Cannot automatically populate the stream's packet context field.");
ret = -1;
goto end;
}
- /* mmap the next packet */
- BT_LOGV("Seeking to the next packet: pos-offset=%" PRId64,
- stream->pos.offset);
- bt_ctf_stream_pos_packet_seek(&stream->pos, 0, SEEK_CUR);
- BT_ASSERT(stream->pos.packet_size % 8 == 0);
+ ret = bt_ctfser_open_packet(&stream->ctfser);
+ if (ret) {
+ /* bt_ctfser_open_packet() logs errors */
+ ret = -1;
+ goto end;
+ }
if (stream->packet_header) {
- BT_LOGV_STR("Serializing packet header field.");
+ BT_LOGV_STR("Serializing packet header field (initial).");
ret = bt_ctf_field_serialize_recursive(stream->packet_header,
- &stream->pos, native_byte_order);
+ &stream->ctfser, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize stream's packet header field: "
"field-addr=%p", stream->packet_header);
}
if (stream->packet_context) {
+ /* Save packet context's position to overwrite it later */
+ packet_context_offset_bits =
+ bt_ctfser_get_offset_in_current_packet_bits(
+ &stream->ctfser);
+
/* Write packet context */
- memcpy(&packet_context_pos, &stream->pos,
- sizeof(packet_context_pos));
- BT_LOGV_STR("Serializing packet context field.");
+ BT_LOGV_STR("Serializing packet context field (initial).");
ret = bt_ctf_field_serialize_recursive(stream->packet_context,
- &stream->pos, native_byte_order);
+ &stream->ctfser, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize stream's packet context field: "
"field-addr=%p", stream->packet_context);
BT_LOGV("Serializing event: index=%zu, event-addr=%p, "
"event-class-name=\"%s\", event-class-id=%" PRId64 ", "
- "pos-offset=%" PRId64 ", packet-size=%" PRIu64,
+ "ser-offset=%" PRIu64,
i, event, bt_ctf_event_class_get_name(event_class),
bt_ctf_event_class_get_id(event_class),
- stream->pos.offset, stream->pos.packet_size);
+ bt_ctfser_get_offset_in_current_packet_bits(
+ &stream->ctfser));
/* Write event header */
if (event->common.header_field) {
BT_LOGV_STR("Serializing event's header field.");
ret = bt_ctf_field_serialize_recursive(
(void *) event->common.header_field->field,
- &stream->pos, native_byte_order);
+ &stream->ctfser, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize event's header field: "
"field-addr=%p",
BT_LOGV_STR("Serializing event's stream event context field.");
ret = bt_ctf_field_serialize_recursive(
(void *) event->common.stream_event_context_field,
- &stream->pos, native_byte_order);
+ &stream->ctfser, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize event's stream event context field: "
"field-addr=%p",
}
/* Write event content */
- ret = bt_ctf_event_serialize(event,
- &stream->pos, native_byte_order);
+ ret = bt_ctf_event_serialize(event, &stream->ctfser,
+ native_byte_order);
if (ret) {
/* bt_ctf_event_serialize() logs errors */
goto end;
}
}
- if (!has_packet_size && stream->pos.offset % 8 != 0) {
+ content_size_bits = bt_ctfser_get_offset_in_current_packet_bits(
+ &stream->ctfser);
+
+ if (!has_packet_size && content_size_bits % 8 != 0) {
BT_LOGW("Stream's packet context field type has no `packet_size` field, "
"but current content size is not a multiple of 8 bits: "
- "content-size=%" PRId64 ", "
+ "content-size=%" PRIu64 ", "
"packet-size=%" PRIu64,
- stream->pos.offset,
- stream->pos.packet_size);
+ content_size_bits,
+ packet_size_bits);
ret = -1;
goto end;
}
- BT_ASSERT(stream->pos.packet_size % 8 == 0);
-
- /*
- * Remove extra padding bytes.
- */
- stream->pos.packet_size = (stream->pos.offset + 7) & ~7;
+ /* Set packet size; make it a multiple of 8 */
+ packet_size_bits = (content_size_bits + 7) & ~UINT64_C(7);
if (stream->packet_context) {
/*
- * The whole packet is serialized at this point. Make sure that,
- * if `packet_size` is missing, the current content size is
- * equal to the current packet size.
+ * The whole packet is serialized at this point. Make
+ * sure that, if `packet_size` is missing, the current
+ * content size is equal to the current packet size.
*/
- struct bt_ctf_field *field = bt_ctf_field_structure_get_field_by_name(
- stream->packet_context, "content_size");
+ struct bt_ctf_field *field =
+ bt_ctf_field_structure_get_field_by_name(
+ stream->packet_context, "content_size");
- bt_put(field);
+ bt_ctf_object_put_ref(field);
if (!field) {
- if (stream->pos.offset != stream->pos.packet_size) {
+ if (content_size_bits != packet_size_bits) {
BT_LOGW("Stream's packet context's `content_size` field is missing, "
"but current packet's content size is not equal to its packet size: "
- "content-size=%" PRId64 ", "
+ "content-size=%" PRIu64 ", "
"packet-size=%" PRIu64,
- stream->pos.offset,
- stream->pos.packet_size);
+ bt_ctfser_get_offset_in_current_packet_bits(&stream->ctfser),
+ packet_size_bits);
ret = -1;
goto end;
}
* Overwrite the packet context now that the stream
* position's packet and content sizes have the correct
* values.
- *
- * Copy base_mma as the packet may have been remapped
- * (e.g. when a packet is resized).
*/
- packet_context_pos.base_mma = stream->pos.base_mma;
- ret = auto_populate_packet_context(stream, false);
+ bt_ctfser_set_offset_in_current_packet_bits(&stream->ctfser,
+ packet_context_offset_bits);
+ ret = auto_populate_packet_context(stream, false,
+ packet_size_bits, content_size_bits);
if (ret) {
BT_LOGW_STR("Cannot automatically populate the stream's packet context field.");
ret = -1;
BT_LOGV("Rewriting (serializing) packet context field.");
ret = bt_ctf_field_serialize_recursive(stream->packet_context,
- &packet_context_pos, native_byte_order);
+ &stream->ctfser, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize stream's packet context field: "
"field-addr=%p", stream->packet_context);
g_ptr_array_set_size(stream->events, 0);
stream->flushed_packet_count++;
- stream->size += stream->pos.packet_size / CHAR_BIT;
+ bt_ctfser_close_current_packet(&stream->ctfser, packet_size_bits / 8);
end:
/* Reset automatically-set fields. */
reset_structure_field(stream->packet_context, "events_discarded");
}
- if (ret < 0) {
- /*
- * We failed to write the packet. Its size is therefore set to 0
- * to ensure the next mapping is done in the same place rather
- * than advancing by "stream->pos.packet_size", which would
- * leave a corrupted packet in the trace.
- */
- stream->pos.packet_size = 0;
- } else {
- BT_LOGV("Flushed stream's current packet: content-size=%" PRId64 ", "
- "packet-size=%" PRIu64,
- stream->pos.offset, stream->pos.packet_size);
+ if (ret == 0) {
+ BT_LOGV("Flushed stream's current packet: "
+ "content-size=%" PRIu64 ", packet-size=%" PRIu64,
+ content_size_bits, packet_size_bits);
}
end_no_stream:
}
static
-void bt_ctf_stream_destroy(struct bt_object *obj)
+void bt_ctf_stream_destroy(struct bt_ctf_object *obj)
{
struct bt_ctf_stream *stream = (void *) obj;
stream, bt_ctf_stream_get_name(stream));
bt_ctf_stream_common_finalize(BT_CTF_TO_COMMON(stream));
- (void) bt_ctf_stream_pos_fini(&stream->pos);
-
- if (stream->pos.fd >= 0) {
- int ret;
-
- /*
- * Truncate the file's size to the minimum required to fit the
- * last packet as we might have grown it too much on the last
- * mmap.
- */
- do {
- ret = ftruncate(stream->pos.fd, stream->size);
- } while (ret == -1 && errno == EINTR);
- if (ret) {
- BT_LOGE_ERRNO("Failed to truncate stream file",
- ": ret=%d, size=%" PRIu64,
- ret, (uint64_t) stream->size);
- }
-
- if (close(stream->pos.fd)) {
- BT_LOGE_ERRNO("Failed to close stream file",
- ": ret=%d", ret);
- }
- }
+ bt_ctfser_fini(&stream->ctfser);
if (stream->events) {
BT_LOGD_STR("Putting events.");
}
BT_LOGD_STR("Putting packet header field.");
- bt_put(stream->packet_header);
+ bt_ctf_object_put_ref(stream->packet_header);
BT_LOGD_STR("Putting packet context field.");
- bt_put(stream->packet_context);
+ bt_ctf_object_put_ref(stream->packet_context);
g_free(stream);
}
}
ret = !ret ? 1 : ret;
end:
- bt_put(integer);
- bt_put(field_type);
+ bt_ctf_object_put_ref(integer);
+ bt_ctf_object_put_ref(field_type);
return ret;
}
struct bt_ctf_stream_class *bt_ctf_stream_get_class(
struct bt_ctf_stream *stream)
{
- return bt_get(bt_ctf_stream_common_borrow_class(BT_CTF_TO_COMMON(stream)));
+ return bt_ctf_object_get_ref(bt_ctf_stream_common_borrow_class(BT_CTF_TO_COMMON(stream)));
}
const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream)
projects / babeltrace.git / blobdiff