#include <babeltrace/ctf-ir/attributes-internal.h>
#include <babeltrace/ctf-ir/visitor-internal.h>
#include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/ctf-ir/ref.h>
+#include <babeltrace/ctf-ir/common-internal.h>
#include <babeltrace/compiler.h>
#include <babeltrace/objects.h>
#define DEFAULT_METADATA_STRING_SIZE 4096
static
-void bt_ctf_trace_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_trace_destroy(struct bt_ref *ref);
static
int init_trace_packet_header(struct bt_ctf_trace *trace);
static
-void bt_ctf_trace_freeze(struct bt_ctf_trace *trace);
+int bt_ctf_trace_freeze(struct bt_ctf_trace *trace);
static
const unsigned int field_type_aliases_alignments[] = {
}
bt_ctf_trace_set_byte_order(trace, BT_CTF_BYTE_ORDER_NATIVE);
- bt_ctf_ref_init(&trace->ref_count);
+ bt_ctf_base_init(trace, bt_ctf_trace_destroy);
trace->clocks = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_ctf_clock_put);
trace->streams = g_ptr_array_new_with_free_func(
return trace;
error_destroy:
- bt_ctf_trace_destroy(&trace->ref_count);
+ bt_ctf_trace_destroy(&trace->base.ref_count);
trace = NULL;
error:
return trace;
}
-void bt_ctf_trace_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_trace_destroy(struct bt_ref *ref)
{
struct bt_ctf_trace *trace;
+ struct bt_ctf_base *base;
if (!ref) {
return;
}
- trace = container_of(ref, struct bt_ctf_trace, ref_count);
+ base = container_of(ref, struct bt_ctf_base, ref_count);
+ trace = container_of(base, struct bt_ctf_trace, base);
if (trace->environment) {
bt_ctf_attributes_destroy(trace->environment);
}
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;
}
}
+ stream = bt_ctf_stream_create(stream_class, trace);
+ if (!stream) {
+ goto error;
+ }
+
bt_ctf_stream_get(stream);
g_ptr_array_add(trace->streams, stream);
bt_ctf_stream_class_freeze(stream_class);
if (!trace->frozen) {
- bt_ctf_trace_freeze(trace);
+ ret = bt_ctf_trace_freeze(trace);
+ goto end;
}
end:
if (ret) {
void bt_ctf_trace_get(struct bt_ctf_trace *trace)
{
- if (!trace) {
- return;
- }
-
- bt_ctf_ref_get(&trace->ref_count);
+ bt_ctf_get(trace);
}
void bt_ctf_trace_put(struct bt_ctf_trace *trace)
{
- if (!trace) {
- return;
- }
+ bt_ctf_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)
+int bt_ctf_trace_freeze(struct bt_ctf_trace *trace)
{
- bt_ctf_trace_resolve_types(trace);
+ int ret = 0;
+
+ ret = bt_ctf_trace_resolve_types(trace);
+ if (ret) {
+ goto end;
+ }
+
bt_ctf_attributes_freeze(trace->environment);
trace->frozen = 1;
+end:
+ return ret;
}
static