X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=c553f7a707eff35e4d4a024a91128a675583215b;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=4c1d24029d60a150a899f0f305c3cd86bb559f23;hpb=1556a1afe8d70a3a89155ff25815e203333a93e9;p=babeltrace.git diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c index 4c1d2402..c553f7a7 100644 --- a/formats/ctf/ir/event.c +++ b/formats/ctf/ir/event.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -46,8 +47,6 @@ static 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 *bt_ctf_event_create(struct bt_ctf_event_class *event_class) { @@ -336,7 +335,7 @@ int bt_ctf_event_set_payload_field(struct bt_ctf_event *event, int ret = 0; struct bt_ctf_field_type *payload_type = NULL; - if (!event || !payload || event->frozen) { + if (!event || event->frozen) { ret = -1; goto end; } @@ -353,10 +352,8 @@ int bt_ctf_event_set_payload_field(struct bt_ctf_event *event, goto end; } - bt_get(payload); bt_put(event->fields_payload); - event->fields_payload = payload; - + event->fields_payload = bt_get(payload); end: bt_put(payload_type); return ret; @@ -419,13 +416,13 @@ int bt_ctf_event_set_header(struct bt_ctf_event *event, struct bt_ctf_field_type *field_type = NULL; struct bt_ctf_stream_class *stream_class = NULL; - if (!event || !header || event->frozen) { + if (!event || event->frozen) { ret = -1; goto end; } stream_class = (struct bt_ctf_stream_class *) bt_object_get_parent( - event->event_class); + event->event_class); /* * Ensure the provided header's type matches the one registered to the * stream class. @@ -437,9 +434,8 @@ int bt_ctf_event_set_header(struct bt_ctf_event *event, goto end; } - bt_get(header); bt_put(event->event_header); - event->event_header = header; + event->event_header = bt_get(header); end: bt_put(stream_class); bt_put(field_type); @@ -467,7 +463,7 @@ int bt_ctf_event_set_event_context(struct bt_ctf_event *event, int ret = 0; struct bt_ctf_field_type *field_type = NULL; - if (!event || !context || event->frozen) { + if (!event || event->frozen) { ret = -1; goto end; } @@ -479,9 +475,8 @@ int bt_ctf_event_set_event_context(struct bt_ctf_event *event, goto end; } - bt_get(context); bt_put(event->context_payload); - event->context_payload = context; + event->context_payload = bt_get(context); end: bt_put(field_type); return ret; @@ -508,7 +503,7 @@ int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event, struct bt_ctf_field_type *field_type = NULL; struct bt_ctf_stream_class *stream_class = NULL; - if (!event || !stream_event_context || event->frozen) { + if (!event || event->frozen) { ret = -1; goto end; } @@ -568,15 +563,15 @@ void bt_ctf_event_destroy(struct bt_object *obj) } struct bt_ctf_clock_value *bt_ctf_event_get_clock_value( - struct bt_ctf_event *event, struct bt_ctf_clock *clock) + struct bt_ctf_event *event, struct bt_ctf_clock_class *clock_class) { struct bt_ctf_clock_value *clock_value = NULL; - if (!event || !clock) { + if (!event || !clock_class) { goto end; } - clock_value = g_hash_table_lookup(event->clock_values, clock); + clock_value = g_hash_table_lookup(event->clock_values, clock_class); if (!clock_value) { goto end; } @@ -587,61 +582,18 @@ end: } int bt_ctf_event_set_clock_value(struct bt_ctf_event *event, - struct bt_ctf_clock *clock, struct bt_ctf_clock_value *value) -{ - int ret = 0; - - if (!event || !clock || !value || event->frozen) { - ret = -1; - goto end; - } - - g_hash_table_insert(event->clock_values, bt_get(clock), bt_get(value)); -end: - return ret; -} - -static -int set_integer_field_value(struct bt_ctf_field* field, uint64_t value) + struct bt_ctf_clock_value *value) { int ret = 0; - struct bt_ctf_field_type *field_type = NULL; - - if (!field) { - ret = -1; - goto end; - } - - if (!bt_ctf_field_validate(field)) { - /* Payload already set, skip! (not an error) */ - goto end; - } - field_type = bt_ctf_field_get_type(field); - assert(field_type); - - if (bt_ctf_field_type_get_type_id(field_type) != - BT_CTF_TYPE_ID_INTEGER) { - /* Not an integer and the value is unset, error. */ + if (!event || !value || event->frozen) { ret = -1; goto end; } - if (bt_ctf_field_type_integer_get_signed(field_type)) { - ret = bt_ctf_field_signed_integer_set_value(field, (int64_t) value); - if (ret) { - /* Value is out of range, error. */ - goto end; - } - } else { - ret = bt_ctf_field_unsigned_integer_set_value(field, value); - if (ret) { - /* Value is out of range, error. */ - goto end; - } - } + g_hash_table_insert(event->clock_values, + bt_ctf_clock_value_get_class(value), bt_get(value)); end: - bt_put(field_type); return ret; } @@ -709,63 +661,6 @@ end: return ret; } -BT_HIDDEN -int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) -{ - int ret = 0; - struct bt_ctf_field *id_field = NULL, *timestamp_field = NULL; - - if (!event || event->frozen) { - ret = -1; - goto end; - } - - id_field = bt_ctf_field_structure_get_field(event->event_header, "id"); - if (id_field) { - ret = set_integer_field_value(id_field, - (uint64_t) bt_ctf_event_class_get_id( - event->event_class)); - if (ret) { - goto end; - } - } - - timestamp_field = bt_ctf_field_structure_get_field(event->event_header, - "timestamp"); - if (timestamp_field) { - struct bt_ctf_field_type *timestamp_field_type = - bt_ctf_field_get_type(timestamp_field); - struct bt_ctf_clock *mapped_clock; - - assert(timestamp_field_type); - mapped_clock = bt_ctf_field_type_integer_get_mapped_clock( - timestamp_field_type); - bt_put(timestamp_field_type); - if (mapped_clock) { - int64_t timestamp = 0; - - // FIXME - Clock refactoring - /* - ret = bt_ctf_clock_get_time(mapped_clock, ×tamp); - bt_put(mapped_clock); - if (ret) { - goto end; - } - */ - - ret = set_integer_field_value(timestamp_field, - timestamp); - if (ret) { - goto end; - } - } - } -end: - bt_put(id_field); - bt_put(timestamp_field); - return ret; -} - struct bt_ctf_packet *bt_ctf_event_get_packet(struct bt_ctf_event *event) { struct bt_ctf_packet *packet = NULL;