#include <babeltrace/ctf-writer/functor-internal.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/align-internal.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
#include <inttypes.h>
#include <unistd.h>
}
field_type = bt_field_get_type(field);
- assert(field_type);
+ BT_ASSERT(field_type);
if (bt_field_type_get_type_id(field_type) !=
BT_FIELD_TYPE_ID_INTEGER) {
stream->packet_header, "magic");
const uint32_t magic_value = 0xc1fc1fc1;
- assert(stream);
+ BT_ASSERT(stream);
if (!magic_field) {
/* No magic field found. Not an error, skip. */
struct bt_field *uuid_field = bt_field_structure_get_field_by_name(
stream->packet_header, "uuid");
- assert(stream);
+ BT_ASSERT(stream);
if (!uuid_field) {
/* No uuid field found. Not an error, skip. */
struct bt_field *field = bt_field_structure_get_field_by_name(
stream->packet_context, "packet_size");
- assert(stream);
+ BT_ASSERT(stream);
if (!field) {
/* No packet size field found. Not an error, skip. */
struct bt_field *field = bt_field_structure_get_field_by_name(
stream->packet_context, "content_size");
- assert(stream);
+ BT_ASSERT(stream);
if (!field) {
/* No content size field found. Not an error, skip. */
struct bt_field *field = bt_field_structure_get_field_by_name(
stream->packet_context, "events_discarded");
- assert(stream);
+ BT_ASSERT(stream);
if (!field) {
/* No discarded events count field found. Not an error, skip. */
* discarded events. We do not allow wrapping here. If it's
* valid, update the stream's current count.
*/
- if (bt_field_is_set(field)) {
+ if (bt_field_is_set_recursive(field)) {
uint64_t user_val;
ret = bt_field_unsigned_integer_get_value(field,
}
static
-int get_event_header_timestamp(struct bt_stream *stream,
- struct bt_field *event_header, uint64_t *timestamp)
+void update_clock_value(uint64_t *val, uint64_t new_val,
+ unsigned int new_val_size)
{
- int ret = 0;
- struct bt_field *timestamp_field = NULL;
- struct bt_clock_class *ts_field_mapped_clock_class = NULL;
-
- *timestamp = 0;
+ const uint64_t pow2 = 1ULL << new_val_size;
+ const uint64_t mask = pow2 - 1;
+ uint64_t val_masked;
- if (!event_header) {
- BT_LOGV_STR("Event header does not exist.");
- goto end;
- }
-
- timestamp_field = bt_field_structure_get_field_by_name(event_header,
- "timestamp");
- if (!timestamp_field) {
- BT_LOGV("Cannot get event header's `timestamp` field: "
- "event-header-field-addr=%p", event_header);
- goto end;
- }
+#ifdef BT_LOG_ENABLED_VERBOSE
+ uint64_t old_val = *val;
+#endif
- if (!bt_field_type_is_integer(timestamp_field->type)) {
- BT_LOGV("Event header's `timestamp` field's type is not an integer field type: "
- "event-header-field-addr=%p", event_header);
+ if (new_val_size == 64) {
+ *val = new_val;
goto end;
}
- ts_field_mapped_clock_class =
- bt_field_type_integer_get_mapped_clock_class(
- timestamp_field->type);
- if (!ts_field_mapped_clock_class) {
- BT_LOGV("Event header's `timestamp` field's type is not mapped to a clock class: "
- "event-header-field-addr=%p", event_header);
- goto end;
- }
+ val_masked = *val & mask;
- if (ts_field_mapped_clock_class !=
- stream->stream_class->clock->clock_class) {
- BT_LOGV("Event header's `timestamp` field's type is not mapped to the stream's clock's class: "
- "event-header-field-addr=%p", event_header);
- goto end;
+ if (new_val < val_masked) {
+ /* Wrapped once */
+ new_val |= pow2;
}
- ret = bt_field_unsigned_integer_get_value(timestamp_field,
- timestamp);
- if (ret) {
- BT_LOGW("Cannot get unsigned integer field's value: "
- "event-header-field-addr=%p, "
- "timestamp-field-addr=%p",
- event_header, timestamp_field);
- goto end;
- }
+ *val &= ~mask;
+ *val |= new_val;
end:
- bt_put(timestamp_field);
- bt_put(ts_field_mapped_clock_class);
- return ret;
+ BT_LOGV("Updated clock value: old-val=%" PRIu64 ", new-val=%" PRIu64,
+ old_val, *val);
+ return;
}
static
-int set_packet_context_timestamp_field(struct bt_stream *stream,
- const char *field_name, struct bt_event *event)
+int visit_field_update_clock_value(struct bt_field *field, uint64_t *val)
{
int ret = 0;
- struct bt_field *field = bt_field_structure_get_field_by_name(
- stream->packet_context, field_name);
- struct bt_clock_class *field_mapped_clock_class = NULL;
- uint64_t ts;
-
- assert(stream);
if (!field) {
- /* No beginning timestamp field found. Not an error, skip. */
- BT_LOGV("No field named `%s` in packet context: skipping: "
- "stream-addr=%p, stream-name=\"%s\"", field_name,
- stream, bt_stream_get_name(stream));
goto end;
}
- if (!stream->stream_class->clock) {
- BT_LOGV("Stream has no clock: skipping: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_stream_get_name(stream));
- goto end;
+ switch (bt_field_get_type_id(field)) {
+ case BT_FIELD_TYPE_ID_INTEGER:
+ {
+ struct bt_clock_class *cc =
+ bt_field_type_integer_get_mapped_clock_class(
+ field->type);
+ int val_size;
+ uint64_t uval;
+
+ if (!cc) {
+ goto end;
+ }
+
+ bt_put(cc);
+ val_size = bt_field_type_integer_get_size(field->type);
+ BT_ASSERT(val_size >= 1);
+
+ if (bt_field_type_integer_is_signed(field->type)) {
+ int64_t ival;
+
+ ret = bt_field_signed_integer_get_value(field, &ival);
+ uval = (uint64_t) ival;
+ } else {
+ ret = bt_field_unsigned_integer_get_value(field, &uval);
+ }
+
+ if (ret) {
+ /* Not set */
+ goto end;
+ }
+
+ update_clock_value(val, uval, val_size);
+ break;
}
+ case BT_FIELD_TYPE_ID_ENUM:
+ {
+ struct bt_field *int_field =
+ bt_field_enumeration_get_container(field);
- field_mapped_clock_class =
- bt_field_type_integer_get_mapped_clock_class(field->type);
- if (!field_mapped_clock_class) {
- BT_LOGV("Packet context's `%s` field's type is not mapped to a clock class: skipping: "
- "stream-addr=%p, stream-name=\"%s\", "
- "field-addr=%p, ft-addr=%p", field_name,
- stream, bt_stream_get_name(stream),
- field, field->type);
- goto end;
+ BT_ASSERT(int_field);
+ ret = visit_field_update_clock_value(int_field, val);
+ bt_put(int_field);
+ break;
}
+ case BT_FIELD_TYPE_ID_ARRAY:
+ {
+ uint64_t i;
+ int64_t len = bt_field_type_array_get_length(field->type);
- if (field_mapped_clock_class !=
- stream->stream_class->clock->clock_class) {
- BT_LOGV("Packet context's `%s` field's type is not mapped to the stream's clock's class: skipping: "
- "stream-addr=%p, stream-name=\"%s\", "
- "field-addr=%p, ft-addr=%p, "
- "ft-mapped-clock-class-addr=%p, "
- "ft-mapped-clock-class-name=\"%s\", "
- "stream-clock-class-addr=%p, "
- "stream-clock-class-name=\"%s\"",
- field_name,
- stream, bt_stream_get_name(stream),
- field, field->type,
- field_mapped_clock_class,
- bt_clock_class_get_name(field_mapped_clock_class),
- stream->stream_class->clock->clock_class,
- bt_clock_class_get_name(
- stream->stream_class->clock->clock_class));
- goto end;
+ BT_ASSERT(len >= 0);
+
+ for (i = 0; i < len; i++) {
+ struct bt_field *elem_field =
+ bt_field_array_get_field(field, i);
+
+ BT_ASSERT(elem_field);
+ ret = visit_field_update_clock_value(elem_field, val);
+ bt_put(elem_field);
+ if (ret) {
+ goto end;
+ }
+ }
+ break;
}
+ case BT_FIELD_TYPE_ID_SEQUENCE:
+ {
+ uint64_t i;
+ int64_t len = bt_field_sequence_get_int_length(field);
- if (get_event_header_timestamp(stream, event->event_header, &ts)) {
- BT_LOGW("Cannot get event's timestamp: "
- "event-header-field-addr=%p",
- event->event_header);
- ret = -1;
- goto end;
+ if (len < 0) {
+ ret = -1;
+ goto end;
+ }
+
+ for (i = 0; i < len; i++) {
+ struct bt_field *elem_field =
+ bt_field_sequence_get_field(field, i);
+
+ BT_ASSERT(elem_field);
+ ret = visit_field_update_clock_value(elem_field, val);
+ bt_put(elem_field);
+ if (ret) {
+ goto end;
+ }
+ }
+ break;
}
+ case BT_FIELD_TYPE_ID_STRUCT:
+ {
+ uint64_t i;
+ int64_t len = bt_field_type_structure_get_field_count(
+ field->type);
- ret = bt_field_unsigned_integer_set_value(field, ts);
- if (ret) {
- BT_LOGW("Cannot set packet context field's `%s` integer field's value: "
- "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64,
- field_name, stream, bt_stream_get_name(stream),
- field, stream->discarded_events);
- } else {
- BT_LOGV("Set packet context field's `%s` field's value: "
- "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64,
- field_name, stream, bt_stream_get_name(stream),
- field, stream->discarded_events);
+ BT_ASSERT(len >= 0);
+
+ for (i = 0; i < len; i++) {
+ struct bt_field *member_field =
+ bt_field_structure_get_field_by_index(field, i);
+
+ BT_ASSERT(member_field);
+ ret = visit_field_update_clock_value(member_field, val);
+ bt_put(member_field);
+ if (ret) {
+ goto end;
+ }
+ }
+ break;
+ }
+ case BT_FIELD_TYPE_ID_VARIANT:
+ {
+ struct bt_field *cur_field =
+ bt_field_variant_get_current_field(field);
+
+ if (!cur_field) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = visit_field_update_clock_value(cur_field, val);
+ bt_put(cur_field);
+ break;
+ }
+ default:
+ break;
}
end:
- bt_put(field);
- bt_put(field_mapped_clock_class);
return ret;
}
-static
-int set_packet_context_timestamp_begin(struct bt_stream *stream)
+int visit_event_update_clock_value(struct bt_event *event, uint64_t *val)
{
int ret = 0;
+ struct bt_field *field;
- if (stream->events->len == 0) {
- BT_LOGV("Current packet contains no events: skipping: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_stream_get_name(stream));
+ field = bt_event_get_header(event);
+ ret = visit_field_update_clock_value(field, val);
+ bt_put(field);
+ if (ret) {
+ BT_LOGW_STR("Cannot automatically update clock value in "
+ "event's header.");
+ goto end;
+ }
+
+ field = bt_event_get_stream_event_context(event);
+ ret = visit_field_update_clock_value(field, val);
+ bt_put(field);
+ if (ret) {
+ BT_LOGW_STR("Cannot automatically update clock value in "
+ "event's stream event context.");
+ goto end;
+ }
+
+ field = bt_event_get_event_context(event);
+ ret = visit_field_update_clock_value(field, val);
+ bt_put(field);
+ if (ret) {
+ BT_LOGW_STR("Cannot automatically update clock value in "
+ "event's context.");
goto end;
}
- ret = set_packet_context_timestamp_field(stream, "timestamp_begin",
- g_ptr_array_index(stream->events, 0));
+ field = bt_event_get_event_payload(event);
+ ret = visit_field_update_clock_value(field, val);
+ bt_put(field);
+ if (ret) {
+ BT_LOGW_STR("Cannot automatically update clock value in "
+ "event's payload.");
+ goto end;
+ }
end:
return ret;
}
static
-int set_packet_context_timestamp_end(struct bt_stream *stream)
+int set_packet_context_timestamps(struct bt_stream *stream)
{
int ret = 0;
-
- if (stream->events->len == 0) {
- BT_LOGV("Current packet contains no events: skipping: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_stream_get_name(stream));
+ uint64_t val;
+ uint64_t cur_clock_value;
+ uint64_t init_clock_value = 0;
+ struct bt_field *ts_begin_field = bt_field_structure_get_field_by_name(
+ stream->packet_context, "timestamp_begin");
+ struct bt_field *ts_end_field = bt_field_structure_get_field_by_name(
+ stream->packet_context, "timestamp_end");
+ uint64_t i;
+ int64_t len;
+
+ if (ts_begin_field && bt_field_is_set_recursive(ts_begin_field)) {
+ /* Use provided `timestamp_begin` value as starting value */
+ ret = bt_field_unsigned_integer_get_value(ts_begin_field, &val);
+ BT_ASSERT(ret == 0);
+ init_clock_value = val;
+ } else if (stream->last_ts_end != -1ULL) {
+ /* Use last packet's ending timestamp as starting value */
+ init_clock_value = stream->last_ts_end;
+ }
+
+ cur_clock_value = init_clock_value;
+
+ if (stream->last_ts_end != -1ULL &&
+ cur_clock_value < stream->last_ts_end) {
+ BT_LOGW("Packet's initial timestamp is less than previous "
+ "packet's final timestamp: "
+ "stream-addr=%p, stream-name=\"%s\", "
+ "cur-packet-ts-begin=%" PRIu64 ", "
+ "prev-packet-ts-end=%" PRIu64,
+ stream, bt_stream_get_name(stream),
+ cur_clock_value, stream->last_ts_end);
+ ret = -1;
goto end;
}
- ret = set_packet_context_timestamp_field(stream, "timestamp_end",
- g_ptr_array_index(stream->events, stream->events->len - 1));
+ /*
+ * Visit all the packet context fields, followed by all the
+ * fields of all the events, in order, updating our current
+ * clock value as we visit.
+ *
+ * While visiting the packet context fields, do not consider
+ * `timestamp_begin` and `timestamp_end` because this function's
+ * purpose is to set them anyway. Also do not consider
+ * `packet_size`, `content_size`, `events_discarded`, and
+ * `packet_seq_num` if they are not set because those are
+ * autopopulating fields.
+ */
+ len = bt_field_type_structure_get_field_count(
+ stream->packet_context->type);
+ BT_ASSERT(len >= 0);
+
+ for (i = 0; i < len; i++) {
+ const char *member_name;
+ struct bt_field *member_field;
+
+ ret = bt_field_type_structure_get_field_by_index(
+ stream->packet_context->type, &member_name, NULL, i);
+ BT_ASSERT(ret == 0);
+
+ if (strcmp(member_name, "timestamp_begin") == 0 ||
+ strcmp(member_name, "timestamp_end") == 0) {
+ continue;
+ }
+
+ member_field = bt_field_structure_get_field_by_index(
+ stream->packet_context, i);
+ BT_ASSERT(member_field);
+
+ if (strcmp(member_name, "packet_size") == 0 &&
+ !bt_field_is_set_recursive(member_field)) {
+ bt_put(member_field);
+ continue;
+ }
+
+ if (strcmp(member_name, "content_size") == 0 &&
+ !bt_field_is_set_recursive(member_field)) {
+ bt_put(member_field);
+ continue;
+ }
+
+ if (strcmp(member_name, "events_discarded") == 0 &&
+ !bt_field_is_set_recursive(member_field)) {
+ bt_put(member_field);
+ continue;
+ }
+
+ if (strcmp(member_name, "packet_seq_num") == 0 &&
+ !bt_field_is_set_recursive(member_field)) {
+ bt_put(member_field);
+ continue;
+ }
+
+ ret = visit_field_update_clock_value(member_field,
+ &cur_clock_value);
+ bt_put(member_field);
+ if (ret) {
+ BT_LOGW("Cannot automatically update clock value "
+ "in stream's packet context: "
+ "stream-addr=%p, stream-name=\"%s\", "
+ "field-name=\"%s\"",
+ stream, bt_stream_get_name(stream),
+ member_name);
+ goto end;
+ }
+ }
+
+ for (i = 0; i < stream->events->len; i++) {
+ struct bt_event *event = g_ptr_array_index(stream->events, i);
+
+ BT_ASSERT(event);
+ ret = visit_event_update_clock_value(event, &cur_clock_value);
+ if (ret) {
+ BT_LOGW("Cannot automatically update clock value "
+ "in stream's packet context: "
+ "stream-addr=%p, stream-name=\"%s\", "
+ "index=%" PRIu64 ", event-addr=%p, "
+ "event-class-id=%" PRId64 ", "
+ "event-class-name=\"%s\"",
+ stream, bt_stream_get_name(stream),
+ i, event,
+ bt_event_class_get_id(event->event_class),
+ bt_event_class_get_name(event->event_class));
+ goto end;
+ }
+ }
+
+ /*
+ * Everything is visited, thus the current clock value
+ * corresponds to the ending timestamp. Validate this value
+ * against the provided value of `timestamp_end`, if any,
+ * otherwise set it.
+ */
+ if (ts_end_field && bt_field_is_set_recursive(ts_end_field)) {
+ ret = bt_field_unsigned_integer_get_value(ts_end_field, &val);
+ BT_ASSERT(ret == 0);
+
+ if (val < cur_clock_value) {
+ BT_LOGW("Packet's final timestamp is less than "
+ "computed packet's final timestamp: "
+ "stream-addr=%p, stream-name=\"%s\", "
+ "cur-packet-ts-end=%" PRIu64 ", "
+ "computed-packet-ts-end=%" PRIu64,
+ stream, bt_stream_get_name(stream),
+ val, cur_clock_value);
+ ret = -1;
+ goto end;
+ }
+
+ stream->last_ts_end = val;
+ }
+
+ if (ts_end_field && !bt_field_is_set_recursive(ts_end_field)) {
+ ret = set_integer_field_value(ts_end_field, cur_clock_value);
+ BT_ASSERT(ret == 0);
+ stream->last_ts_end = cur_clock_value;
+ }
+
+ if (!ts_end_field) {
+ stream->last_ts_end = cur_clock_value;
+ }
+
+ /* Set `timestamp_begin` field to initial clock value */
+ if (ts_begin_field && !bt_field_is_set_recursive(ts_begin_field)) {
+ ret = set_integer_field_value(ts_begin_field, init_clock_value);
+ BT_ASSERT(ret == 0);
+ }
end:
+ bt_put(ts_begin_field);
+ bt_put(ts_end_field);
return ret;
}
static
-int auto_populate_packet_context(struct bt_stream *stream)
+int auto_populate_packet_context(struct bt_stream *stream, bool set_ts)
{
int ret = 0;
goto end;
}
- ret = set_packet_context_timestamp_begin(stream);
- if (ret) {
- BT_LOGW("Cannot set packet context's beginning timestamp field: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_stream_get_name(stream));
- goto end;
- }
-
- ret = set_packet_context_timestamp_end(stream);
- if (ret) {
- BT_LOGW("Cannot set packet context's end timestamp field: "
- "stream-addr=%p, stream-name=\"%s\"",
- stream, bt_stream_get_name(stream));
- goto end;
+ if (set_ts) {
+ ret = set_packet_context_timestamps(stream);
+ if (ret) {
+ BT_LOGW("Cannot set packet context's timestamp fields: "
+ "stream-addr=%p, stream-name=\"%s\"",
+ stream, bt_stream_get_name(stream));
+ goto end;
+ }
}
ret = set_packet_context_events_discarded(stream);
/* Use stream name's base name as prefix */
gchar *basename = g_path_get_basename(stream->name->str);
- assert(basename);
+ BT_ASSERT(basename);
if (strcmp(basename, G_DIR_SEPARATOR_S) == 0) {
g_string_assign(filename, "stream");
gchar *basename =
g_path_get_basename(stream->stream_class->name->str);
- assert(basename);
+ BT_ASSERT(basename);
if (strcmp(basename, G_DIR_SEPARATOR_S) == 0) {
g_string_assign(filename, "stream");
append_ids:
stream_class_id = bt_stream_class_get_id(stream->stream_class);
- assert(stream_class_id >= 0);
- assert(stream->id >= 0);
+ BT_ASSERT(stream_class_id >= 0);
+ BT_ASSERT(stream->id >= 0);
g_string_append_printf(filename, "-%" PRId64 "-%" PRId64,
stream_class_id, stream->id);
stream->pos.fd = fd;
}
-static
-void component_destroy_listener(struct bt_component *component, void *data)
-{
- struct bt_stream *stream = data;
-
- BT_LOGD("Component is being destroyed, stream is notified: "
- "comp-addr=%p, stream-addr=%p", component, stream);
- g_hash_table_remove(stream->comp_cur_port, component);
-}
-
static
struct bt_stream *bt_stream_create_with_id_no_check(
struct bt_stream_class *stream_class,
if (trace->is_created_by_writer) {
int fd;
+
writer = (struct bt_ctf_writer *) bt_object_get_parent(trace);
stream->id = (int64_t) stream_class->next_stream_id++;
+ stream->last_ts_end = -1ULL;
BT_LOGD("Stream object belongs to a writer's trace: "
"writer-addr=%p", writer);
- assert(writer);
+ BT_ASSERT(writer);
if (stream_class->packet_context_type) {
BT_LOGD("Creating stream's packet context field: "
} else {
/* Non-writer stream indicated by a negative FD */
set_stream_fd(stream, -1);
- stream->comp_cur_port = g_hash_table_new(g_direct_hash,
- g_direct_equal);
- if (!stream->comp_cur_port) {
- BT_LOGE_STR("Failed to allocate a GHashTable.");
- goto error;
- }
}
/* Add this stream to the trace's streams */
struct bt_stream_class *bt_stream_get_class(
struct bt_stream *stream)
{
- struct bt_stream_class *stream_class = NULL;
-
- if (!stream) {
- BT_LOGW_STR("Invalid parameter: stream is NULL.");
- goto end;
- }
-
- stream_class = stream->stream_class;
- bt_get(stream_class);
-end:
- return stream_class;
+ BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ return bt_get(stream->stream_class);
}
int bt_stream_get_discarded_events_count(
struct bt_clock_class *mapped_clock_class = NULL;
int64_t event_class_id;
- assert(event);
+ BT_ASSERT(event);
if (!event->event_header) {
goto end;
id_field = bt_field_structure_get_field_by_name(event->event_header, "id");
event_class_id = bt_event_class_get_id(event->event_class);
- if (event_class_id < 0) {
- BT_LOGE("Event class ID cannot be found");
- ret = -1;
- goto end;
- }
+ BT_ASSERT(event_class_id >= 0);
+
if (id_field && bt_field_type_is_integer(id_field->type)) {
ret = set_integer_field_value(id_field, event_class_id);
if (ret) {
* integer field.
* 2. This stream's class has a registered clock (set with
* bt_stream_class_set_clock()).
- * 3. The event header field "timestamp" has its type mapped to
- * a clock class which is also the clock class of this
- * stream's class's registered clock.
+ * 3. The "timestamp" field is not set.
*/
- timestamp_field = bt_field_structure_get_field_by_name(event->event_header,
- "timestamp");
+ timestamp_field = bt_field_structure_get_field_by_name(
+ event->event_header, "timestamp");
if (timestamp_field && stream->stream_class->clock &&
- bt_field_type_is_integer(timestamp_field->type)) {
- struct bt_clock_class *stream_class_clock_class =
- stream->stream_class->clock->clock_class;
-
+ bt_field_type_is_integer(timestamp_field->type) &&
+ !bt_field_is_set_recursive(timestamp_field)) {
mapped_clock_class =
bt_field_type_integer_get_mapped_clock_class(
timestamp_field->type);
- if (mapped_clock_class == stream_class_clock_class) {
+ if (mapped_clock_class) {
uint64_t timestamp;
+ BT_ASSERT(mapped_clock_class ==
+ stream->stream_class->clock->clock_class);
ret = bt_ctf_clock_get_value(
stream->stream_class->clock,
×tamp);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
ret = set_integer_field_value(timestamp_field,
timestamp);
if (ret) {
}
field_type = bt_field_get_type(field);
- assert(field_type);
+ BT_ASSERT(field_type);
if (bt_field_type_compare(field_type, trace->packet_header_type)) {
BT_LOGW("Invalid parameter: packet header's field type is different from the stream's packet header field type: "
member = bt_field_structure_get_field_by_name(structure, name);
if (member) {
- (void) bt_field_reset(member);
+ (void) bt_field_reset_recursive(member);
bt_put(member);
}
}
"stream-name=\"%s\", packet-index=%u", stream,
bt_stream_get_name(stream), stream->flushed_packet_count);
trace = bt_stream_class_borrow_trace(stream->stream_class);
- assert(trace);
+ BT_ASSERT(trace);
native_byte_order = bt_trace_get_native_byte_order(trace);
ret = auto_populate_packet_header(stream);
goto end;
}
- ret = auto_populate_packet_context(stream);
+ ret = auto_populate_packet_context(stream, true);
if (ret) {
BT_LOGW_STR("Cannot automatically populate the stream's packet context field.");
ret = -1;
BT_LOGV("Seeking to the next packet: pos-offset=%" PRId64,
stream->pos.offset);
bt_stream_pos_packet_seek(&stream->pos, 0, SEEK_CUR);
- assert(stream->pos.packet_size % 8 == 0);
+ BT_ASSERT(stream->pos.packet_size % 8 == 0);
if (stream->packet_header) {
BT_LOGV_STR("Serializing packet header field.");
- ret = bt_field_serialize(stream->packet_header, &stream->pos,
- native_byte_order);
+ ret = bt_field_serialize_recursive(stream->packet_header,
+ &stream->pos, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize stream's packet header field: "
"field-addr=%p", stream->packet_header);
memcpy(&packet_context_pos, &stream->pos,
sizeof(packet_context_pos));
BT_LOGV_STR("Serializing packet context field.");
- ret = bt_field_serialize(stream->packet_context,
+ ret = bt_field_serialize_recursive(stream->packet_context,
&stream->pos, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize stream's packet context field: "
/* Write event header */
if (event->event_header) {
BT_LOGV_STR("Serializing event's header field.");
- ret = bt_field_serialize(event->event_header,
+ ret = bt_field_serialize_recursive(event->event_header,
&stream->pos, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize event's header field: "
/* Write stream event context */
if (event->stream_event_context) {
BT_LOGV_STR("Serializing event's stream event context field.");
- ret = bt_field_serialize(
+ ret = bt_field_serialize_recursive(
event->stream_event_context, &stream->pos,
native_byte_order);
if (ret) {
goto end;
}
- assert(stream->pos.packet_size % 8 == 0);
+ BT_ASSERT(stream->pos.packet_size % 8 == 0);
/*
* Remove extra padding bytes.
* (e.g. when a packet is resized).
*/
packet_context_pos.base_mma = stream->pos.base_mma;
- ret = auto_populate_packet_context(stream);
+ ret = auto_populate_packet_context(stream, false);
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_field_serialize(stream->packet_context,
+ ret = bt_field_serialize_recursive(stream->packet_context,
&packet_context_pos, native_byte_order);
if (ret) {
BT_LOGW("Cannot serialize stream's packet context field: "
g_string_free(stream->name, TRUE);
}
- if (stream->comp_cur_port) {
- GHashTableIter ht_iter;
- gpointer comp_gptr, port_gptr;
-
- /*
- * Since we're destroying the stream, remove the destroy
- * listeners that it registered for each component in
- * its component-port mapping hash table. Otherwise they
- * would be called and the stream would be accessed once
- * it's freed or another stream would be accessed.
- */
- g_hash_table_iter_init(&ht_iter, stream->comp_cur_port);
-
- while (g_hash_table_iter_next(&ht_iter, &comp_gptr, &port_gptr)) {
- assert(comp_gptr);
- bt_component_remove_destroy_listener((void *) comp_gptr,
- component_destroy_listener, stream);
- }
-
- g_hash_table_destroy(stream->comp_cur_port);
- }
-
if (stream->destroy_listeners) {
g_array_free(stream->destroy_listeners, TRUE);
}
struct bt_field_type *field_type = NULL;
struct bt_field *integer;
- assert(structure);
- assert(name);
+ BT_ASSERT(structure);
+ BT_ASSERT(name);
integer = bt_field_structure_get_field_by_name(structure, name);
if (!integer) {
}
/* Make sure the payload has not already been set. */
- if (!force && bt_field_is_set(integer)) {
+ if (!force && bt_field_is_set_recursive(integer)) {
/* Payload already set, not an error */
BT_LOGV("Field's payload is already set: struct-field-addr=%p, "
"name=\"%s\", force=%d", structure, name, force);
}
field_type = bt_field_get_type(integer);
- assert(field_type);
+ BT_ASSERT(field_type);
if (bt_field_type_get_type_id(field_type) != BT_FIELD_TYPE_ID_INTEGER) {
/*
* The user most likely meant for us to populate this field
const char *bt_stream_get_name(struct bt_stream *stream)
{
- const char *name = NULL;
-
- if (!stream) {
- BT_LOGW_STR("Invalid parameter: stream is NULL.");
- goto end;
- }
-
- name = stream->name ? stream->name->str : NULL;
-
-end:
- return name;
+ BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+ return stream->name ? stream->name->str : NULL;
}
int bt_stream_is_writer(struct bt_stream *stream)
return ret;
}
-BT_HIDDEN
-void bt_stream_map_component_to_port(struct bt_stream *stream,
- struct bt_component *comp,
- struct bt_port *port)
-{
- assert(stream);
- assert(comp);
- assert(port);
- assert(stream->comp_cur_port);
-
- /*
- * Do not take a reference to the component here because we
- * don't want the component to exist as long as this stream
- * exists. Instead, keep a weak reference, but add a destroy
- * listener so that we remove this hash table entry when we know
- * the component is destroyed.
- */
- BT_LOGV("Adding component's destroy listener for stream: "
- "stream-addr=%p, stream-name=\"%s\", comp-addr=%p, "
- "comp-name=\"%s\", port-addr=%p, port-name=\"%s\"",
- stream, bt_stream_get_name(stream),
- comp, bt_component_get_name(comp), port,
- bt_port_get_name(port));
- bt_component_add_destroy_listener(comp, component_destroy_listener,
- stream);
- g_hash_table_insert(stream->comp_cur_port, comp, port);
- BT_LOGV_STR("Mapped component to port for stream.");
-}
-
-BT_HIDDEN
-struct bt_port *bt_stream_port_for_component(struct bt_stream *stream,
- struct bt_component *comp)
-{
- assert(stream);
- assert(comp);
- assert(stream->comp_cur_port);
- return g_hash_table_lookup(stream->comp_cur_port, comp);
-}
-
BT_HIDDEN
void bt_stream_add_destroy_listener(struct bt_stream *stream,
bt_stream_destroy_listener_func func, void *data)
{
struct bt_stream_destroy_listener listener;
- assert(stream);
- assert(func);
+ BT_ASSERT(stream);
+ BT_ASSERT(func);
listener.func = func;
listener.data = data;
g_array_append_val(stream->destroy_listeners, listener);
{
size_t i;
- assert(stream);
- assert(func);
+ BT_ASSERT(stream);
+ BT_ASSERT(func);
for (i = 0; i < stream->destroy_listeners->len; i++) {
struct bt_stream_destroy_listener *listener =
{
int64_t ret;
- if (!stream) {
- BT_LOGW_STR("Invalid parameter: stream is NULL.");
- ret = (int64_t) -1;
- goto end;
- }
-
+ BT_ASSERT_PRE_NON_NULL(stream, "Stream");
ret = stream->id;
if (ret < 0) {
BT_LOGV("Stream's ID is not set: addr=%p, name=\"%s\"",
stream, bt_stream_get_name(stream));
}
-end:
return ret;
}
projects / babeltrace.git / blobdiff