#include <babeltrace/ctf-ir/stream.h>
#include <babeltrace/ctf-ir/stream-internal.h>
#include <babeltrace/ctf-ir/stream-class-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_ctf_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;
}
uuid_element,
(uint64_t) stream->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);
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;
}
return ret;
}
+static
+void put_event(struct bt_ctf_event *event)
+{
+ bt_ctf_event_set_stream(event, NULL);
+ bt_put(event);
+}
+
BT_HIDDEN
struct bt_ctf_stream *bt_ctf_stream_create(
struct bt_ctf_stream_class *stream_class,
goto end;
}
+ /* A stream has no ownership of its trace (weak ptr) */
stream->trace = trace;
- bt_ctf_ref_init(&stream->ref_count);
+ bt_object_init(stream, bt_ctf_stream_destroy);
stream->packet_context = bt_ctf_field_create(
stream_class->packet_context_type);
if (!stream->packet_context) {
- goto error_destroy;
+ goto error;
}
/*
stream->event_context = bt_ctf_field_create(
stream_class->event_context_type);
if (!stream->packet_context) {
- goto error_destroy;
+ 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);
- bt_ctf_stream_class_freeze(stream_class);
+ bt_get(stream_class);
stream->events = g_ptr_array_new_with_free_func(
- (GDestroyNotify) bt_ctf_event_put);
+ (GDestroyNotify) put_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);
if (!stream->event_contexts) {
- goto error_destroy;
+ goto error;
}
}
/* A trace is not allowed to have a NULL packet header */
assert(trace->packet_header_type);
stream->packet_header = bt_ctf_field_create(trace->packet_header_type);
+ if (!stream->packet_header) {
+ goto error;
+ }
/*
* Attempt to populate the default trace packet header fields
* (magic, uuid and stream_id). This will _not_ fail shall the
*/
ret = set_packet_header(stream);
if (ret) {
- goto error_destroy;
+ goto error;
}
end:
return stream;
-error_destroy:
- bt_ctf_stream_destroy(&stream->ref_count);
- return NULL;
+error:
+ BT_PUT(stream);
+ return stream;
}
BT_HIDDEN
return ret;
}
-BT_HIDDEN
-void bt_ctf_stream_set_trace(struct bt_ctf_stream *stream,
- struct bt_ctf_trace *trace)
-{
- stream->trace = trace;
-}
-
struct bt_ctf_stream_class *bt_ctf_stream_get_class(
struct bt_ctf_stream *stream)
{
}
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,
struct bt_ctf_event *event)
{
int ret = 0;
- uint64_t timestamp;
struct bt_ctf_field *event_context_copy = NULL;
if (!stream || !event) {
goto end;
}
+ ret = bt_ctf_event_set_stream(event, stream);
+ if (ret) {
+ /* Event was already associated to a stream */
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_ctf_event_populate_event_header(event);
+ if (ret) {
+ goto end;
+ }
+
/* Make sure the event's payload is set */
ret = bt_ctf_event_validate(event);
if (ret) {
}
}
- timestamp = bt_ctf_clock_get_time(stream->stream_class->clock);
- ret = bt_ctf_event_set_timestamp(event, timestamp);
- if (ret) {
- goto end;
- }
-
- bt_ctf_event_get(event);
+ bt_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);
}
end:
+ if (ret) {
+ (void) bt_ctf_event_set_stream(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;
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;
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;
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(field_type);
+ return ret;
+}
+
+static
+int get_event_header_timestamp(struct bt_ctf_field *event_header, uint64_t *timestamp)
+{
+ int ret = 0;
+ struct bt_ctf_field *timestamp_field = NULL;
+ struct bt_ctf_field_type *timestamp_field_type = NULL;
+
+ timestamp_field = bt_ctf_field_structure_get_field(event_header,
+ "timestamp");
+ if (!timestamp_field) {
+ ret = -1;
+ goto end;
+ }
+
+ timestamp_field_type = bt_ctf_field_get_type(timestamp_field);
+ assert(timestamp_field_type);
+ if (bt_ctf_field_type_get_type_id(timestamp_field_type) !=
+ CTF_TYPE_INTEGER) {
+ ret = -1;
+ goto end;
}
+
+ if (bt_ctf_field_type_integer_get_signed(timestamp_field_type)) {
+ int64_t val;
+
+ ret = bt_ctf_field_signed_integer_get_value(timestamp_field,
+ &val);
+ if (ret) {
+ goto end;
+ }
+ *timestamp = (uint64_t) val;
+ } else {
+ ret = bt_ctf_field_unsigned_integer_get_value(timestamp_field,
+ timestamp);
+ if (ret) {
+ goto end;
+ }
+ }
+end:
+ bt_put(timestamp_field);
+ bt_put(timestamp_field_type);
return ret;
}
int ret = 0;
size_t i;
uint64_t timestamp_begin, timestamp_end, events_discarded;
- struct bt_ctf_stream_class *stream_class;
struct bt_ctf_field *integer = NULL;
struct ctf_stream_pos packet_context_pos;
goto end;
}
- if (stream->flushed_packet_count) {
- /* ctf_init_pos has already initialized the first packet */
- ctf_packet_seek(&stream->pos.parent, 0, SEEK_CUR);
- }
+ /* mmap the next packet */
+ ctf_packet_seek(&stream->pos.parent, 0, SEEK_CUR);
ret = bt_ctf_field_serialize(stream->packet_header, &stream->pos);
if (ret) {
goto end;
}
- stream_class = stream->stream_class;
- timestamp_begin = ((struct bt_ctf_event *) g_ptr_array_index(
- stream->events, 0))->timestamp;
- timestamp_end = ((struct bt_ctf_event *) g_ptr_array_index(
- stream->events, stream->events->len - 1))->timestamp;
-
/* Set the default context attributes if present and unset. */
- ret = set_structure_field_integer(stream->packet_context,
- "timestamp_begin", timestamp_begin);
- if (ret) {
- goto end;
+ if (!get_event_header_timestamp(
+ ((struct bt_ctf_event *) g_ptr_array_index(
+ stream->events, 0))->event_header, ×tamp_begin)) {
+ ret = set_structure_field_integer(stream->packet_context,
+ "timestamp_begin", timestamp_begin);
+ if (ret) {
+ goto end;
+ }
}
- ret = set_structure_field_integer(stream->packet_context,
- "timestamp_end", timestamp_end);
- if (ret) {
- goto end;
- }
+ if (!get_event_header_timestamp(
+ ((struct bt_ctf_event *) g_ptr_array_index(
+ stream->events, stream->events->len - 1))->event_header,
+ ×tamp_end)) {
+ ret = set_structure_field_integer(stream->packet_context,
+ "timestamp_end", timestamp_end);
+ if (ret) {
+ goto end;
+ }
+ }
ret = set_structure_field_integer(stream->packet_context,
"content_size", UINT64_MAX);
if (ret) {
for (i = 0; i < stream->events->len; i++) {
struct bt_ctf_event *event = g_ptr_array_index(
stream->events, i);
- uint32_t event_id = bt_ctf_event_class_get_id(
- event->event_class);
- uint64_t timestamp = bt_ctf_event_get_timestamp(event);
- ret = bt_ctf_field_reset(stream_class->event_header);
- if (ret) {
- goto end;
- }
-
- ret = set_structure_field_integer(stream_class->event_header,
- "id", event_id);
- if (ret) {
- goto end;
- }
- ret = set_structure_field_integer(stream_class->event_header,
- "timestamp", timestamp);
+ ret = bt_ctf_field_reset(event->event_header);
if (ret) {
goto end;
}
/* Write event header */
- ret = bt_ctf_field_serialize(stream_class->event_header,
+ ret = bt_ctf_field_serialize(event->event_header,
&stream->pos);
if (ret) {
goto end;
}
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)
{
- if (!stream) {
- return;
- }
-
- bt_ctf_ref_get(&stream->ref_count);
+ bt_get(stream);
}
void bt_ctf_stream_put(struct bt_ctf_stream *stream)
{
- if (!stream) {
- return;
- }
-
- bt_ctf_ref_put(&stream->ref_count, bt_ctf_stream_destroy);
+ bt_put(stream);
}
static
-void bt_ctf_stream_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_stream_destroy(struct bt_object *obj)
{
struct bt_ctf_stream *stream;
- if (!ref) {
- return;
- }
-
- stream = container_of(ref, struct bt_ctf_stream, ref_count);
+ stream = container_of(obj, struct bt_ctf_stream, base);
ctf_fini_pos(&stream->pos);
- if (close(stream->pos.fd)) {
+ if (stream->pos.fd >= 0 && close(stream->pos.fd)) {
perror("close");
}
- if (stream->stream_class) {
- bt_ctf_stream_class_put(stream->stream_class);
- }
+ bt_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