*/
#include <babeltrace/ctf-writer/clock.h>
-#include <babeltrace/ctf-ir/clock-internal.h>
+#include <babeltrace/ctf-writer/clock-internal.h>
+#include <babeltrace/ctf-ir/clock-class-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>
+#include <babeltrace/ref.h>
#include <babeltrace/compiler.h>
#include <babeltrace/align.h>
+#include <babeltrace/endian.h>
static
-void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_stream_class_destroy(struct bt_object *obj);
static
-int init_event_header(struct bt_ctf_stream_class *stream_class,
- enum bt_ctf_byte_order byte_order);
+int init_event_header(struct bt_ctf_stream_class *stream_class);
static
-int init_packet_context(struct bt_ctf_stream_class *stream_class,
- enum bt_ctf_byte_order byte_order);
+int init_packet_context(struct bt_ctf_stream_class *stream_class);
struct bt_ctf_stream_class *bt_ctf_stream_class_create(const char *name)
{
int ret;
struct bt_ctf_stream_class *stream_class = NULL;
- if (!name || !strlen(name) || bt_ctf_validate_identifier(name)) {
+ if (name && bt_ctf_validate_identifier(name)) {
goto error;
}
stream_class->name = g_string_new(name);
stream_class->event_classes = g_ptr_array_new_with_free_func(
- (GDestroyNotify)bt_ctf_event_class_put);
+ (GDestroyNotify) bt_object_release);
if (!stream_class->event_classes) {
- goto error_destroy;
+ goto error;
+ }
+
+ stream_class->event_classes_ht = g_hash_table_new_full(g_int64_hash,
+ g_int64_equal, g_free, NULL);
+
+ ret = init_event_header(stream_class);
+ if (ret) {
+ goto error;
}
- ret = init_packet_context(stream_class, BT_CTF_BYTE_ORDER_NATIVE);
+ ret = init_packet_context(stream_class);
if (ret) {
- goto error_destroy;
+ goto error;
}
- bt_ctf_ref_init(&stream_class->ref_count);
+ bt_object_init(stream_class, bt_ctf_stream_class_destroy);
return stream_class;
-error_destroy:
- bt_ctf_stream_class_destroy(&stream_class->ref_count);
- stream_class = NULL;
error:
+ BT_PUT(stream_class);
return stream_class;
}
+struct bt_ctf_trace *bt_ctf_stream_class_get_trace(
+ struct bt_ctf_stream_class *stream_class)
+{
+ return (struct bt_ctf_trace *) bt_object_get_parent(
+ stream_class);
+}
+
const char *bt_ctf_stream_class_get_name(
struct bt_ctf_stream_class *stream_class)
{
return name;
}
+int bt_ctf_stream_class_set_name(struct bt_ctf_stream_class *stream_class,
+ const char *name)
+{
+ int ret = 0;
+
+ if (!stream_class || stream_class->frozen) {
+ ret = -1;
+ goto end;
+ }
+
+ g_string_assign(stream_class->name, name);
+end:
+ return ret;
+}
+
struct bt_ctf_clock *bt_ctf_stream_class_get_clock(
struct bt_ctf_stream_class *stream_class)
{
goto end;
}
- clock = stream_class->clock;
- bt_ctf_clock_get(clock);
+ clock = bt_get(stream_class->clock);
end:
return clock;
}
struct bt_ctf_clock *clock)
{
int ret = 0;
+ struct bt_ctf_field_type *timestamp_field = NULL;
if (!stream_class || !clock || stream_class->frozen) {
ret = -1;
goto end;
}
- if (stream_class->clock) {
- bt_ctf_clock_put(stream_class->clock);
+ /*
+ * Look for a "timestamp" integer field type in the stream
+ * class's event header field type and map the stream class's
+ * clock's class to that field type if there's no current
+ * mapping.
+ */
+ timestamp_field = bt_ctf_field_type_structure_get_field_type_by_name(
+ stream_class->event_header_type, "timestamp");
+ if (timestamp_field) {
+ struct bt_ctf_clock_class *mapped_clock_class =
+ bt_ctf_field_type_integer_get_mapped_clock_class(
+ timestamp_field);
+
+ if (!mapped_clock_class) {
+ ret = bt_ctf_field_type_integer_set_mapped_clock_class(
+ timestamp_field, clock->clock_class);
+ if (ret) {
+ goto end;
+ }
+ }
+
+ BT_PUT(mapped_clock_class);
}
- stream_class->clock = clock;
- bt_ctf_clock_get(clock);
+ /* Replace the current clock of this stream class. */
+ bt_put(stream_class->clock);
+ stream_class->clock = bt_get(clock);
+
end:
+ bt_put(timestamp_field);
return ret;
}
return ret;
}
+BT_HIDDEN
+int _bt_ctf_stream_class_set_id(
+ struct bt_ctf_stream_class *stream_class, uint32_t id)
+{
+ stream_class->id = id;
+ stream_class->id_set = 1;
+ return 0;
+}
+
+struct event_class_set_stream_id_data {
+ uint32_t stream_id;
+ int ret;
+};
+
+static
+void event_class_set_stream_id(gpointer event_class, gpointer data)
+{
+ struct event_class_set_stream_id_data *typed_data = data;
+
+ typed_data->ret |= bt_ctf_event_class_set_stream_id(event_class,
+ typed_data->stream_id);
+}
+
+BT_HIDDEN
+int bt_ctf_stream_class_set_id_no_check(
+ struct bt_ctf_stream_class *stream_class, uint32_t id)
+{
+ int ret = 0;
+ struct event_class_set_stream_id_data data =
+ { .stream_id = id, .ret = 0 };
+
+ /*
+ * Make sure all event classes have their "stream_id" attribute
+ * set to this value.
+ */
+ g_ptr_array_foreach(stream_class->event_classes,
+ event_class_set_stream_id, &data);
+ ret = data.ret;
+ if (ret) {
+ goto end;
+ }
+
+ ret = _bt_ctf_stream_class_set_id(stream_class, id);
+ if (ret) {
+ goto end;
+ }
+end:
+ return ret;
+}
+
int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class,
uint32_t id)
{
goto end;
}
- stream_class->id = id;
- stream_class->id_set = 1;
+ ret = bt_ctf_stream_class_set_id_no_check(stream_class, id);
end:
return ret;
}
+static
+void event_class_exists(gpointer element, gpointer query)
+{
+ struct bt_ctf_event_class *event_class_a = element;
+ struct search_query *search_query = query;
+ struct bt_ctf_event_class *event_class_b = search_query->value;
+ int64_t id_a, id_b;
+
+ if (search_query->value == element) {
+ search_query->found = 1;
+ goto end;
+ }
+
+ /*
+ * Two event classes cannot share the same name in a given
+ * stream class.
+ */
+ if (!strcmp(bt_ctf_event_class_get_name(event_class_a),
+ bt_ctf_event_class_get_name(event_class_b))) {
+ search_query->found = 1;
+ goto end;
+ }
+
+ /*
+ * Two event classes cannot share the same ID in a given
+ * stream class.
+ */
+ id_a = bt_ctf_event_class_get_id(event_class_a);
+ id_b = bt_ctf_event_class_get_id(event_class_b);
+
+ if (id_a < 0 || id_b < 0) {
+ /* at least one ID is not set: will be automatically set later */
+ goto end;
+ }
+
+ if (id_a == id_b) {
+ search_query->found = 1;
+ goto end;
+ }
+
+end:
+ return;
+}
+
int bt_ctf_stream_class_add_event_class(
struct bt_ctf_stream_class *stream_class,
struct bt_ctf_event_class *event_class)
{
int ret = 0;
- int64_t event_id;
+ int64_t *event_id = NULL;
+ 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;
}
+ event_id = g_new(int64_t, 1);
+ if (!event_id) {
+ ret = -1;
+ goto end;
+ }
+
/* Check for duplicate event classes */
struct search_query query = { .value = event_class, .found = 0 };
- g_ptr_array_foreach(stream_class->event_classes, value_exists, &query);
+ g_ptr_array_foreach(stream_class->event_classes, event_class_exists,
+ &query);
if (query.found) {
ret = -1;
goto end;
}
- /* 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) {
+ 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;
+ }
+
+ trace = bt_ctf_stream_class_get_trace(stream_class);
+ if (trace) {
+ /*
+ * 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 */
+ *event_id = bt_ctf_event_class_get_id(event_class);
+ if (*event_id < 0) {
if (bt_ctf_event_class_set_id(event_class,
stream_class->next_event_id++)) {
ret = -1;
goto end;
}
+ *event_id = stream_class->next_event_id;
}
- ret = bt_ctf_event_class_set_stream_class(event_class, stream_class);
+ ret = bt_ctf_event_class_set_stream_id(event_class, stream_class->id);
if (ret) {
goto end;
}
- bt_ctf_event_class_get(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);
+ g_hash_table_insert(stream_class->event_classes_ht, event_id,
+ event_class);
+ event_id = NULL;
+
+ /* Freeze the event class */
+ bt_ctf_event_class_freeze(event_class);
+
+ if (stream_class->byte_order) {
+ /*
+ * Only set native byte order if it has been initialized
+ * when the stream class was added to a trace.
+ *
+ * If not set here, this will be set when the stream
+ * 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_object obj = { .object = event_class,
+ .type = BT_CTF_OBJECT_TYPE_EVENT_CLASS };
+
+ (void) bt_ctf_trace_object_modification(&obj, 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);
+ g_free(event_id);
+
return ret;
}
}
event_class = g_ptr_array_index(stream_class->event_classes, index);
- bt_ctf_event_class_get(event_class);
+ bt_get(event_class);
end:
return event_class;
}
struct bt_ctf_stream_class *stream_class, const char *name)
{
size_t i;
- GQuark name_quark;
struct bt_ctf_event_class *event_class = NULL;
if (!stream_class || !name) {
goto end;
}
- name_quark = g_quark_try_string(name);
- if (!name_quark) {
- goto end;
- }
-
for (i = 0; i < stream_class->event_classes->len; i++) {
- struct bt_ctf_event_class *current_event_class =
+ struct bt_ctf_event_class *cur_event_class =
g_ptr_array_index(stream_class->event_classes, i);
+ const char *cur_event_class_name =
+ bt_ctf_event_class_get_name(cur_event_class);
- if (name_quark == current_event_class->name) {
- event_class = current_event_class;
- bt_ctf_event_class_get(event_class);
+ if (!strcmp(name, cur_event_class_name)) {
+ event_class = cur_event_class;
+ bt_get(event_class);
goto end;
}
}
return event_class;
}
+struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id(
+ struct bt_ctf_stream_class *stream_class, uint32_t id)
+{
+ int64_t id_key = id;
+ struct bt_ctf_event_class *event_class = NULL;
+
+ if (!stream_class) {
+ goto end;
+ }
+
+ event_class = g_hash_table_lookup(stream_class->event_classes_ht,
+ &id_key);
+ bt_get(event_class);
+end:
+ return event_class;
+}
+
struct bt_ctf_field_type *bt_ctf_stream_class_get_packet_context_type(
struct bt_ctf_stream_class *stream_class)
{
goto end;
}
- assert(stream_class->packet_context_type);
- bt_ctf_field_type_get(stream_class->packet_context_type);
+ bt_get(stream_class->packet_context_type);
ret = stream_class->packet_context_type;
end:
return ret;
{
int ret = 0;
- if (!stream_class || !packet_context_type || stream_class->frozen) {
+ if (!stream_class || stream_class->frozen) {
ret = -1;
goto end;
}
- assert(stream_class->packet_context_type);
- if (bt_ctf_field_type_get_type_id(packet_context_type) !=
- CTF_TYPE_STRUCT) {
- /* A packet context must be a structure */
+ if (packet_context_type &&
+ bt_ctf_field_type_get_type_id(packet_context_type) !=
+ BT_CTF_TYPE_ID_STRUCT) {
+ /* A packet context must be a structure. */
ret = -1;
goto end;
}
- bt_ctf_field_type_put(stream_class->packet_context_type);
- bt_ctf_field_type_get(packet_context_type);
+ bt_put(stream_class->packet_context_type);
+ bt_get(packet_context_type);
stream_class->packet_context_type = packet_context_type;
end:
return ret;
}
+struct bt_ctf_field_type *bt_ctf_stream_class_get_event_header_type(
+ struct bt_ctf_stream_class *stream_class)
+{
+ struct bt_ctf_field_type *ret = NULL;
+
+ if (!stream_class || !stream_class->event_header_type) {
+ goto end;
+ }
+
+ bt_get(stream_class->event_header_type);
+ ret = stream_class->event_header_type;
+end:
+ return ret;
+}
+
+int bt_ctf_stream_class_set_event_header_type(
+ struct bt_ctf_stream_class *stream_class,
+ struct bt_ctf_field_type *event_header_type)
+{
+ int ret = 0;
+
+ if (!stream_class || stream_class->frozen) {
+ ret = -1;
+ goto end;
+ }
+
+ if (event_header_type &&
+ bt_ctf_field_type_get_type_id(event_header_type) !=
+ BT_CTF_TYPE_ID_STRUCT) {
+ /* An event header must be a structure. */
+ ret = -1;
+ goto end;
+ }
+
+ bt_put(stream_class->event_header_type);
+ stream_class->event_header_type = bt_get(event_header_type);
+end:
+ return ret;
+}
+
struct bt_ctf_field_type *bt_ctf_stream_class_get_event_context_type(
struct bt_ctf_stream_class *stream_class)
{
goto end;
}
- assert(stream_class->event_context_type);
- bt_ctf_field_type_get(stream_class->event_context_type);
+ bt_get(stream_class->event_context_type);
ret = stream_class->event_context_type;
end:
return ret;
{
int ret = 0;
- if (!stream_class || !event_context_type || stream_class->frozen) {
+ if (!stream_class || stream_class->frozen) {
ret = -1;
goto end;
}
- if (bt_ctf_field_type_get_type_id(event_context_type) !=
- CTF_TYPE_STRUCT) {
- /* A packet context must be a structure */
+ if (event_context_type &&
+ bt_ctf_field_type_get_type_id(event_context_type) !=
+ BT_CTF_TYPE_ID_STRUCT) {
+ /* A packet context must be a structure. */
ret = -1;
goto end;
}
- bt_ctf_field_type_put(stream_class->event_context_type);
- bt_ctf_field_type_get(event_context_type);
- stream_class->event_context_type = event_context_type;
+ bt_put(stream_class->event_context_type);
+ stream_class->event_context_type = bt_get(event_context_type);
end:
return ret;
}
void bt_ctf_stream_class_get(struct bt_ctf_stream_class *stream_class)
{
- if (!stream_class) {
- return;
- }
-
- bt_ctf_ref_get(&stream_class->ref_count);
+ bt_get(stream_class);
}
void bt_ctf_stream_class_put(struct bt_ctf_stream_class *stream_class)
{
- if (!stream_class) {
- return;
+ 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 *object, bt_ctf_visitor visitor,void *data)
+{
+ struct bt_ctf_object obj =
+ { .object = object,
+ .type = BT_CTF_OBJECT_TYPE_EVENT_CLASS };
+
+ return visitor(&obj, data);
+}
+
+int bt_ctf_stream_class_visit(struct bt_ctf_stream_class *stream_class,
+ bt_ctf_visitor visitor, void *data)
+{
+ int ret;
+ struct bt_ctf_object obj =
+ { .object = stream_class,
+ .type = BT_CTF_OBJECT_TYPE_STREAM_CLASS };
+
+ if (!stream_class || !visitor) {
+ ret = -1;
+ goto end;
}
- bt_ctf_ref_put(&stream_class->ref_count, bt_ctf_stream_class_destroy);
+ ret = visitor_helper(&obj, get_event_class_count,
+ get_event_class,
+ visit_event_class, visitor, data);
+end:
+ return ret;
}
BT_HIDDEN
}
stream_class->frozen = 1;
+ bt_ctf_field_type_freeze(stream_class->event_header_type);
bt_ctf_field_type_freeze(stream_class->packet_context_type);
bt_ctf_field_type_freeze(stream_class->event_context_type);
- bt_ctf_clock_freeze(stream_class->clock);
- g_ptr_array_foreach(stream_class->event_classes,
- (GFunc)bt_ctf_event_class_freeze, NULL);
+
+ if (stream_class->clock) {
+ bt_ctf_clock_class_freeze(stream_class->clock->clock_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 ret = 0;
+ int i;
- ret = init_event_header(stream_class, byte_order);
- if (ret) {
- goto end;
+ 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, byte_order);
+ bt_ctf_field_type_set_native_byte_order(
+ stream_class->packet_context_type, byte_order);
+ bt_ctf_field_type_set_native_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 =
+ g_ptr_array_index(stream_class->event_classes, i);
+
+ bt_ctf_event_class_set_native_byte_order(event_class,
+ byte_order);
}
-end:
- return ret;
}
BT_HIDDEN
goto end;
}
- g_string_append(context->string, ";\n\n\tpacket.context := ");
- ret = bt_ctf_field_type_serialize(stream_class->packet_context_type,
- context);
- if (ret) {
- goto end;
+ if (stream_class->packet_context_type) {
+ g_string_append(context->string, ";\n\n\tpacket.context := ");
+ ret = bt_ctf_field_type_serialize(stream_class->packet_context_type,
+ context);
+ if (ret) {
+ goto end;
+ }
}
if (stream_class->event_context_type) {
}
static
-void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_stream_class_destroy(struct bt_object *obj)
{
struct bt_ctf_stream_class *stream_class;
- if (!ref) {
- return;
- }
-
- stream_class = container_of(ref, struct bt_ctf_stream_class, ref_count);
- bt_ctf_clock_put(stream_class->clock);
+ stream_class = container_of(obj, struct bt_ctf_stream_class, base);
+ bt_put(stream_class->clock);
+ if (stream_class->event_classes_ht) {
+ g_hash_table_destroy(stream_class->event_classes_ht);
+ }
if (stream_class->event_classes) {
- size_t i;
-
- /* Unregister this stream class from the event classes */
- for (i = 0; i < stream_class->event_classes->len; i++) {
- struct bt_ctf_event_class *event_class =
- g_ptr_array_index(stream_class->event_classes,
- i);
-
- bt_ctf_event_class_set_stream_class(event_class, NULL);
- }
-
g_ptr_array_free(stream_class->event_classes, TRUE);
}
g_string_free(stream_class->name, TRUE);
}
- bt_ctf_field_type_put(stream_class->event_header_type);
- bt_ctf_field_put(stream_class->event_header);
- bt_ctf_field_type_put(stream_class->packet_context_type);
- if (stream_class->event_context_type) {
- bt_ctf_field_type_put(stream_class->event_context_type);
- }
+ bt_put(stream_class->event_header_type);
+ bt_put(stream_class->packet_context_type);
+ bt_put(stream_class->event_context_type);
g_free(stream_class);
}
static
-int init_event_header(struct bt_ctf_stream_class *stream_class,
- enum bt_ctf_byte_order byte_order)
+int init_event_header(struct bt_ctf_stream_class *stream_class)
{
int ret = 0;
struct bt_ctf_field_type *event_header_type =
goto end;
}
- ret = bt_ctf_field_type_set_byte_order(_uint32_t, byte_order);
- if (ret) {
- goto end;
- }
-
- ret = bt_ctf_field_type_set_byte_order(_uint64_t, byte_order);
- if (ret) {
- goto end;
- }
-
ret = bt_ctf_field_type_structure_add_field(event_header_type,
_uint32_t, "id");
if (ret) {
goto end;
}
- stream_class->event_header_type = event_header_type;
- stream_class->event_header = bt_ctf_field_create(
- stream_class->event_header_type);
- if (!stream_class->event_header) {
- ret = -1;
+ if (stream_class->event_header_type) {
+ bt_put(stream_class->event_header_type);
}
+ stream_class->event_header_type = event_header_type;
end:
if (ret) {
- bt_ctf_field_type_put(event_header_type);
+ bt_put(event_header_type);
}
- bt_ctf_field_type_put(_uint32_t);
- bt_ctf_field_type_put(_uint64_t);
+ bt_put(_uint32_t);
+ bt_put(_uint64_t);
return ret;
}
static
-int init_packet_context(struct bt_ctf_stream_class *stream_class,
- enum bt_ctf_byte_order byte_order)
+int init_packet_context(struct bt_ctf_stream_class *stream_class)
{
int ret = 0;
struct bt_ctf_field_type *packet_context_type =
* We create a stream packet context as proposed in the CTF
* specification.
*/
- ret = bt_ctf_field_type_set_byte_order(_uint64_t, byte_order);
- if (ret) {
- goto end;
- }
-
ret = bt_ctf_field_type_structure_add_field(packet_context_type,
_uint64_t, "timestamp_begin");
if (ret) {
goto end;
}
+ bt_put(stream_class->packet_context_type);
stream_class->packet_context_type = packet_context_type;
end:
if (ret) {
- bt_ctf_field_type_put(packet_context_type);
+ bt_put(packet_context_type);
goto end;
}
- bt_ctf_field_type_put(_uint64_t);
+ bt_put(_uint64_t);
return ret;
}
projects / babeltrace.git / blobdiff