goto error;
}
- /* A stream class should always have an existing event header type */
- assert(stream_class->event_header_type);
-
/* The event class was frozen when added to its stream class */
assert(event_class->frozen);
if ((validation_output.valid_flags & validation_flags) !=
validation_flags) {
/* Invalid trace/stream class/event class */
- BT_LOGE("Invalid trace, stream class, or event class: "
+ BT_LOGW("Invalid trace, stream class, or event class: "
"valid-flags=0x%x", validation_output.valid_flags);
goto error;
}
event->event_class = bt_get(event_class);
event->clock_values = g_hash_table_new_full(g_direct_hash,
g_direct_equal, bt_put, bt_put);
- event_header =
- bt_ctf_field_create(validation_output.event_header_type);
- if (!event_header) {
- BT_LOGE_STR("Cannot create initial event header field object.");
- goto error;
+
+ if (validation_output.event_header_type) {
+ BT_LOGD("Creating initial event header field: ft-addr=%p",
+ validation_output.event_header_type);
+ event_header =
+ bt_ctf_field_create(validation_output.event_header_type);
+ if (!event_header) {
+ BT_LOGE_STR("Cannot create initial event header field object.");
+ goto error;
+ }
}
if (validation_output.stream_event_ctx_type) {
+ BT_LOGD("Creating initial stream event context field: ft-addr=%p",
+ validation_output.stream_event_ctx_type);
stream_event_context = bt_ctf_field_create(
validation_output.stream_event_ctx_type);
if (!stream_event_context) {
}
if (validation_output.event_context_type) {
+ BT_LOGD("Creating initial event context field: ft-addr=%p",
+ validation_output.event_context_type);
event_context = bt_ctf_field_create(
validation_output.event_context_type);
if (!event_context) {
}
if (validation_output.event_payload_type) {
+ BT_LOGD("Creating initial event payload field: ft-addr=%p",
+ validation_output.event_payload_type);
event_payload = bt_ctf_field_create(
validation_output.event_payload_type);
if (!event_payload) {
}
if (name) {
- ret = bt_ctf_field_structure_set_field(event->fields_payload,
- name, payload);
+ ret = bt_ctf_field_structure_set_field_by_name(
+ event->fields_payload, name, payload);
} else {
struct bt_ctf_field_type *payload_type;
* Ensure the provided header's type matches the one registered to the
* stream class.
*/
- field_type = bt_ctf_field_get_type(header);
- if (bt_ctf_field_type_compare(field_type,
- stream_class->event_header_type)) {
- BT_LOGW("Invalid parameter: header field type is different from the expected field type: "
- "event-addr=%p, event-class-name=\"%s\", "
- "event-class-id=%" PRId64,
- event,
- bt_ctf_event_class_get_name(event->event_class),
- bt_ctf_event_class_get_id(event->event_class));
- ret = -1;
- goto end;
+ if (header) {
+ field_type = bt_ctf_field_get_type(header);
+ if (bt_ctf_field_type_compare(field_type,
+ stream_class->event_header_type)) {
+ BT_LOGW("Invalid parameter: header field type is different from the expected field type: "
+ "event-addr=%p, event-class-name=\"%s\", "
+ "event-class-id=%" PRId64,
+ event,
+ bt_ctf_event_class_get_name(event->event_class),
+ bt_ctf_event_class_get_id(event->event_class));
+ ret = -1;
+ goto end;
+ }
+ } else {
+ if (stream_class->event_header_type) {
+ BT_LOGW("Invalid parameter: setting no event header but event header field type is not NULL: "
+ "event-addr=%p, event-class-name=\"%s\", "
+ "event-class-id=%" PRId64 ", "
+ "event-header-ft-addr=%p",
+ event,
+ bt_ctf_event_class_get_name(event->event_class),
+ bt_ctf_event_class_get_id(event->event_class),
+ stream_class->event_header_type);
+ ret = -1;
+ goto end;
+ }
}
bt_put(event->event_header);
goto end;
}
- field_type = bt_ctf_field_get_type(context);
- if (bt_ctf_field_type_compare(field_type,
- event->event_class->context)) {
- BT_LOGW("Invalid parameter: context field type is different from the expected field type: "
- "event-addr=%p, event-class-name=\"%s\", "
- "event-class-id=%" PRId64,
- event,
- bt_ctf_event_class_get_name(event->event_class),
- bt_ctf_event_class_get_id(event->event_class));
- ret = -1;
- goto end;
+ if (context) {
+ field_type = bt_ctf_field_get_type(context);
+
+ if (bt_ctf_field_type_compare(field_type,
+ event->event_class->context)) {
+ BT_LOGW("Invalid parameter: context field type is different from the expected field type: "
+ "event-addr=%p, event-class-name=\"%s\", "
+ "event-class-id=%" PRId64,
+ event,
+ bt_ctf_event_class_get_name(event->event_class),
+ bt_ctf_event_class_get_id(event->event_class));
+ ret = -1;
+ goto end;
+ }
+ } else {
+ if (event->event_class->context) {
+ BT_LOGW("Invalid parameter: setting no event context but event context field type is not NULL: "
+ "event-addr=%p, event-class-name=\"%s\", "
+ "event-class-id=%" PRId64 ", "
+ "event-context-ft-addr=%p",
+ event,
+ bt_ctf_event_class_get_name(event->event_class),
+ bt_ctf_event_class_get_id(event->event_class),
+ event->event_class->context);
+ ret = -1;
+ goto end;
+ }
}
bt_put(event->context_payload);
*/
assert(stream_class);
- field_type = bt_ctf_field_get_type(stream_event_context);
- if (bt_ctf_field_type_compare(field_type,
- stream_class->event_context_type)) {
- BT_LOGW("Invalid parameter: stream event context field type is different from the expected field type: "
- "event-addr=%p, event-class-name=\"%s\", "
- "event-class-id=%" PRId64,
- event,
- bt_ctf_event_class_get_name(event->event_class),
- bt_ctf_event_class_get_id(event->event_class));
- ret = -1;
- goto end;
+ if (stream_event_context) {
+ field_type = bt_ctf_field_get_type(stream_event_context);
+ if (bt_ctf_field_type_compare(field_type,
+ stream_class->event_context_type)) {
+ BT_LOGW("Invalid parameter: stream event context field type is different from the expected field type: "
+ "event-addr=%p, event-class-name=\"%s\", "
+ "event-class-id=%" PRId64,
+ event,
+ bt_ctf_event_class_get_name(event->event_class),
+ bt_ctf_event_class_get_id(event->event_class));
+ ret = -1;
+ goto end;
+ }
+ } else {
+ if (stream_class->event_context_type) {
+ BT_LOGW("Invalid parameter: setting no stream event context but stream event context field type is not NULL: "
+ "event-addr=%p, event-class-name=\"%s\", "
+ "event-class-id=%" PRId64 ", "
+ "stream-event-context-ft-addr=%p",
+ event,
+ bt_ctf_event_class_get_name(event->event_class),
+ bt_ctf_event_class_get_id(event->event_class),
+ stream_class->event_context_type);
+ ret = -1;
+ goto end;
+ }
}
bt_get(stream_event_context);
assert(event);
assert(pos);
- BT_LOGV("Serializing event: "
- "event-addr=%p, event-class-name=\"%s\", "
- "event-class-id=%" PRId64 ", pos-offset=%" PRId64 ", "
- "native-bo=%s",
- event, bt_ctf_event_class_get_name(event->event_class),
- bt_ctf_event_class_get_id(event->event_class),
- pos->offset, bt_ctf_byte_order_string(native_byte_order));
-
- BT_LOGV_STR("Serializing context field.");
+ BT_LOGV_STR("Serializing event's context field.");
if (event->context_payload) {
ret = bt_ctf_field_serialize(event->context_payload, pos,
native_byte_order);
if (ret) {
- BT_LOGE("Cannot serialize event's context field: "
+ BT_LOGW("Cannot serialize event's context field: "
"event-addr=%p, event-class-name=\"%s\", "
"event-class-id=%" PRId64,
event,
}
}
- BT_LOGV_STR("Serializing payload field.");
+ BT_LOGV_STR("Serializing event's payload field.");
if (event->fields_payload) {
ret = bt_ctf_field_serialize(event->fields_payload, pos,
native_byte_order);
if (ret) {
- BT_LOGE("Cannot serialize event's payload field: "
+ BT_LOGW("Cannot serialize event's payload field: "
"event-addr=%p, event-class-name=\"%s\", "
"event-class-id=%" PRId64,
event,