X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fclock-fields.c;h=ef5368c0be73d1003269b5fd872307d26d18b3e5;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=1e28c899327d457d2cbf6a69c1125baaf5927953;hpb=40f4ba76dd6f9508ca51b6220eaed57632281a07;p=babeltrace.git diff --git a/plugins/libctfcopytrace/clock-fields.c b/plugins/libctfcopytrace/clock-fields.c index 1e28c899..ef5368c0 100644 --- a/plugins/libctfcopytrace/clock-fields.c +++ b/plugins/libctfcopytrace/clock-fields.c @@ -33,65 +33,65 @@ #include #include -#include "clock-fields.h" +#include "clock-field.h" static -int find_update_struct_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class); +int find_update_struct_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class); static -int find_update_array_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class); +int find_update_array_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class); static -int find_update_enum_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class); +int find_update_enum_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class); static -int find_update_sequence_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class); +int find_update_sequence_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class); static -int find_update_variant_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class); +int find_update_variant_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class); static int copy_find_clock_int_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field); + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field); static int copy_find_clock_struct_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field); + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field); static int copy_find_clock_array_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field); + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field); static int copy_find_clock_sequence_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field); + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field); static -int copy_find_clock_variant_field(FILE *err, const struct bt_event *event, - const struct bt_event *writer_event, const struct bt_field *field, - struct bt_field_type *type, const struct bt_field *copy_field); +int copy_find_clock_variant_field(FILE *err, const bt_event *event, + const bt_event *writer_event, const bt_field *field, + bt_field_type *type, const bt_field *copy_field); static -int copy_find_clock_enum_field(FILE *err, const struct bt_event *event, - const struct bt_event *writer_event, const struct bt_field *field, - struct bt_field_type *type, const struct bt_field *copy_field); +int copy_find_clock_enum_field(FILE *err, const bt_event *event, + const bt_event *writer_event, const bt_field *field, + bt_field_type *type, const bt_field *copy_field); static -int update_header_clock_int_field_type(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int update_header_clock_int_field_type(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { - const struct bt_clock_class *clock = NULL; + const bt_clock_class *clock = NULL; int ret; clock = bt_field_type_integer_get_mapped_clock_class(type); if (!clock) { return 0; } - BT_OBJECT_PUT_REF_AND_RESET(clock); + BT_CLOCK_CLASS_PUT_REF_AND_RESET(clock); ret = bt_field_type_integer_set_size(type, 64); if (ret) { @@ -111,8 +111,8 @@ end: } static -int find_update_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int find_update_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { int ret; @@ -146,11 +146,11 @@ int find_update_clock_fields(FILE *err, struct bt_field_type *type, } static -int find_update_variant_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int find_update_variant_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { int count, i, ret; - struct bt_field_type *entry_type = NULL; + bt_field_type *entry_type = NULL; count = bt_field_type_variant_get_field_count(type); for (i = 0; i < count; i++) { @@ -183,11 +183,11 @@ end: } static -int find_update_struct_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int find_update_struct_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { int count, i, ret; - struct bt_field_type *entry_type = NULL; + bt_field_type *entry_type = NULL; count = bt_field_type_structure_get_field_count(type); for (i = 0; i < count; i++) { @@ -219,11 +219,11 @@ end: } static -int find_update_sequence_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int find_update_sequence_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { int ret; - struct bt_field_type *entry_type = NULL; + bt_field_type *entry_type = NULL; entry_type = bt_field_type_sequence_get_element_type(type); BT_ASSERT(entry_type); @@ -245,11 +245,11 @@ end: } static -int find_update_array_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int find_update_array_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { int ret = 0; - struct bt_field_type *entry_type = NULL; + bt_field_type *entry_type = NULL; entry_type = bt_field_type_array_get_element_type(type); BT_ASSERT(entry_type); @@ -267,11 +267,11 @@ end: } static -int find_update_enum_clock_fields(FILE *err, struct bt_field_type *type, - const struct bt_clock_class *writer_clock_class) +int find_update_enum_clock_fields(FILE *err, bt_field_type *type, + const bt_clock_class *writer_clock_class) { int ret; - struct bt_field_type *entry_type = NULL; + bt_field_type *entry_type = NULL; entry_type = bt_field_type_enumeration_get_container_type(type); BT_ASSERT(entry_type); @@ -293,12 +293,12 @@ end: } BT_HIDDEN -struct bt_field_type *override_header_type(FILE *err, - struct bt_field_type *type, - const struct bt_trace *writer_trace) +bt_field_type *override_header_type(FILE *err, + bt_field_type *type, + const bt_trace *writer_trace) { - struct bt_field_type *new_type = NULL; - const struct bt_clock_class *writer_clock_class = NULL; + bt_field_type *new_type = NULL; + const bt_clock_class *writer_clock_class = NULL; int ret; /* FIXME multi-clock? */ @@ -322,21 +322,21 @@ struct bt_field_type *override_header_type(FILE *err, BT_LOGE_STR("Failed to find clock fields in struct."); goto error; } - BT_OBJECT_PUT_REF_AND_RESET(writer_clock_class); + BT_CLOCK_CLASS_PUT_REF_AND_RESET(writer_clock_class); goto end; error: - bt_object_put_ref(writer_clock_class); + bt_clock_class_put_ref(writer_clock_class); BT_OBJECT_PUT_REF_AND_RESET(new_type); end: return new_type; } static -int copy_float_field(FILE *err, const struct bt_field *field, - struct bt_field_type *type, - const struct bt_field *copy_field) +int copy_float_field(FILE *err, const bt_field *field, + bt_field_type *type, + const bt_field *copy_field) { double value; int ret; @@ -364,9 +364,9 @@ end: } static -int copy_string_field(FILE *err, const struct bt_field *field, - struct bt_field_type *type, - const struct bt_field *copy_field) +int copy_string_field(FILE *err, const bt_field *field, + bt_field_type *type, + const bt_field *copy_field) { const char *value; int ret; @@ -394,11 +394,11 @@ end: } BT_HIDDEN -int copy_override_field(FILE *err, const struct bt_event *event, - const struct bt_event *writer_event, const struct bt_field *field, - const struct bt_field *copy_field) +int copy_override_field(FILE *err, const bt_event *event, + const bt_event *writer_event, const bt_field *field, + const bt_field *copy_field) { - struct bt_field_type *type = NULL; + bt_field_type *type = NULL; int ret = 0; type = bt_field_get_type(field); @@ -447,12 +447,12 @@ int copy_override_field(FILE *err, const struct bt_event *event, } static -int copy_find_clock_enum_field(FILE *err, const struct bt_event *event, - const struct bt_event *writer_event, const struct bt_field *field, - struct bt_field_type *type, const struct bt_field *copy_field) +int copy_find_clock_enum_field(FILE *err, const bt_event *event, + const bt_event *writer_event, const bt_field *field, + bt_field_type *type, const bt_field *copy_field) { int ret; - const struct bt_field *container = NULL, *copy_container = NULL; + const bt_field *container = NULL, *copy_container = NULL; container = bt_field_enumeration_get_container(field); BT_ASSERT(container); @@ -480,13 +480,13 @@ end: } static -int copy_find_clock_variant_field(FILE *err, const struct bt_event *event, - const struct bt_event *writer_event, const struct bt_field *field, - struct bt_field_type *type, const struct bt_field *copy_field) +int copy_find_clock_variant_field(FILE *err, const bt_event *event, + const bt_event *writer_event, const bt_field *field, + bt_field_type *type, const bt_field *copy_field) { int ret; - const struct bt_field *tag = NULL; - const struct bt_field *variant_field = NULL, *copy_variant_field = NULL; + const bt_field *tag = NULL; + const bt_field *variant_field = NULL, *copy_variant_field = NULL; tag = bt_field_variant_get_tag(field); BT_ASSERT(tag); @@ -521,14 +521,14 @@ end: static int copy_find_clock_sequence_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field) + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field) { int ret; uint64_t i, count; - const struct bt_field *length_field = NULL; - const struct bt_field *entry_field = NULL, *entry_copy = NULL; + const bt_field *length_field = NULL; + const bt_field *entry_field = NULL, *entry_copy = NULL; length_field = bt_field_sequence_get_length(field); BT_ASSERT(length_field); @@ -580,12 +580,12 @@ end: static int copy_find_clock_array_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field) + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field) { int ret, count, i; - const struct bt_field *entry_field = NULL, *entry_copy = NULL; + const bt_field *entry_field = NULL, *entry_copy = NULL; count = bt_field_type_array_get_length(type); for (i = 0; i < count; i++) { @@ -623,13 +623,13 @@ end: static int copy_find_clock_struct_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field) + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field) { int count, i, ret; - struct bt_field_type *entry_type = NULL; - const struct bt_field *entry_field = NULL, *entry_copy = NULL; + bt_field_type *entry_type = NULL; + const bt_field *entry_field = NULL, *entry_copy = NULL; count = bt_field_type_structure_get_field_count(type); for (i = 0; i < count; i++) { @@ -675,9 +675,9 @@ end: } static -int set_int_value(FILE *err, const struct bt_field *field, - const struct bt_field *copy_field, - struct bt_field_type *type) +int set_int_value(FILE *err, const bt_field *field, + const bt_field *copy_field, + bt_field_type *type) { uint64_t uvalue; int64_t value; @@ -720,11 +720,11 @@ end: return ret; } -const struct bt_clock_class *stream_class_get_clock_class(FILE *err, - const struct bt_stream_class *stream_class) +const bt_clock_class *stream_class_get_clock_class(FILE *err, + const bt_stream_class *stream_class) { - const struct bt_trace *trace = NULL; - const struct bt_clock_class *clock_class = NULL; + const bt_trace *trace = NULL; + const bt_clock_class *clock_class = NULL; trace = bt_stream_class_get_trace(stream_class); BT_ASSERT(trace); @@ -732,38 +732,38 @@ const struct bt_clock_class *stream_class_get_clock_class(FILE *err, /* FIXME multi-clock? */ clock_class = bt_trace_get_clock_class_by_index(trace, 0); - bt_object_put_ref(trace); + bt_trace_put_ref(trace); return clock_class; } -const struct bt_clock_class *event_get_clock_class(FILE *err, const struct bt_event *event) +const bt_clock_class *event_get_clock_class(FILE *err, const bt_event *event) { - const struct bt_event_class *event_class = NULL; - const struct bt_stream_class *stream_class = NULL; - const struct bt_clock_class *clock_class = NULL; + const bt_event_class *event_class = NULL; + const bt_stream_class *stream_class = NULL; + const bt_clock_class *clock_class = NULL; event_class = bt_event_get_class(event); BT_ASSERT(event_class); stream_class = bt_event_class_get_stream_class(event_class); - BT_OBJECT_PUT_REF_AND_RESET(event_class); + BT_EVENT_CLASS_PUT_REF_AND_RESET(event_class); BT_ASSERT(stream_class); clock_class = stream_class_get_clock_class(err, stream_class); - bt_object_put_ref(stream_class); + bt_stream_class_put_ref(stream_class); return clock_class; } static int copy_find_clock_int_field(FILE *err, - const struct bt_event *event, const struct bt_event *writer_event, - const struct bt_field *field, struct bt_field_type *type, - const struct bt_field *copy_field) + const bt_event *event, const bt_event *writer_event, + const bt_field *field, bt_field_type *type, + const bt_field *copy_field) { - const struct bt_clock_class *clock_class = NULL, *writer_clock_class = NULL; - struct bt_clock_value *clock_value = NULL, *writer_clock_value = NULL; + const bt_clock_class *clock_class = NULL, *writer_clock_class = NULL; + bt_clock_value *clock_value = NULL, *writer_clock_value = NULL; uint64_t value; int ret; @@ -773,7 +773,7 @@ int copy_find_clock_int_field(FILE *err, } clock_value = bt_event_get_clock_value(event, clock_class); - BT_OBJECT_PUT_REF_AND_RESET(clock_class); + BT_CLOCK_CLASS_PUT_REF_AND_RESET(clock_class); BT_ASSERT(clock_value); ret = bt_clock_value_get_value(clock_value, &value); @@ -793,7 +793,7 @@ int copy_find_clock_int_field(FILE *err, BT_ASSERT(writer_clock_class); writer_clock_value = bt_clock_value_create(writer_clock_class, value); - BT_OBJECT_PUT_REF_AND_RESET(writer_clock_class); + BT_CLOCK_CLASS_PUT_REF_AND_RESET(writer_clock_class); if (!writer_clock_value) { BT_LOGE_STR("Failed to create clock value."); goto error;