#include <babeltrace/ctf-writer/clock.h>
#include <babeltrace/ctf-ir/clock-internal.h>
#include <babeltrace/ctf-writer/event.h>
+#include <babeltrace/ctf-ir/event-class-internal.h>
#include <babeltrace/ctf-ir/event-internal.h>
-#include <babeltrace/ctf-ir/event-types-internal.h>
-#include <babeltrace/ctf-ir/event-fields-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/fields-internal.h>
#include <babeltrace/ctf-writer/stream.h>
#include <babeltrace/ctf-ir/stream-class-internal.h>
+#include <babeltrace/ctf-ir/validation-internal.h>
#include <babeltrace/ctf-ir/visitor-internal.h>
#include <babeltrace/ctf-writer/functor-internal.h>
#include <babeltrace/ctf-ir/utils.h>
int ret = 0;
struct bt_ctf_field_type *timestamp_field = NULL;
- if (!stream_class || !clock || stream_class->frozen) {
+ if (!stream_class || stream_class->frozen ||
+ !bt_ctf_clock_is_valid(clock)) {
ret = -1;
goto end;
}
int64_t event_id;
struct bt_ctf_trace *trace = NULL;
struct bt_ctf_stream_class *old_stream_class = NULL;
+ struct bt_ctf_validation_output validation_output = { 0 };
+ struct bt_ctf_field_type *packet_header_type = NULL;
+ struct bt_ctf_field_type *packet_context_type = NULL;
+ struct bt_ctf_field_type *event_header_type = NULL;
+ struct bt_ctf_field_type *stream_event_ctx_type = NULL;
+ struct bt_ctf_field_type *event_context_type = NULL;
+ struct bt_ctf_field_type *event_payload_type = NULL;
+ const enum bt_ctf_validation_flag validation_flags =
+ BT_CTF_VALIDATION_FLAG_EVENT;
if (!stream_class || !event_class) {
ret = -1;
goto end;
}
- old_stream_class = (struct bt_ctf_stream_class *) bt_object_get_parent(
- event_class);
+ old_stream_class = bt_ctf_event_class_get_stream_class(event_class);
if (old_stream_class) {
/* Event class is already associated to a stream class. */
ret = -1;
goto end;
}
- /*
- * Resolve the event's sequence length and variant tags if the
- * stream is already associated with a trace. Otherwise, this
- * validation will be performed once the stream is registered
- * to a trace.
- */
- trace = (struct bt_ctf_trace *) bt_object_get_parent(
- stream_class);
+ trace = bt_ctf_stream_class_get_trace(stream_class);
if (trace) {
- ret = bt_ctf_event_class_resolve_types(event_class,
- trace, stream_class);
+ /*
+ * If the stream class is associated with a trace, then
+ * both those objects are frozen. Also, this event class
+ * is about to be frozen.
+ *
+ * Therefore the event class must be validated here.
+ * The trace and stream class should be valid at this
+ * point.
+ */
+ assert(trace->valid);
+ assert(stream_class->valid);
+ packet_header_type =
+ bt_ctf_trace_get_packet_header_type(trace);
+ packet_context_type =
+ bt_ctf_stream_class_get_packet_context_type(
+ stream_class);
+ event_header_type =
+ bt_ctf_stream_class_get_event_header_type(stream_class);
+ stream_event_ctx_type =
+ bt_ctf_stream_class_get_event_context_type(
+ stream_class);
+ event_context_type =
+ bt_ctf_event_class_get_context_type(event_class);
+ event_payload_type =
+ bt_ctf_event_class_get_payload_type(event_class);
+ ret = bt_ctf_validate_class_types(
+ trace->environment, packet_header_type,
+ packet_context_type, event_header_type,
+ stream_event_ctx_type, event_context_type,
+ event_payload_type, trace->valid,
+ stream_class->valid, event_class->valid,
+ &validation_output, validation_flags);
+ BT_PUT(packet_header_type);
+ BT_PUT(packet_context_type);
+ BT_PUT(event_header_type);
+ BT_PUT(stream_event_ctx_type);
+ BT_PUT(event_context_type);
+ BT_PUT(event_payload_type);
+
if (ret) {
+ /*
+ * This means something went wrong during the
+ * validation process, not that the objects are
+ * invalid.
+ */
+ goto end;
+ }
+
+ if ((validation_output.valid_flags & validation_flags) !=
+ validation_flags) {
+ /* Invalid event class */
+ ret = -1;
goto end;
}
}
- /* Only set an event id if none was explicitly set before */
+ /* Only set an event ID if none was explicitly set before */
event_id = bt_ctf_event_class_get_id(event_class);
if (event_id < 0) {
if (bt_ctf_event_class_set_id(event_class,
}
bt_object_set_parent(event_class, stream_class);
+
+ if (trace) {
+ /*
+ * At this point we know that the function will be
+ * successful. Therefore we can replace the event
+ * class's field types with what's in the validation
+ * output structure and mark this event class as valid.
+ */
+ bt_ctf_validation_replace_types(NULL, NULL, event_class,
+ &validation_output, validation_flags);
+ event_class->valid = 1;
+
+ /*
+ * Put what was not moved in
+ * bt_ctf_validation_replace_types().
+ */
+ bt_ctf_validation_output_put_types(&validation_output);
+ }
+
+ /* Add to the event classes of the stream class */
g_ptr_array_add(stream_class->event_classes, event_class);
+
+ /* Freeze the event class */
bt_ctf_event_class_freeze(event_class);
if (stream_class->byte_order) {
* when the stream class was added to a trace.
*
* If not set here, this will be set when the stream
- * classe will be added to a trace.
+ * class is added to a trace.
*/
bt_ctf_event_class_set_native_byte_order(event_class,
stream_class->byte_order);
}
+
+ /* Notifiy listeners of the trace's schema modification. */
+ if (trace) {
+ struct bt_ctf_ir_element element = { .element = event_class,
+ .type = BT_CTF_IR_TYPE_EVENT_CLASS };
+
+ (void) bt_ctf_trace_element_modification(&element, trace);
+ }
end:
BT_PUT(trace);
BT_PUT(old_stream_class);
+ bt_ctf_validation_output_put_types(&validation_output);
+ assert(!packet_header_type);
+ assert(!packet_context_type);
+ assert(!event_header_type);
+ assert(!stream_event_ctx_type);
+ assert(!event_context_type);
+ assert(!event_payload_type);
+
return ret;
}
goto end;
}
if (bt_ctf_field_type_get_type_id(packet_context_type) !=
- CTF_TYPE_STRUCT) {
+ BT_CTF_TYPE_ID_STRUCT) {
/* A packet context must be a structure */
ret = -1;
goto end;
goto end;
}
if (bt_ctf_field_type_get_type_id(event_header_type) !=
- CTF_TYPE_STRUCT) {
+ BT_CTF_TYPE_ID_STRUCT) {
/* An event header must be a structure */
ret = -1;
goto end;
}
if (bt_ctf_field_type_get_type_id(event_context_type) !=
- CTF_TYPE_STRUCT) {
+ BT_CTF_TYPE_ID_STRUCT) {
/* A packet context must be a structure */
ret = -1;
goto end;
bt_put(stream_class);
}
+static
+int get_event_class_count(void *element)
+{
+ return bt_ctf_stream_class_get_event_class_count(
+ (struct bt_ctf_stream_class *) element);
+}
+
+static
+void *get_event_class(void *element, int i)
+{
+ return bt_ctf_stream_class_get_event_class(
+ (struct bt_ctf_stream_class *) element, i);
+}
+
+static
+int visit_event_class(void *element, bt_ctf_ir_visitor visitor,void *data)
+{
+ struct bt_ctf_ir_element ir_element =
+ { .element = element,
+ .type = BT_CTF_IR_TYPE_EVENT_CLASS };
+
+ return visitor(&ir_element, data);
+}
+
+int bt_ctf_stream_class_visit(struct bt_ctf_stream_class *stream_class,
+ bt_ctf_ir_visitor visitor, void *data)
+{
+ int ret;
+ struct bt_ctf_ir_element element =
+ { .element = stream_class,
+ .type = BT_CTF_IR_TYPE_STREAM_CLASS };
+
+ if (!stream_class || !visitor) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = visitor_helper(&element, get_event_class_count,
+ get_event_class,
+ visit_event_class, visitor, data);
+end:
+ return ret;
+}
+
BT_HIDDEN
void bt_ctf_stream_class_freeze(struct bt_ctf_stream_class *stream_class)
{
}
BT_HIDDEN
-int bt_ctf_stream_class_set_byte_order(struct bt_ctf_stream_class *stream_class,
- enum bt_ctf_byte_order byte_order)
+void bt_ctf_stream_class_set_byte_order(
+ struct bt_ctf_stream_class *stream_class, int byte_order)
{
- int i, ret = 0;
- int internal_byte_order;
+ int i;
- /* Note that "NATIVE" means the trace's endianness, not the host's. */
- if (!stream_class || byte_order <= BT_CTF_BYTE_ORDER_UNKNOWN ||
- byte_order > BT_CTF_BYTE_ORDER_NETWORK) {
- ret = -1;
- goto end;
- }
-
- switch (byte_order) {
- case BT_CTF_BYTE_ORDER_NETWORK:
- case BT_CTF_BYTE_ORDER_BIG_ENDIAN:
- internal_byte_order = BIG_ENDIAN;
- break;
- case BT_CTF_BYTE_ORDER_LITTLE_ENDIAN:
- internal_byte_order = LITTLE_ENDIAN;
- break;
- default:
- ret = -1;
- goto end;
- }
-
- stream_class->byte_order = internal_byte_order;
+ assert(stream_class);
+ assert(byte_order == LITTLE_ENDIAN || byte_order == BIG_ENDIAN);
+ stream_class->byte_order = byte_order;
/* Set native byte order to little or big endian */
bt_ctf_field_type_set_native_byte_order(
- stream_class->event_header_type, stream_class->byte_order);
+ stream_class->event_header_type, byte_order);
bt_ctf_field_type_set_native_byte_order(
- stream_class->packet_context_type, stream_class->byte_order);
+ stream_class->packet_context_type, byte_order);
bt_ctf_field_type_set_native_byte_order(
- stream_class->event_context_type, stream_class->byte_order);
+ stream_class->event_context_type, byte_order);
/* Set all events' native byte order */
for (i = 0; i < stream_class->event_classes->len; i++) {
- struct bt_ctf_event_class *event_class;
+ struct bt_ctf_event_class *event_class =
+ g_ptr_array_index(stream_class->event_classes, i);
- event_class = g_ptr_array_index(stream_class->event_classes, i);
bt_ctf_event_class_set_native_byte_order(event_class,
- stream_class->byte_order);
+ byte_order);
}
-end:
- return ret;
}
BT_HIDDEN