X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Ftrace.c;h=75a47952eedd4f68e5c0b44ec1c624ddf8e8c5c8;hb=9a19a512f564cbb301b0b5f1377d64e3b3f0a851;hp=5787f9f54f6f3be08d81078ab1d9066d1b190ec8;hpb=e6fa216001c0b8a91868c1982bae990c1304965c;p=babeltrace.git diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c index 5787f9f5..75a47952 100644 --- a/formats/ctf/ir/trace.c +++ b/formats/ctf/ir/trace.c @@ -30,20 +30,26 @@ #include #include #include +#include #include #include +#include +#include #include #include +#include +#include +#include #define DEFAULT_IDENTIFIER_SIZE 128 #define DEFAULT_METADATA_STRING_SIZE 4096 static -void environment_variable_destroy(struct environment_variable *var); -static -void bt_ctf_trace_destroy(struct bt_ctf_ref *ref); +void bt_ctf_trace_destroy(struct bt_object *obj); static int init_trace_packet_header(struct bt_ctf_trace *trace); +static +void bt_ctf_trace_freeze(struct bt_ctf_trace *trace); static const unsigned int field_type_aliases_alignments[] = { @@ -73,46 +79,43 @@ struct bt_ctf_trace *bt_ctf_trace_create(void) } bt_ctf_trace_set_byte_order(trace, BT_CTF_BYTE_ORDER_NATIVE); - bt_ctf_ref_init(&trace->ref_count); - trace->environment = g_ptr_array_new_with_free_func( - (GDestroyNotify)environment_variable_destroy); + bt_object_init(trace, bt_ctf_trace_destroy); trace->clocks = g_ptr_array_new_with_free_func( - (GDestroyNotify)bt_ctf_clock_put); + (GDestroyNotify) bt_put); trace->streams = g_ptr_array_new_with_free_func( - (GDestroyNotify)bt_ctf_stream_put); + (GDestroyNotify) bt_object_release); trace->stream_classes = g_ptr_array_new_with_free_func( - (GDestroyNotify)bt_ctf_stream_class_put); - if (!trace->environment || !trace->clocks || - !trace->stream_classes || !trace->streams) { - goto error_destroy; + (GDestroyNotify) bt_object_release); + if (!trace->clocks || !trace->stream_classes || !trace->streams) { + goto error; } /* Generate a trace UUID */ uuid_generate(trace->uuid); if (init_trace_packet_header(trace)) { - goto error_destroy; + goto error; + } + + /* Create the environment array object */ + trace->environment = bt_ctf_attributes_create(); + if (!trace->environment) { + goto error; } return trace; -error_destroy: - bt_ctf_trace_destroy(&trace->ref_count); - trace = NULL; error: + BT_PUT(trace); return trace; } -void bt_ctf_trace_destroy(struct bt_ctf_ref *ref) +void bt_ctf_trace_destroy(struct bt_object *obj) { struct bt_ctf_trace *trace; - if (!ref) { - return; - } - - trace = container_of(ref, struct bt_ctf_trace, ref_count); + trace = container_of(obj, struct bt_ctf_trace, base); if (trace->environment) { - g_ptr_array_free(trace->environment, TRUE); + bt_ctf_attributes_destroy(trace->environment); } if (trace->clocks) { @@ -127,7 +130,7 @@ void bt_ctf_trace_destroy(struct bt_ctf_ref *ref) g_ptr_array_free(trace->stream_classes, TRUE); } - bt_ctf_field_type_put(trace->packet_header_type); + bt_put(trace->packet_header_type); g_free(trace); } @@ -143,11 +146,6 @@ struct bt_ctf_stream *bt_ctf_trace_create_stream(struct bt_ctf_trace *trace, goto error; } - stream = bt_ctf_stream_create(stream_class, trace); - if (!stream) { - goto error; - } - for (i = 0; i < trace->stream_classes->len; i++) { if (trace->stream_classes->pdata[i] == stream_class) { stream_class_found = 1; @@ -155,143 +153,153 @@ struct bt_ctf_stream *bt_ctf_trace_create_stream(struct bt_ctf_trace *trace, } if (!stream_class_found) { - int64_t stream_id = bt_ctf_stream_class_get_id(stream_class); - - if (stream_id < 0) { - /* Try to assign a new stream id */ - if (bt_ctf_stream_class_set_id(stream->stream_class, - trace->next_stream_id++)) { - goto error; - } - } - - for (i = 0; i < trace->stream_classes->len; i++) { - if (stream_id == bt_ctf_stream_class_get_id( - trace->stream_classes->pdata[i])) { - /* Duplicate stream id found */ - goto error; - } + ret = bt_ctf_trace_add_stream_class(trace, stream_class); + if (ret) { + goto error; } - bt_ctf_stream_class_get(stream->stream_class); - g_ptr_array_add(trace->stream_classes, stream->stream_class); } - bt_ctf_stream_get(stream); - g_ptr_array_add(trace->streams, stream); - - /* - * Freeze the trace and its packet header. - * - * All field type byte orders set as "native" byte ordering can now be - * safely set to trace's own endianness, including the stream class'. - */ - bt_ctf_field_type_set_native_byte_order(trace->packet_header_type, - trace->byte_order); - ret = bt_ctf_stream_class_set_byte_order(stream_class, - trace->byte_order == LITTLE_ENDIAN ? - BT_CTF_BYTE_ORDER_LITTLE_ENDIAN : BT_CTF_BYTE_ORDER_BIG_ENDIAN); - if (ret) { + stream = bt_ctf_stream_create(stream_class, trace); + if (!stream) { goto error; } - bt_ctf_stream_class_freeze(stream_class); - trace->frozen = 1; + g_ptr_array_add(trace->streams, stream); return stream; error: - bt_ctf_stream_put(stream); - return NULL; + BT_PUT(stream); + return stream; } -int bt_ctf_trace_add_environment_field(struct bt_ctf_trace *trace, - const char *name, - const char *value) +int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace, + const char *name, struct bt_value *value) { - struct environment_variable *var = NULL; - char *escaped_value = NULL; int ret = 0; - if (!trace || !name || !value || bt_ctf_validate_identifier(name)) { + if (!trace || !name || !value || + bt_ctf_validate_identifier(name) || + !(bt_value_is_integer(value) || bt_value_is_string(value))) { ret = -1; - goto error; + goto end; } if (strchr(name, ' ')) { ret = -1; - goto error; + goto end; } - var = g_new0(struct environment_variable, 1); - if (!var) { - ret = -1; - goto error; + if (trace->frozen) { + /* + * New environment fields may be added to a frozen trace, + * but existing fields may not be changed. + * + * The object passed is frozen like all other attributes. + */ + struct bt_value *attribute = + bt_ctf_attributes_get_field_value_by_name( + trace->environment, name); + + if (attribute) { + BT_PUT(attribute); + ret = -1; + goto end; + } + + bt_value_freeze(value); } - var->type = BT_ENVIRONMENT_FIELD_TYPE_STRING; - escaped_value = g_strescape(value, NULL); - if (!escaped_value) { + ret = bt_ctf_attributes_set_field_value(trace->environment, name, + value); + +end: + return ret; +} + +int bt_ctf_trace_set_environment_field_string(struct bt_ctf_trace *trace, + const char *name, const char *value) +{ + int ret = 0; + struct bt_value *env_value_string_obj = NULL; + + if (!trace || !name || !value) { ret = -1; - goto error; + goto end; } - var->name = g_string_new(name); - var->value.string = g_string_new(escaped_value); - g_free(escaped_value); - if (!var->name || !var->value.string) { - ret = -1; - goto error; + if (trace->frozen) { + /* + * New environment fields may be added to a frozen trace, + * but existing fields may not be changed. + */ + struct bt_value *attribute = + bt_ctf_attributes_get_field_value_by_name( + trace->environment, name); + + if (attribute) { + BT_PUT(attribute); + ret = -1; + goto end; + } } - g_ptr_array_add(trace->environment, var); - return ret; + env_value_string_obj = bt_value_string_create_init(value); -error: - if (var && var->name) { - g_string_free(var->name, TRUE); + if (!env_value_string_obj) { + ret = -1; + goto end; } - if (var && var->value.string) { - g_string_free(var->value.string, TRUE); + if (trace->frozen) { + bt_value_freeze(env_value_string_obj); } + ret = bt_ctf_trace_set_environment_field(trace, name, + env_value_string_obj); - g_free(var); +end: + BT_PUT(env_value_string_obj); return ret; } -int bt_ctf_trace_add_environment_field_integer(struct bt_ctf_trace *trace, - const char *name, - int64_t value) +int bt_ctf_trace_set_environment_field_integer(struct bt_ctf_trace *trace, + const char *name, int64_t value) { - struct environment_variable *var = NULL; int ret = 0; + struct bt_value *env_value_integer_obj = NULL; if (!trace || !name) { ret = -1; - goto error; + goto end; } - var = g_new0(struct environment_variable, 1); - if (!var) { - ret = -1; - goto error; + if (trace->frozen) { + /* + * New environment fields may be added to a frozen trace, + * but existing fields may not be changed. + */ + struct bt_value *attribute = + bt_ctf_attributes_get_field_value_by_name( + trace->environment, name); + + if (attribute) { + BT_PUT(attribute); + ret = -1; + goto end; + } } - var->type = BT_ENVIRONMENT_FIELD_TYPE_INTEGER; - var->name = g_string_new(name); - var->value.integer = value; - if (!var->name) { + env_value_integer_obj = bt_value_integer_create_init(value); + if (!env_value_integer_obj) { ret = -1; - goto error; + goto end; } - g_ptr_array_add(trace->environment, var); - return ret; - -error: - if (var && var->name) { - g_string_free(var->name, TRUE); + ret = bt_ctf_trace_set_environment_field(trace, name, + env_value_integer_obj); + if (trace->frozen) { + bt_value_freeze(env_value_integer_obj); } - - g_free(var); +end: + BT_PUT(env_value_integer_obj); return ret; } @@ -304,82 +312,55 @@ int bt_ctf_trace_get_environment_field_count(struct bt_ctf_trace *trace) goto end; } - ret = trace->environment->len; -end: - return ret; -} - -enum bt_environment_field_type -bt_ctf_trace_get_environment_field_type(struct bt_ctf_trace *trace, int index) -{ - struct environment_variable *var; - enum bt_environment_field_type type = BT_ENVIRONMENT_FIELD_TYPE_UNKNOWN; - - if (!trace || index < 0 || index >= trace->environment->len) { - goto end; - } + ret = bt_ctf_attributes_get_count(trace->environment); - var = g_ptr_array_index(trace->environment, index); - type = var->type; end: - return type; + return ret; } const char * bt_ctf_trace_get_environment_field_name(struct bt_ctf_trace *trace, int index) { - struct environment_variable *var; const char *ret = NULL; - if (!trace || index < 0 || index >= trace->environment->len) { + if (!trace) { goto end; } - var = g_ptr_array_index(trace->environment, index); - ret = var->name->str; + ret = bt_ctf_attributes_get_field_name(trace->environment, index); + end: return ret; } -const char * -bt_ctf_trace_get_environment_field_value_string(struct bt_ctf_trace *trace, - int index) +struct bt_value *bt_ctf_trace_get_environment_field_value( + struct bt_ctf_trace *trace, int index) { - struct environment_variable *var; - const char *ret = NULL; + struct bt_value *ret = NULL; - if (!trace || index < 0 || index >= trace->environment->len) { + if (!trace) { goto end; } - var = g_ptr_array_index(trace->environment, index); - if (var->type != BT_ENVIRONMENT_FIELD_TYPE_STRING) { - goto end; - } - ret = var->value.string->str; + ret = bt_ctf_attributes_get_field_value(trace->environment, index); + end: return ret; } -int -bt_ctf_trace_get_environment_field_value_integer(struct bt_ctf_trace *trace, - int index, int64_t *value) +struct bt_value *bt_ctf_trace_get_environment_field_value_by_name( + struct bt_ctf_trace *trace, const char *name) { - struct environment_variable *var; - int ret = 0; + struct bt_value *ret = NULL; - if (!trace || !value || index < 0 || index >= trace->environment->len) { - ret = -1; + if (!trace || !name) { goto end; } - var = g_ptr_array_index(trace->environment, index); - if (var->type != BT_ENVIRONMENT_FIELD_TYPE_INTEGER) { - ret = -1; - goto end; - } - *value = var->value.integer; + ret = bt_ctf_attributes_get_field_value_by_name(trace->environment, + name); + end: return ret; } @@ -402,7 +383,7 @@ int bt_ctf_trace_add_clock(struct bt_ctf_trace *trace, goto end; } - bt_ctf_clock_get(clock); + bt_get(clock); g_ptr_array_add(trace->clocks, clock); end: return ret; @@ -431,7 +412,320 @@ struct bt_ctf_clock *bt_ctf_trace_get_clock(struct bt_ctf_trace *trace, } clock = g_ptr_array_index(trace->clocks, index); - bt_ctf_clock_get(clock); + bt_get(clock); +end: + return clock; +} + +int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace, + struct bt_ctf_stream_class *stream_class) +{ + int ret, i; + int64_t stream_id; + struct bt_ctf_validation_output trace_sc_validation_output = { 0 }; + struct bt_ctf_validation_output *ec_validation_outputs = NULL; + const enum bt_ctf_validation_flag trace_sc_validation_flags = + BT_CTF_VALIDATION_FLAG_TRACE | + BT_CTF_VALIDATION_FLAG_STREAM; + const enum bt_ctf_validation_flag ec_validation_flags = + BT_CTF_VALIDATION_FLAG_EVENT; + 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; + int event_class_count; + + if (!trace || !stream_class) { + ret = -1; + goto end; + } + + event_class_count = + bt_ctf_stream_class_get_event_class_count(stream_class); + assert(event_class_count >= 0); + + /* Check for duplicate stream classes */ + for (i = 0; i < trace->stream_classes->len; i++) { + if (trace->stream_classes->pdata[i] == stream_class) { + /* Stream class already registered to the trace */ + ret = -1; + goto end; + } + } + + /* + * We're about to freeze both the trace and the stream class. + * Also, each event class contained in this stream class are + * already frozen. + * + * This trace, this stream class, and all its event classes + * should be valid at this point. + * + * Validate trace and stream class first, then each event + * class of this stream class can be validated individually. + */ + 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); + ret = bt_ctf_validate_class_types(trace->environment, + packet_header_type, packet_context_type, event_header_type, + stream_event_ctx_type, NULL, NULL, trace->valid, + stream_class->valid, 1, &trace_sc_validation_output, + trace_sc_validation_flags); + BT_PUT(packet_header_type); + BT_PUT(packet_context_type); + BT_PUT(event_header_type); + BT_PUT(stream_event_ctx_type); + + if (ret) { + /* + * This means something went wrong during the validation + * process, not that the objects are invalid. + */ + goto end; + } + + if ((trace_sc_validation_output.valid_flags & + trace_sc_validation_flags) != + trace_sc_validation_flags) { + /* Invalid trace/stream class */ + ret = -1; + goto end; + } + + if (event_class_count > 0) { + ec_validation_outputs = g_new0(struct bt_ctf_validation_output, + event_class_count); + if (!ec_validation_outputs) { + ret = -1; + goto end; + } + } + + /* Validate each event class individually */ + for (i = 0; i < event_class_count; ++i) { + struct bt_ctf_event_class *event_class = + bt_ctf_stream_class_get_event_class(stream_class, i); + struct bt_ctf_field_type *event_context_type = NULL; + struct bt_ctf_field_type *event_payload_type = NULL; + + event_context_type = + bt_ctf_event_class_get_context_type(event_class); + event_payload_type = + bt_ctf_event_class_get_payload_type(event_class); + + /* + * It is important to use the field types returned by + * the previous trace and stream class validation here + * because copies could have been made. + */ + ret = bt_ctf_validate_class_types(trace->environment, + trace_sc_validation_output.packet_header_type, + trace_sc_validation_output.packet_context_type, + trace_sc_validation_output.event_header_type, + trace_sc_validation_output.stream_event_ctx_type, + event_context_type, event_payload_type, + 1, 1, event_class->valid, &ec_validation_outputs[i], + ec_validation_flags); + BT_PUT(event_context_type); + BT_PUT(event_payload_type); + BT_PUT(event_class); + + if (ret) { + goto end; + } + + if ((ec_validation_outputs[i].valid_flags & + ec_validation_flags) != ec_validation_flags) { + /* Invalid event class */ + ret = -1; + goto end; + } + } + + stream_id = bt_ctf_stream_class_get_id(stream_class); + if (stream_id < 0) { + stream_id = trace->next_stream_id++; + + /* Try to assign a new stream id */ + for (i = 0; i < trace->stream_classes->len; i++) { + if (stream_id == bt_ctf_stream_class_get_id( + trace->stream_classes->pdata[i])) { + /* Duplicate stream id found */ + ret = -1; + goto end; + } + } + + if (bt_ctf_stream_class_set_id_no_check(stream_class, + stream_id)) { + /* TODO Should retry with a different stream id */ + ret = -1; + goto end; + } + } + + bt_object_set_parent(stream_class, trace); + g_ptr_array_add(trace->stream_classes, stream_class); + + /* + * At this point we know that the function will be successful. + * Therefore we can replace the trace and stream class field + * types with what's in their validation output structure and + * mark them as valid. We can also replace the field types of + * all the event classes of the stream class and mark them as + * valid. + */ + bt_ctf_validation_replace_types(trace, stream_class, NULL, + &trace_sc_validation_output, trace_sc_validation_flags); + trace->valid = 1; + stream_class->valid = 1; + + /* + * Put what was not moved in bt_ctf_validation_replace_types(). + */ + bt_ctf_validation_output_put_types(&trace_sc_validation_output); + + for (i = 0; i < event_class_count; ++i) { + struct bt_ctf_event_class *event_class = + bt_ctf_stream_class_get_event_class(stream_class, i); + + bt_ctf_validation_replace_types(NULL, NULL, event_class, + &ec_validation_outputs[i], ec_validation_flags); + event_class->valid = 1; + BT_PUT(event_class); + + /* + * Put what was not moved in + * bt_ctf_validation_replace_types(). + */ + bt_ctf_validation_output_put_types(&ec_validation_outputs[i]); + } + + /* + * All field type byte orders set as "native" byte ordering can now be + * safely set to trace's own endianness, including the stream class'. + */ + bt_ctf_field_type_set_native_byte_order(trace->packet_header_type, + trace->byte_order); + bt_ctf_stream_class_set_byte_order(stream_class, trace->byte_order); + + /* + * Freeze the trace and the stream class. + */ + bt_ctf_stream_class_freeze(stream_class); + bt_ctf_trace_freeze(trace); + +end: + if (ret) { + bt_object_set_parent(stream_class, NULL); + + if (ec_validation_outputs) { + for (i = 0; i < event_class_count; ++i) { + bt_ctf_validation_output_put_types( + &ec_validation_outputs[i]); + } + } + } + + g_free(ec_validation_outputs); + bt_ctf_validation_output_put_types(&trace_sc_validation_output); + assert(!packet_header_type); + assert(!packet_context_type); + assert(!event_header_type); + assert(!stream_event_ctx_type); + + return ret; +} + +int bt_ctf_trace_get_stream_class_count(struct bt_ctf_trace *trace) +{ + int ret; + + if (!trace) { + ret = -1; + goto end; + } + + ret = trace->stream_classes->len; +end: + return ret; +} + +struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class( + struct bt_ctf_trace *trace, int index) +{ + struct bt_ctf_stream_class *stream_class = NULL; + + if (!trace || index < 0 || index >= trace->stream_classes->len) { + goto end; + } + + stream_class = g_ptr_array_index(trace->stream_classes, index); + bt_get(stream_class); +end: + return stream_class; +} + +struct bt_ctf_stream_class *bt_ctf_trace_get_stream_class_by_id( + struct bt_ctf_trace *trace, uint32_t id) +{ + int i; + struct bt_ctf_stream_class *stream_class = NULL; + + if (!trace) { + goto end; + } + + for (i = 0; i < trace->stream_classes->len; ++i) { + struct bt_ctf_stream_class *stream_class_candidate; + + stream_class_candidate = + g_ptr_array_index(trace->stream_classes, i); + + if (bt_ctf_stream_class_get_id(stream_class_candidate) == + (int64_t) id) { + stream_class = stream_class_candidate; + bt_get(stream_class); + goto end; + } + } + +end: + return stream_class; +} + +struct bt_ctf_clock *bt_ctf_trace_get_clock_by_name( + struct bt_ctf_trace *trace, const char *name) +{ + size_t i; + struct bt_ctf_clock *clock = NULL; + + if (!trace || !name) { + goto end; + } + + for (i = 0; i < trace->clocks->len; ++i) { + struct bt_ctf_clock *cur_clk = + g_ptr_array_index(trace->clocks, i); + const char *cur_clk_name = bt_ctf_clock_get_name(cur_clk); + + if (!cur_clk_name) { + goto end; + } + + if (!strcmp(cur_clk_name, name)) { + clock = cur_clk; + bt_get(clock); + goto end; + } + } + end: return clock; } @@ -492,35 +786,85 @@ end: return ret; } -static -void append_env_field_metadata(struct environment_variable *var, - struct metadata_context *context) -{ - switch (var->type) { - case BT_ENVIRONMENT_FIELD_TYPE_STRING: - g_string_append_printf(context->string, "\t%s = \"%s\";\n", - var->name->str, var->value.string->str); - break; - case BT_ENVIRONMENT_FIELD_TYPE_INTEGER: - g_string_append_printf(context->string, "\t%s = %" PRId64 ";\n", - var->name->str, var->value.integer); - break; - default: - assert(0); - } -} - static void append_env_metadata(struct bt_ctf_trace *trace, struct metadata_context *context) { - if (trace->environment->len == 0) { + int i; + int env_size; + + env_size = bt_ctf_attributes_get_count(trace->environment); + + if (env_size <= 0) { return; } g_string_append(context->string, "env {\n"); - g_ptr_array_foreach(trace->environment, - (GFunc)append_env_field_metadata, context); + + for (i = 0; i < env_size; ++i) { + struct bt_value *env_field_value_obj = NULL; + const char *entry_name; + + entry_name = bt_ctf_attributes_get_field_name( + trace->environment, i); + env_field_value_obj = bt_ctf_attributes_get_field_value( + trace->environment, i); + + if (!entry_name || !env_field_value_obj) { + goto loop_next; + } + + switch (bt_value_get_type(env_field_value_obj)) { + case BT_VALUE_TYPE_INTEGER: + { + int ret; + int64_t int_value; + + ret = bt_value_integer_get(env_field_value_obj, + &int_value); + + if (ret) { + goto loop_next; + } + + g_string_append_printf(context->string, + "\t%s = %" PRId64 ";\n", entry_name, + int_value); + break; + } + case BT_VALUE_TYPE_STRING: + { + int ret; + const char *str_value; + char *escaped_str = NULL; + + ret = bt_value_string_get(env_field_value_obj, + &str_value); + + if (ret) { + goto loop_next; + } + + escaped_str = g_strescape(str_value, NULL); + + if (!escaped_str) { + goto loop_next; + } + + g_string_append_printf(context->string, + "\t%s = \"%s\";\n", entry_name, escaped_str); + free(escaped_str); + break; + } + + default: + goto loop_next; + } + +loop_next: + BT_PUT(env_field_value_obj); + } + g_string_append(context->string, "};\n\n"); } @@ -567,6 +911,28 @@ end: return metadata; } +enum bt_ctf_byte_order bt_ctf_trace_get_byte_order(struct bt_ctf_trace *trace) +{ + enum bt_ctf_byte_order ret = BT_CTF_BYTE_ORDER_UNKNOWN; + + if (!trace) { + goto end; + } + + switch (trace->byte_order) { + case BIG_ENDIAN: + ret = BT_CTF_BYTE_ORDER_BIG_ENDIAN; + break; + case LITTLE_ENDIAN: + ret = BT_CTF_BYTE_ORDER_LITTLE_ENDIAN; + break; + default: + break; + } +end: + return ret; +} + int bt_ctf_trace_set_byte_order(struct bt_ctf_trace *trace, enum bt_ctf_byte_order byte_order) { @@ -618,7 +984,7 @@ struct bt_ctf_field_type *bt_ctf_trace_get_packet_header_type( goto end; } - bt_ctf_field_type_get(trace->packet_header_type); + bt_get(trace->packet_header_type); field_type = trace->packet_header_type; end: return field_type; @@ -636,13 +1002,13 @@ int bt_ctf_trace_set_packet_header_type(struct bt_ctf_trace *trace, /* packet_header_type must be a structure */ if (bt_ctf_field_type_get_type_id(packet_header_type) != - CTF_TYPE_STRUCT) { + BT_CTF_TYPE_ID_STRUCT) { ret = -1; goto end; } - bt_ctf_field_type_get(packet_header_type); - bt_ctf_field_type_put(trace->packet_header_type); + bt_get(packet_header_type); + bt_put(trace->packet_header_type); trace->packet_header_type = packet_header_type; end: return ret; @@ -650,39 +1016,41 @@ end: void bt_ctf_trace_get(struct bt_ctf_trace *trace) { - if (!trace) { - return; - } - - bt_ctf_ref_get(&trace->ref_count); + bt_get(trace); } void bt_ctf_trace_put(struct bt_ctf_trace *trace) { - if (!trace) { - return; - } + bt_put(trace); - bt_ctf_ref_put(&trace->ref_count, bt_ctf_trace_destroy); } BT_HIDDEN struct bt_ctf_field_type *get_field_type(enum field_type_alias alias) { unsigned int alignment, size; - struct bt_ctf_field_type *field_type; + struct bt_ctf_field_type *field_type = NULL; if (alias >= NR_FIELD_TYPE_ALIAS) { - return NULL; + goto end; } alignment = field_type_aliases_alignments[alias]; size = field_type_aliases_sizes[alias]; field_type = bt_ctf_field_type_integer_create(size); bt_ctf_field_type_set_alignment(field_type, alignment); +end: return field_type; } +static +void bt_ctf_trace_freeze(struct bt_ctf_trace *trace) +{ + bt_ctf_field_type_freeze(trace->packet_header_type); + bt_ctf_attributes_freeze(trace->environment); + trace->frozen = 1; +} + static int init_trace_packet_header(struct bt_ctf_trace *trace) { @@ -726,22 +1094,11 @@ int init_trace_packet_header(struct bt_ctf_trace *trace) goto end; } end: - bt_ctf_field_type_put(uuid_array_type); - bt_ctf_field_type_put(_uint32_t); - bt_ctf_field_type_put(_uint8_t); - bt_ctf_field_put(magic); - bt_ctf_field_put(uuid_array); - bt_ctf_field_type_put(trace_packet_header_type); - + bt_put(uuid_array_type); + bt_put(_uint32_t); + bt_put(_uint8_t); + bt_put(magic); + bt_put(uuid_array); + bt_put(trace_packet_header_type); return ret; } - -static -void environment_variable_destroy(struct environment_variable *var) -{ - g_string_free(var->name, TRUE); - if (var->type == BT_ENVIRONMENT_FIELD_TYPE_STRING) { - g_string_free(var->value.string, TRUE); - } - g_free(var); -}