X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=6d8f57b3e076f7da718e6b1cdd9c87eab80780bb;hb=5fd2e9fda6185e989583e6e61b9312683149747e;hp=c4fe4b4870726a0310a4abdf5b4fc9834ad680cc;hpb=9a220c32dde6dc2a6a6950c470cff957e630e494;p=babeltrace.git diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c index c4fe4b48..6d8f57b3 100644 --- a/formats/ctf/ir/event.c +++ b/formats/ctf/ir/event.c @@ -26,307 +26,215 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include #include +#include +#include #include #include #include +#include #include +#include +#include #include static -void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref); -static -void bt_ctf_event_destroy(struct bt_ctf_ref *ref); +void bt_ctf_event_destroy(struct bt_object *obj); static int set_integer_field_value(struct bt_ctf_field *field, uint64_t value); -struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name) -{ - struct bt_ctf_event_class *event_class = NULL; - - if (bt_ctf_validate_identifier(name)) { - goto end; - } - - event_class = g_new0(struct bt_ctf_event_class, 1); - if (!event_class) { - goto end; - } - - bt_ctf_ref_init(&event_class->ref_count); - event_class->name = g_quark_from_string(name); -end: - return event_class; -} - -const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class) +struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) { - const char *name = NULL; + int ret; + enum bt_ctf_validation_flag validation_flags = + BT_CTF_VALIDATION_FLAG_STREAM | + BT_CTF_VALIDATION_FLAG_EVENT; + struct bt_ctf_event *event = NULL; + struct bt_ctf_trace *trace = NULL; + struct bt_ctf_stream_class *stream_class = NULL; + 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; + struct bt_ctf_field *event_header = NULL; + struct bt_ctf_field *stream_event_context = NULL; + struct bt_ctf_field *event_context = NULL; + struct bt_ctf_field *event_payload = NULL; + struct bt_value *environment = NULL; + struct bt_ctf_validation_output validation_output = { 0 }; + int trace_valid = 0; if (!event_class) { - goto end; + goto error; } - name = g_quark_to_string(event_class->name); -end: - return name; -} - -int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class) -{ - int64_t ret; - - if (!event_class || !event_class->id_set) { - ret = -1; - goto end; - } - - ret = (int64_t) event_class->id; -end: - return ret; -} - -int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class, - uint32_t id) -{ - int ret = 0; - - if (!event_class) { - ret = -1; - goto end; - } + stream_class = bt_ctf_event_class_get_stream_class(event_class); - if (event_class->stream_class) { + /* + * We disallow the creation of an event if its event class has not been + * associated to a stream class. + */ + if (!stream_class) { + 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); + + /* Validate the trace (if any), the stream class, and the event class */ + trace = bt_ctf_stream_class_get_trace(stream_class); + if (trace) { + packet_header_type = bt_ctf_trace_get_packet_header_type(trace); + trace_valid = trace->valid; + assert(trace_valid); + environment = trace->environment; + } + + 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(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) { /* - * We don't allow changing the id if the event class has already - * been added to a stream class. + * This means something went wrong during the validation + * process, not that the objects are invalid. */ - ret = -1; - goto end; - } - - event_class->id = id; - event_class->id_set = 1; -end: - return ret; -} - -struct bt_ctf_stream_class *bt_ctf_event_class_get_stream_class( - struct bt_ctf_event_class *event_class) -{ - struct bt_ctf_stream_class *stream_class = NULL; - - if (!event_class) { - goto end; - } - - stream_class = event_class->stream_class; - bt_ctf_stream_class_get(stream_class); -end: - return stream_class; -} - -int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class, - struct bt_ctf_field_type *type, - const char *name) -{ - int ret = 0; - - if (!event_class || !type || bt_ctf_validate_identifier(name) || - event_class->frozen) { - ret = -1; - goto end; + goto error; } - if (!event_class->fields) { - event_class->fields = bt_ctf_field_type_structure_create(); - if (!event_class->fields) { - ret = -1; - goto end; - } - } - - ret = bt_ctf_field_type_structure_add_field(event_class->fields, - type, name); -end: - return ret; -} - -int bt_ctf_event_class_get_field_count( - struct bt_ctf_event_class *event_class) -{ - int ret; - - if (!event_class) { - ret = -1; - goto end; - } - - ret = bt_ctf_field_type_structure_get_field_count(event_class->fields); -end: - return ret; -} - -int bt_ctf_event_class_get_field(struct bt_ctf_event_class *event_class, - const char **field_name, struct bt_ctf_field_type **field_type, - int index) -{ - int ret; - - if (!event_class || index < 0) { - ret = -1; - goto end; - } - - ret = bt_ctf_field_type_structure_get_field(event_class->fields, - field_name, field_type, index); -end: - return ret; -} - -struct bt_ctf_field_type *bt_ctf_event_class_get_field_by_name( - struct bt_ctf_event_class *event_class, const char *name) -{ - GQuark name_quark; - struct bt_ctf_field_type *field_type = NULL; - - if (!event_class || !name) { - goto end; - } - - name_quark = g_quark_try_string(name); - if (!name_quark) { - goto end; + if ((validation_output.valid_flags & validation_flags) != + validation_flags) { + /* Invalid trace/stream class/event class */ + goto error; } /* - * No need to increment field_type's reference count since getting it - * from the structure already does. + * At this point we know the trace (if associated to the stream + * class), the stream class, and the event class, with their + * current types, are valid. We may proceed with creating + * the event. */ - field_type = bt_ctf_field_type_structure_get_field_type_by_name( - event_class->fields, name); -end: - return field_type; -} - -struct bt_ctf_field_type *bt_ctf_event_class_get_context_type( - struct bt_ctf_event_class *event_class) -{ - struct bt_ctf_field_type *context_type = NULL; - - if (!event_class || !event_class->context) { - goto end; - } - - bt_ctf_field_type_get(event_class->context); - context_type = event_class->context; -end: - return context_type; -} - -int bt_ctf_event_class_set_context_type( - struct bt_ctf_event_class *event_class, - struct bt_ctf_field_type *context) -{ - int ret = 0; - - if (!event_class || !context || event_class->frozen) { - ret = -1; - goto end; - } - - if (bt_ctf_field_type_get_type_id(context) != CTF_TYPE_STRUCT) { - ret = -1; - goto end; - } - - bt_ctf_field_type_get(context); - bt_ctf_field_type_put(event_class->context); - event_class->context = context; -end: - return ret; - -} - -void bt_ctf_event_class_get(struct bt_ctf_event_class *event_class) -{ - if (!event_class) { - return; - } - - bt_ctf_ref_get(&event_class->ref_count); -} - -void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class) -{ - if (!event_class) { - return; - } - - bt_ctf_ref_put(&event_class->ref_count, bt_ctf_event_class_destroy); -} - -struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) -{ - struct bt_ctf_event *event = NULL; - - if (!event_class) { - goto end; - } - event = g_new0(struct bt_ctf_event, 1); if (!event) { - goto end; + goto error; } - bt_ctf_ref_init(&event->ref_count); - bt_ctf_event_class_get(event_class); - bt_ctf_event_class_freeze(event_class); - event->event_class = event_class; + bt_object_init(event, bt_ctf_event_destroy); /* - * The event class does not keep ownership of the stream class to - * which it as been added. Therefore, it can't assume it has been - * set. However, we disallow the creation of an event if its - * associated stream class has been reclaimed. + * event does not share a common ancestor with the event class; it has + * to guarantee its existence by holding a reference. This reference + * shall be released once the event is associated to a stream since, + * from that point, the event and its class will share the same + * lifetime. */ - if (!event_class->stream_class) { - goto error_destroy; + event->event_class = bt_get(event_class); + event_header = + bt_ctf_field_create(validation_output.event_header_type); + if (!event_header) { + goto error; + } + + if (validation_output.stream_event_ctx_type) { + stream_event_context = bt_ctf_field_create( + validation_output.stream_event_ctx_type); + if (!stream_event_context) { + goto error; + } } - assert(event_class->stream_class->event_header_type); - event->event_header = bt_ctf_field_create( - event_class->stream_class->event_header_type); - if (!event->event_header) { - goto error_destroy; - } - if (event_class->context) { - event->context_payload = bt_ctf_field_create( - event_class->context); - if (!event->context_payload) { - goto error_destroy; + if (validation_output.event_context_type) { + event_context = bt_ctf_field_create( + validation_output.event_context_type); + if (!event_context) { + goto error; } } - event->fields_payload = bt_ctf_field_create(event_class->fields); - if (!event->fields_payload) { - goto error_destroy; + + if (validation_output.event_payload_type) { + event_payload = bt_ctf_field_create( + validation_output.event_payload_type); + if (!event_payload) { + goto error; + } } + /* + * At this point all the fields are created, potentially from + * validated copies of field types, so that the field types and + * fields can be replaced in the trace, stream class, + * event class, and created event. + */ + bt_ctf_validation_replace_types(trace, stream_class, + event_class, &validation_output, validation_flags); + BT_MOVE(event->event_header, event_header); + BT_MOVE(event->stream_event_context, stream_event_context); + BT_MOVE(event->context_payload, event_context); + BT_MOVE(event->fields_payload, event_payload); + + /* + * Put what was not moved in bt_ctf_validation_replace_types(). + */ + bt_ctf_validation_output_put_types(&validation_output); + /* * Freeze the stream class since the event header must not be changed * anymore. */ - bt_ctf_stream_class_freeze(event_class->stream_class); -end: + bt_ctf_stream_class_freeze(stream_class); + + /* + * Mark stream class, and event class as valid since + * they're all frozen now. + */ + stream_class->valid = 1; + event_class->valid = 1; + + /* Put stuff we borrowed from the event class */ + BT_PUT(stream_class); + BT_PUT(trace); + + return event; + +error: + bt_ctf_validation_output_put_types(&validation_output); + BT_PUT(event); + BT_PUT(stream_class); + BT_PUT(trace); + BT_PUT(event_header); + BT_PUT(stream_event_context); + BT_PUT(event_context); + BT_PUT(event_payload); + 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 event; -error_destroy: - bt_ctf_event_destroy(&event->ref_count); - return NULL; } struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event) @@ -338,11 +246,16 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event) } event_class = event->event_class; - bt_ctf_event_class_get(event_class); + bt_get(event_class); end: return event_class; } +struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event) +{ + return (struct bt_ctf_stream *) bt_object_get_parent(event); +} + struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event) { struct bt_ctf_clock *clock = NULL; @@ -369,41 +282,109 @@ struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event) } error_put_stream_class: - bt_ctf_stream_class_put(stream_class); + bt_put(stream_class); error_put_event_class: - bt_ctf_event_class_put(event_class); + bt_put(event_class); end: return clock; } int bt_ctf_event_set_payload(struct bt_ctf_event *event, const char *name, - struct bt_ctf_field *value) + struct bt_ctf_field *payload) { int ret = 0; - if (!event || !value || bt_ctf_validate_identifier(name)) { + if (!event || !payload) { ret = -1; goto end; } - ret = bt_ctf_field_structure_set_field(event->fields_payload, - name, value); + if (name) { + ret = bt_ctf_field_structure_set_field(event->fields_payload, + name, payload); + } else { + struct bt_ctf_field_type *payload_type; + + payload_type = bt_ctf_field_get_type(payload); + + if (bt_ctf_field_type_compare(payload_type, + event->event_class->fields) == 0) { + bt_put(event->fields_payload); + bt_get(payload); + event->fields_payload = payload; + } else { + ret = -1; + } + + bt_put(payload_type); + } end: return ret; } +struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event) +{ + struct bt_ctf_field *payload = NULL; + + if (!event || !event->fields_payload) { + goto end; + } + + payload = event->fields_payload; + bt_get(payload); +end: + return payload; +} + +int bt_ctf_event_set_payload_field(struct bt_ctf_event *event, + struct bt_ctf_field *payload) +{ + int ret = 0; + struct bt_ctf_field_type *payload_type = NULL; + + if (!event || !payload) { + ret = -1; + goto end; + } + + payload_type = bt_ctf_field_get_type(payload); + if (!payload_type) { + ret = -1; + goto end; + } + + if (bt_ctf_field_type_get_type_id(payload_type) != + BT_CTF_TYPE_ID_STRUCT) { + ret = -1; + goto end; + } + + bt_get(payload); + bt_put(event->fields_payload); + event->fields_payload = payload; + +end: + bt_put(payload_type); + return ret; +} struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event, const char *name) { struct bt_ctf_field *field = NULL; - if (!event || !name) { + if (!event) { goto end; } - field = bt_ctf_field_structure_get_field(event->fields_payload, name); + if (name) { + field = bt_ctf_field_structure_get_field(event->fields_payload, + name); + } else { + field = event->fields_payload; + bt_get(field); + } end: return field; } @@ -423,7 +404,7 @@ end: return field; } -struct bt_ctf_field *bt_ctf_event_get_event_header( +struct bt_ctf_field *bt_ctf_event_get_header( struct bt_ctf_event *event) { struct bt_ctf_field *header = NULL; @@ -433,45 +414,42 @@ struct bt_ctf_field *bt_ctf_event_get_event_header( } header = event->event_header; - bt_ctf_field_get(header); + bt_get(header); end: return header; } -int bt_ctf_event_set_event_header(struct bt_ctf_event *event, +int bt_ctf_event_set_header(struct bt_ctf_event *event, struct bt_ctf_field *header) { int ret = 0; struct bt_ctf_field_type *field_type = NULL; + struct bt_ctf_stream_class *stream_class = NULL; if (!event || !header) { ret = -1; goto end; } - /* Could be NULL since an event class doesn't own a stream class */ - if (!event->event_class->stream_class) { - ret = -1; - goto end; - } - + stream_class = (struct bt_ctf_stream_class *) bt_object_get_parent( + event->event_class); /* * Ensure the provided header's type matches the one registered to the * stream class. */ field_type = bt_ctf_field_get_type(header); - if (field_type != event->event_class->stream_class->event_header_type) { + if (bt_ctf_field_type_compare(field_type, + stream_class->event_header_type)) { ret = -1; goto end; } - bt_ctf_field_get(header); - bt_ctf_field_put(event->event_header); + bt_get(header); + bt_put(event->event_header); event->event_header = header; end: - if (field_type) { - bt_ctf_field_type_put(field_type); - } + bt_put(stream_class); + bt_put(field_type); return ret; } @@ -485,7 +463,7 @@ struct bt_ctf_field *bt_ctf_event_get_event_context( } context = event->context_payload; - bt_ctf_field_get(context); + bt_get(context); end: return context; } @@ -502,85 +480,95 @@ int bt_ctf_event_set_event_context(struct bt_ctf_event *event, } field_type = bt_ctf_field_get_type(context); - if (field_type != event->event_class->context) { + if (bt_ctf_field_type_compare(field_type, + event->event_class->context)) { ret = -1; goto end; } - bt_ctf_field_get(context); - bt_ctf_field_put(event->context_payload); + bt_get(context); + bt_put(event->context_payload); event->context_payload = context; end: - if (field_type) { - bt_ctf_field_type_put(field_type); - } + bt_put(field_type); return ret; } -void bt_ctf_event_get(struct bt_ctf_event *event) +struct bt_ctf_field *bt_ctf_event_get_stream_event_context( + struct bt_ctf_event *event) { - if (!event) { - return; - } + struct bt_ctf_field *stream_event_context = NULL; - bt_ctf_ref_get(&event->ref_count); -} - -void bt_ctf_event_put(struct bt_ctf_event *event) -{ - if (!event) { - return; + if (!event || !event->stream_event_context) { + goto end; } - bt_ctf_ref_put(&event->ref_count, bt_ctf_event_destroy); + stream_event_context = event->stream_event_context; +end: + return bt_get(stream_event_context); } -static -void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref) +int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event, + struct bt_ctf_field *stream_event_context) { - struct bt_ctf_event_class *event_class; + int ret = 0; + struct bt_ctf_field_type *field_type = NULL; + struct bt_ctf_stream_class *stream_class = NULL; - if (!ref) { - return; + if (!event || !stream_event_context) { + ret = -1; + goto end; } + stream_class = bt_ctf_event_class_get_stream_class(event->event_class); /* - * Don't call put() on the stream class. See comment in - * bt_ctf_event_class_set_stream_class for explanation. + * We should not have been able to create the event without associating + * the event class to a stream class. */ - event_class = container_of(ref, struct bt_ctf_event_class, ref_count); - if (event_class->context) { - bt_ctf_field_type_put(event_class->context); - } - if (event_class->fields) { - bt_ctf_field_type_put(event_class->fields); + 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)) { + ret = -1; + goto end; } - g_free(event_class); + + bt_get(stream_event_context); + BT_MOVE(event->stream_event_context, stream_event_context); +end: + BT_PUT(stream_class); + bt_put(field_type); + return ret; } -static -void bt_ctf_event_destroy(struct bt_ctf_ref *ref) +void bt_ctf_event_get(struct bt_ctf_event *event) { - struct bt_ctf_event *event; + bt_get(event); +} - if (!ref) { - return; - } +void bt_ctf_event_put(struct bt_ctf_event *event) +{ + bt_put(event); +} - event = container_of(ref, struct bt_ctf_event, - ref_count); - if (event->event_class) { - bt_ctf_event_class_put(event->event_class); - } - if (event->event_header) { - bt_ctf_field_put(event->event_header); - } - if (event->context_payload) { - bt_ctf_field_put(event->context_payload); - } - if (event->fields_payload) { - bt_ctf_field_put(event->fields_payload); +void bt_ctf_event_destroy(struct bt_object *obj) +{ + struct bt_ctf_event *event; + + event = container_of(obj, struct bt_ctf_event, base); + if (!event->base.parent) { + /* + * Event was keeping a reference to its class since it shared no + * common ancestor with it to guarantee they would both have the + * same lifetime. + */ + bt_put(event->event_class); } + bt_put(event->event_header); + bt_put(event->stream_event_context); + bt_put(event->context_payload); + bt_put(event->fields_payload); g_free(event); } @@ -603,7 +591,8 @@ int set_integer_field_value(struct bt_ctf_field* field, uint64_t value) field_type = bt_ctf_field_get_type(field); assert(field_type); - if (bt_ctf_field_type_get_type_id(field_type) != CTF_TYPE_INTEGER) { + if (bt_ctf_field_type_get_type_id(field_type) != + BT_CTF_TYPE_ID_INTEGER) { /* Not an integer and the value is unset, error. */ ret = -1; goto end; @@ -623,121 +612,34 @@ int set_integer_field_value(struct bt_ctf_field* field, uint64_t value) } } end: - bt_ctf_field_type_put(field_type); + bt_put(field_type); return ret; } BT_HIDDEN -void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class) -{ - assert(event_class); - event_class->frozen = 1; - bt_ctf_field_type_freeze(event_class->context); - bt_ctf_field_type_freeze(event_class->fields); -} - -BT_HIDDEN -int bt_ctf_event_class_set_stream_class(struct bt_ctf_event_class *event_class, - struct bt_ctf_stream_class *stream_class) +int bt_ctf_event_validate(struct bt_ctf_event *event) { - int ret = 0; - - if (!event_class) { - ret = -1; - goto end; - } + /* Make sure each field's payload has been set */ + int ret; + struct bt_ctf_stream_class *stream_class = NULL; - /* Allow a NULL stream_class to unset the current stream_class */ - if (stream_class && event_class->stream_class) { - ret = -1; + assert(event); + ret = bt_ctf_field_validate(event->event_header); + if (ret) { goto end; } - event_class->stream_class = stream_class; + stream_class = bt_ctf_event_class_get_stream_class(event->event_class); /* - * We don't get() the stream_class since doing so would introduce - * a circular ownership between event classes and stream classes. - * - * A stream class will always unset itself from its events before - * being destroyed. This ensures that a user won't get a pointer - * to a stale stream class instance from an event class. + * We should not have been able to create the event without associating + * the event class to a stream class. */ -end: - return ret; -} - -BT_HIDDEN -int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class, - struct metadata_context *context) -{ - int ret = 0; - int64_t stream_id; - - assert(event_class); - assert(context); - stream_id = bt_ctf_stream_class_get_id(event_class->stream_class); - if (stream_id < 0) { - ret = -1; - goto end; - } - - context->current_indentation_level = 1; - g_string_assign(context->field_name, ""); - g_string_append_printf(context->string, - "event {\n\tname = \"%s\";\n\tid = %u;\n\tstream_id = %" PRId64 ";\n", - g_quark_to_string(event_class->name), - event_class->id, - stream_id); - - if (event_class->context) { - g_string_append(context->string, "\tcontext := "); - ret = bt_ctf_field_type_serialize(event_class->context, - context); - if (ret) { - goto end; - } - g_string_append(context->string, ";\n"); - } - - if (event_class->fields) { - g_string_append(context->string, "\tfields := "); - ret = bt_ctf_field_type_serialize(event_class->fields, context); + assert(stream_class); + if (stream_class->event_context_type) { + ret = bt_ctf_field_validate(event->stream_event_context); if (ret) { goto end; } - g_string_append(context->string, ";\n"); - } - - g_string_append(context->string, "};\n\n"); -end: - context->current_indentation_level = 0; - return ret; -} - -void bt_ctf_event_class_set_native_byte_order( - struct bt_ctf_event_class *event_class, - int byte_order) -{ - if (!event_class) { - return; - } - - bt_ctf_field_type_set_native_byte_order(event_class->context, - byte_order); - bt_ctf_field_type_set_native_byte_order(event_class->fields, - byte_order); -} - -BT_HIDDEN -int bt_ctf_event_validate(struct bt_ctf_event *event) -{ - /* Make sure each field's payload has been set */ - int ret; - - assert(event); - ret = bt_ctf_field_validate(event->event_header); - if (ret) { - goto end; } ret = bt_ctf_field_validate(event->fields_payload); @@ -749,6 +651,7 @@ int bt_ctf_event_validate(struct bt_ctf_event *event) ret = bt_ctf_field_validate(event->context_payload); } end: + bt_put(stream_class); return ret; } @@ -791,7 +694,8 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) id_field = bt_ctf_field_structure_get_field(event->event_header, "id"); if (id_field) { ret = set_integer_field_value(id_field, - (uint64_t) event->event_class->id); + (uint64_t) bt_ctf_event_class_get_id( + event->event_class)); if (ret) { goto end; } @@ -807,13 +711,13 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) assert(timestamp_field_type); mapped_clock = bt_ctf_field_type_integer_get_mapped_clock( timestamp_field_type); - bt_ctf_field_type_put(timestamp_field_type); + bt_put(timestamp_field_type); if (mapped_clock) { - uint64_t timestamp = bt_ctf_clock_get_time( - mapped_clock); + int64_t timestamp; - bt_ctf_clock_put(mapped_clock); - if (timestamp == (uint64_t) -1ULL) { + ret = bt_ctf_clock_get_time(mapped_clock, ×tamp); + bt_put(mapped_clock); + if (ret) { goto end; } @@ -825,11 +729,60 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) } } end: - if (id_field) { - bt_ctf_field_put(id_field); + bt_put(id_field); + bt_put(timestamp_field); + return ret; +} + +struct bt_ctf_event *bt_ctf_event_copy(struct bt_ctf_event *event) +{ + struct bt_ctf_event *copy = NULL; + + if (!event) { + goto error; } - if (timestamp_field) { - bt_ctf_field_put(timestamp_field); + + copy = g_new0(struct bt_ctf_event, 1); + if (!copy) { + goto error; } - return ret; + + bt_object_init(copy, bt_ctf_event_destroy); + copy->event_class = bt_get(event->event_class); + + if (event->event_header) { + copy->event_header = bt_ctf_field_copy(event->event_header); + if (!copy->event_header) { + goto error; + } + } + + if (event->stream_event_context) { + copy->stream_event_context = + bt_ctf_field_copy(event->stream_event_context); + if (!copy->stream_event_context) { + goto error; + } + } + + if (event->context_payload) { + copy->context_payload = bt_ctf_field_copy( + event->context_payload); + if (!copy->context_payload) { + goto error; + } + } + + if (event->fields_payload) { + copy->fields_payload = bt_ctf_field_copy(event->fields_payload); + if (!copy->fields_payload) { + goto error; + } + } + + return copy; + +error: + BT_PUT(copy); + return copy; }