#include <babeltrace/ctf-ir/stream.h>
#include <babeltrace/ctf-ir/stream-internal.h>
#include <babeltrace/ctf-ir/stream-class-internal.h>
-#include <babeltrace/ctf-ir/ref.h>
-#include <babeltrace/ctf-ir/common-internal.h>
+#include <babeltrace/ref.h>
#include <babeltrace/ctf-writer/functor-internal.h>
#include <babeltrace/compiler.h>
#include <babeltrace/align.h>
#include <babeltrace/ctf/ctf-index.h>
static
-void bt_ctf_stream_destroy(struct bt_ref *ref);
+void bt_ctf_stream_destroy(struct bt_object *obj);
static
int set_structure_field_integer(struct bt_ctf_field *, char *, uint64_t);
(uint64_t) 0xC1FC1FC1);
}
end:
- if (magic_field) {
- bt_ctf_field_put(magic_field);
- }
- if (magic_field_type) {
- bt_ctf_field_type_put(magic_field_type);
- }
+ bt_put(magic_field);
+ bt_put(magic_field_type);
return ret;
}
int set_packet_header_uuid(struct bt_ctf_stream *stream)
{
int i, ret = 0;
+ struct bt_ctf_trace *trace = NULL;
struct bt_ctf_field_type *uuid_field_type = NULL;
struct bt_ctf_field_type *element_field_type = NULL;
struct bt_ctf_field *uuid_field = bt_ctf_field_structure_get_field(
goto end;
}
+ trace = (struct bt_ctf_trace *) bt_object_get_parent(stream);
for (i = 0; i < 16; i++) {
struct bt_ctf_field *uuid_element =
bt_ctf_field_array_get_field(uuid_field, i);
if (ret) {
ret = bt_ctf_field_signed_integer_set_value(
- uuid_element, (int64_t) stream->trace->uuid[i]);
+ uuid_element, (int64_t) trace->uuid[i]);
} else {
ret = bt_ctf_field_unsigned_integer_set_value(
uuid_element,
- (uint64_t) stream->trace->uuid[i]);
+ (uint64_t) trace->uuid[i]);
}
- bt_ctf_field_put(uuid_element);
+ bt_put(uuid_element);
if (ret) {
goto end;
}
}
end:
- if (uuid_field) {
- bt_ctf_field_put(uuid_field);
- }
- if (uuid_field_type) {
- bt_ctf_field_type_put(uuid_field_type);
- }
- if (element_field_type) {
- bt_ctf_field_type_put(element_field_type);
- }
+ bt_put(uuid_field);
+ bt_put(uuid_field_type);
+ bt_put(element_field_type);
+ BT_PUT(trace);
return ret;
}
static
(uint64_t) stream_id);
}
end:
- if (stream_id_field) {
- bt_ctf_field_put(stream_id_field);
- }
- if (stream_id_field_type) {
- bt_ctf_field_type_put(stream_id_field_type);
- }
+ bt_put(stream_id_field);
+ bt_put(stream_id_field_type);
return ret;
}
}
static
-void put_event(struct bt_ctf_event *event)
+void release_event(struct bt_ctf_event *event)
{
- bt_ctf_event_set_stream(event, NULL);
- bt_ctf_event_put(event);
+ if (bt_object_get_ref_count(event)) {
+ /*
+ * The event is being orphaned, but it must guarantee the
+ * existence of its event class for the duration of its
+ * lifetime.
+ */
+ bt_get(event->event_class);
+ BT_PUT(event->base.parent);
+ } else {
+ bt_object_release(event);
+ }
}
BT_HIDDEN
goto end;
}
- /* A stream has no ownership of its trace (weak ptr) */
- stream->trace = trace;
- bt_ctf_base_init(stream, bt_ctf_stream_destroy);
+ bt_object_init(stream, bt_ctf_stream_destroy);
+ /*
+ * Acquire reference to parent since stream will become publicly
+ * reachable; it needs its parent to remain valid.
+ */
+ bt_object_set_parent(stream, trace);
stream->packet_context = bt_ctf_field_create(
stream_class->packet_context_type);
if (!stream->packet_context) {
- goto error_destroy;
+ goto error;
}
/*
if (stream_class->event_context_type) {
stream->event_context = bt_ctf_field_create(
stream_class->event_context_type);
- if (!stream->packet_context) {
- goto error_destroy;
+ if (!stream->event_context) {
+ goto error;
}
}
ret = set_structure_field_integer(stream->packet_context,
"events_discarded", 0);
if (ret) {
- goto error_destroy;
+ goto error;
}
stream->pos.fd = -1;
stream->id = stream_class->next_stream_id++;
stream->stream_class = stream_class;
- bt_ctf_stream_class_get(stream_class);
stream->events = g_ptr_array_new_with_free_func(
- (GDestroyNotify) put_event);
+ (GDestroyNotify) release_event);
if (!stream->events) {
- goto error_destroy;
+ goto error;
}
if (stream_class->event_context_type) {
stream->event_contexts = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_ctf_field_put);
+ (GDestroyNotify) bt_put);
if (!stream->event_contexts) {
- goto error_destroy;
+ goto error;
}
}
assert(trace->packet_header_type);
stream->packet_header = bt_ctf_field_create(trace->packet_header_type);
if (!stream->packet_header) {
- goto error_destroy;
+ goto error;
}
/*
* Attempt to populate the default trace packet header fields
*/
ret = set_packet_header(stream);
if (ret) {
- goto error_destroy;
+ goto error;
}
end:
return stream;
-error_destroy:
- bt_ctf_stream_destroy(&stream->base.ref_count);
- return NULL;
+error:
+ BT_PUT(stream);
+ bt_put(trace);
+ return stream;
}
BT_HIDDEN
}
stream_class = stream->stream_class;
- bt_ctf_stream_class_get(stream_class);
+ bt_get(stream_class);
end:
return stream_class;
}
}
}
end:
- if (events_discarded_field) {
- bt_ctf_field_put(events_discarded_field);
- }
- if (events_discarded_field_type) {
- bt_ctf_field_type_put(events_discarded_field_type);
- }
+ bt_put(events_discarded_field);
+ bt_put(events_discarded_field_type);
return ret;
}
}
end:
- if (events_discarded_field) {
- bt_ctf_field_put(events_discarded_field);
- }
- if (events_discarded_field_type) {
- bt_ctf_field_type_put(events_discarded_field_type);
- }
+ bt_put(events_discarded_field);
+ bt_put(events_discarded_field_type);
}
int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
goto end;
}
- ret = bt_ctf_event_set_stream(event, stream);
- if (ret) {
- /* Event was already associated to a stream */
- ret = -1;
- goto end;
- }
-
+ bt_object_set_parent(event, stream);
ret = bt_ctf_event_populate_event_header(event);
if (ret) {
goto end;
}
}
- bt_ctf_event_get(event);
/* Save the new event along with its associated stream event context */
g_ptr_array_add(stream->events, event);
if (event_context_copy) {
g_ptr_array_add(stream->event_contexts, event_context_copy);
}
+ /*
+ * Event had to hold a reference to its event class as long as it wasn't
+ * part of the same trace hierarchy. From now on, the event and its
+ * class share the same lifetime guarantees and the reference is no
+ * longer needed.
+ */
+ bt_put(event->event_class);
end:
if (ret) {
- (void) bt_ctf_event_set_stream(event, NULL);
+ /*
+ * Orphan the event; we were not succesful in associating it to
+ * a stream.
+ */
+ bt_object_set_parent(event, NULL);
}
return ret;
}
packet_context = stream->packet_context;
if (packet_context) {
- bt_ctf_field_get(packet_context);
+ bt_get(packet_context);
}
end:
return packet_context;
}
field_type = bt_ctf_field_get_type(field);
- if (field_type != stream->stream_class->packet_context_type) {
+ if (bt_ctf_field_type_compare(field_type,
+ stream->stream_class->packet_context_type)) {
ret = -1;
goto end;
}
- bt_ctf_field_type_put(field_type);
- bt_ctf_field_get(field);
- bt_ctf_field_put(stream->packet_context);
+ bt_put(field_type);
+ bt_get(field);
+ bt_put(stream->packet_context);
stream->packet_context = field;
end:
return ret;
event_context = stream->event_context;
if (event_context) {
- bt_ctf_field_get(event_context);
+ bt_get(event_context);
}
end:
return event_context;
}
field_type = bt_ctf_field_get_type(field);
- if (field_type != stream->stream_class->event_context_type) {
+ if (bt_ctf_field_type_compare(field_type,
+ stream->stream_class->event_context_type)) {
ret = -1;
goto end;
}
- bt_ctf_field_get(field);
- bt_ctf_field_put(stream->event_context);
+ bt_get(field);
+ bt_put(stream->event_context);
stream->event_context = field;
end:
- if (field_type) {
- bt_ctf_field_type_put(field_type);
- }
+ bt_put(field_type);
return ret;
}
packet_header = stream->packet_header;
if (packet_header) {
- bt_ctf_field_get(packet_header);
+ bt_get(packet_header);
}
end:
return packet_header;
struct bt_ctf_field *field)
{
int ret = 0;
+ struct bt_ctf_trace *trace = NULL;
struct bt_ctf_field_type *field_type = NULL;
if (!stream || !field) {
goto end;
}
+ trace = (struct bt_ctf_trace *) bt_object_get_parent(stream);
field_type = bt_ctf_field_get_type(field);
- if (field_type != stream->trace->packet_header_type) {
+ if (bt_ctf_field_type_compare(field_type, trace->packet_header_type)) {
ret = -1;
goto end;
}
- bt_ctf_field_get(field);
- bt_ctf_field_put(stream->packet_header);
+ bt_get(field);
+ bt_put(stream->packet_header);
stream->packet_header = field;
end:
- if (field_type) {
- bt_ctf_field_type_put(field_type);
- }
+ BT_PUT(trace);
+ bt_put(field_type);
return ret;
}
}
}
end:
- bt_ctf_field_put(timestamp_field);
- bt_ctf_field_type_put(timestamp_field_type);
+ bt_put(timestamp_field);
+ bt_put(timestamp_field_type);
return ret;
}
}
stream->flushed_packet_count++;
end:
- bt_ctf_field_put(integer);
+ bt_put(integer);
return ret;
}
void bt_ctf_stream_get(struct bt_ctf_stream *stream)
{
- bt_ctf_get(stream);
+ bt_get(stream);
}
void bt_ctf_stream_put(struct bt_ctf_stream *stream)
{
- bt_ctf_put(stream);
+ bt_put(stream);
}
static
-void bt_ctf_stream_destroy(struct bt_ref *ref)
+void bt_ctf_stream_destroy(struct bt_object *obj)
{
struct bt_ctf_stream *stream;
- struct bt_ctf_base *base;
- if (!ref) {
- return;
- }
-
- base = container_of(ref, struct bt_ctf_base, ref_count);
- stream = container_of(base, struct bt_ctf_stream, base);
+ stream = container_of(obj, struct bt_ctf_stream, base);
ctf_fini_pos(&stream->pos);
if (stream->pos.fd >= 0 && close(stream->pos.fd)) {
perror("close");
}
- if (stream->stream_class) {
- bt_ctf_stream_class_put(stream->stream_class);
- }
if (stream->events) {
g_ptr_array_free(stream->events, TRUE);
}
if (stream->event_contexts) {
g_ptr_array_free(stream->event_contexts, TRUE);
}
- if (stream->packet_header) {
- bt_ctf_field_put(stream->packet_header);
- }
- if (stream->packet_context) {
- bt_ctf_field_put(stream->packet_context);
- }
- if (stream->event_context) {
- bt_ctf_field_put(stream->event_context);
- }
+ bt_put(stream->packet_header);
+ bt_put(stream->packet_context);
+ bt_put(stream->event_context);
g_free(stream);
}
ret = bt_ctf_field_unsigned_integer_set_value(integer, value);
}
end:
- if (integer) {
- bt_ctf_field_put(integer);
- }
- if (field_type) {
- bt_ctf_field_type_put(field_type);
- }
+ bt_put(integer);
+ bt_put(field_type);
return ret;
}
projects / babeltrace.git / blobdiff