#include "logging.h"
#include <babeltrace/babeltrace.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include <glib.h>
#include <ctfcopytrace.h>
#include "writer.h"
static
-void unref_stream_class(struct bt_stream_class *writer_stream_class)
+void unref_stream_class(const bt_stream_class *writer_stream_class)
{
- bt_put(writer_stream_class);
+ bt_stream_class_put_ref(writer_stream_class);
}
static
-void unref_stream(struct bt_stream_class *writer_stream)
+void unref_stream(const bt_stream_class *writer_stream)
{
- bt_put(writer_stream);
+ bt_stream_class_put_ref(writer_stream);
}
static
gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
{
int ret;
- struct bt_stream *writer_stream = value;
+ const bt_stream *writer_stream = value;
ret = bt_stream_flush(writer_stream);
if (ret) {
}
static
-void trace_is_static_listener(struct bt_trace *trace, void *data)
+void trace_is_static_listener(const bt_trace *trace, void *data)
{
struct fs_writer *fs_writer = data;
int trace_completed = 1;
}
static
-struct bt_stream_class *insert_new_stream_class(
+const bt_stream_class *insert_new_stream_class(
struct writer_component *writer_component,
struct fs_writer *fs_writer,
- struct bt_stream_class *stream_class)
+ const bt_stream_class *stream_class)
{
- struct bt_stream_class *writer_stream_class = NULL;
- struct bt_trace *trace = NULL, *writer_trace = NULL;
+ const bt_stream_class *writer_stream_class = NULL;
+ const bt_trace *trace = NULL, *writer_trace = NULL;
struct bt_ctf_writer *ctf_writer = fs_writer->writer;
- enum bt_component_status ret;
+ bt_component_status ret;
trace = bt_stream_class_get_trace(stream_class);
- assert(trace);
+ BT_ASSERT(trace);
writer_trace = bt_ctf_writer_get_trace(ctf_writer);
- assert(writer_trace);
+ BT_ASSERT(writer_trace);
ret = ctf_copy_clock_classes(writer_component->err, writer_trace,
writer_stream_class, trace);
goto end;
error:
- BT_PUT(writer_stream_class);
+ BT_STREAM_CLASS_PUT_REF_AND_RESET(writer_stream_class);
end:
- bt_put(writer_trace);
- bt_put(trace);
+ bt_trace_put_ref(writer_trace);
+ bt_trace_put_ref(trace);
return writer_stream_class;
}
static
enum fs_writer_stream_state *insert_new_stream_state(
struct writer_component *writer_component,
- struct fs_writer *fs_writer, struct bt_stream *stream)
+ struct fs_writer *fs_writer, const bt_stream *stream)
{
enum fs_writer_stream_state *v = NULL;
static
int make_trace_path(struct writer_component *writer_component,
- struct bt_trace *trace, char *trace_path)
+ const bt_trace *trace, char *trace_path)
{
int ret;
const char *trace_name;
static
struct fs_writer *insert_new_writer(
struct writer_component *writer_component,
- struct bt_trace *trace)
+ const bt_trace *trace)
{
struct bt_ctf_writer *ctf_writer = NULL;
- struct bt_trace *writer_trace = NULL;
+ const bt_trace *writer_trace = NULL;
char trace_path[PATH_MAX];
- enum bt_component_status ret;
- struct bt_stream *stream = NULL;
+ bt_component_status ret;
+ const bt_stream *stream = NULL;
struct fs_writer *fs_writer = NULL;
int nr_stream, i;
}
writer_trace = bt_ctf_writer_get_trace(ctf_writer);
- assert(writer_trace);
+ BT_ASSERT(writer_trace);
ret = ctf_copy_trace(writer_component->err, trace, writer_trace);
if (ret != BT_COMPONENT_STATUS_OK) {
BT_LOGE_STR("Failed to copy trace.");
- BT_PUT(ctf_writer);
+ BT_OBJECT_PUT_REF_AND_RESET(ctf_writer);
goto error;
}
fs_writer->trace = trace;
fs_writer->writer_trace = writer_trace;
fs_writer->writer_component = writer_component;
- BT_PUT(writer_trace);
+ BT_TRACE_PUT_REF_AND_RESET(writer_trace);
fs_writer->stream_class_map = g_hash_table_new_full(g_direct_hash,
g_direct_equal, NULL, (GDestroyNotify) unref_stream_class);
fs_writer->stream_map = g_hash_table_new_full(g_direct_hash,
nr_stream = bt_trace_get_stream_count(trace);
for (i = 0; i < nr_stream; i++) {
stream = bt_trace_get_stream_by_index(trace, i);
- assert(stream);
+ BT_ASSERT(stream);
insert_new_stream_state(writer_component, fs_writer, stream);
- BT_PUT(stream);
+ BT_STREAM_PUT_REF_AND_RESET(stream);
}
/* Check if the trace is already static or register a listener. */
} else {
ret = bt_trace_add_is_static_listener(trace,
trace_is_static_listener, NULL, fs_writer);
- assert(ret >= 0);
+ BT_ASSERT(ret >= 0);
fs_writer->static_listener_id = ret;
}
error:
g_free(fs_writer);
fs_writer = NULL;
- bt_put(writer_trace);
- bt_put(stream);
- BT_PUT(ctf_writer);
+ bt_trace_put_ref(writer_trace);
+ bt_stream_put_ref(stream);
+ BT_OBJECT_PUT_REF_AND_RESET(ctf_writer);
end:
return fs_writer;
}
static
struct fs_writer *get_fs_writer(struct writer_component *writer_component,
- struct bt_stream_class *stream_class)
+ const bt_stream_class *stream_class)
{
- struct bt_trace *trace = NULL;
+ const bt_trace *trace = NULL;
struct fs_writer *fs_writer;
trace = bt_stream_class_get_trace(stream_class);
- assert(trace);
+ BT_ASSERT(trace);
fs_writer = g_hash_table_lookup(writer_component->trace_map,
(gpointer) trace);
if (!fs_writer) {
fs_writer = insert_new_writer(writer_component, trace);
}
- BT_PUT(trace);
+ BT_TRACE_PUT_REF_AND_RESET(trace);
return fs_writer;
}
static
struct fs_writer *get_fs_writer_from_stream(
struct writer_component *writer_component,
- struct bt_stream *stream)
+ const bt_stream *stream)
{
- struct bt_stream_class *stream_class = NULL;
+ const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
stream_class = bt_stream_get_class(stream);
- assert(stream_class);
+ BT_ASSERT(stream_class);
fs_writer = get_fs_writer(writer_component, stream_class);
- bt_put(stream_class);
+ bt_stream_class_put_ref(stream_class);
return fs_writer;
}
static
-struct bt_stream_class *lookup_stream_class(
+const bt_stream_class *lookup_stream_class(
struct writer_component *writer_component,
- struct bt_stream_class *stream_class)
+ const bt_stream_class *stream_class)
{
struct fs_writer *fs_writer = get_fs_writer(
writer_component, stream_class);
- assert(fs_writer);
- return (struct bt_stream_class *) g_hash_table_lookup(
+ BT_ASSERT(fs_writer);
+ return (const bt_stream_class *) g_hash_table_lookup(
fs_writer->stream_class_map, (gpointer) stream_class);
}
static
-struct bt_stream *lookup_stream(struct writer_component *writer_component,
- struct bt_stream *stream)
+const bt_stream *lookup_stream(struct writer_component *writer_component,
+ const bt_stream *stream)
{
struct fs_writer *fs_writer = get_fs_writer_from_stream(
writer_component, stream);
- assert(fs_writer);
- return (struct bt_stream *) g_hash_table_lookup(
+ BT_ASSERT(fs_writer);
+ return (const bt_stream *) g_hash_table_lookup(
fs_writer->stream_map, (gpointer) stream);
}
static
-struct bt_stream *insert_new_stream(
+const bt_stream *insert_new_stream(
struct writer_component *writer_component,
struct fs_writer *fs_writer,
- struct bt_stream_class *stream_class,
- struct bt_stream *stream)
+ const bt_stream_class *stream_class,
+ const bt_stream *stream)
{
- struct bt_stream *writer_stream = NULL;
- struct bt_stream_class *writer_stream_class = NULL;
- struct bt_ctf_writer *ctf_writer = bt_get(fs_writer->writer);
+ const bt_stream *writer_stream = NULL;
+ const bt_stream_class *writer_stream_class = NULL;
+ struct bt_ctf_writer *ctf_writer = bt_object_get_ref(fs_writer->writer);
writer_stream_class = lookup_stream_class(writer_component,
stream_class);
goto error;
}
}
- bt_get(writer_stream_class);
+ bt_stream_class_get_ref(writer_stream_class);
writer_stream = bt_stream_create(writer_stream_class,
bt_stream_get_name(stream));
- assert(writer_stream);
+ BT_ASSERT(writer_stream);
g_hash_table_insert(fs_writer->stream_map, (gpointer) stream,
writer_stream);
goto end;
error:
- BT_PUT(writer_stream);
+ BT_STREAM_PUT_REF_AND_RESET(writer_stream);
end:
- bt_put(ctf_writer);
- bt_put(writer_stream_class);
+ bt_object_put_ref(ctf_writer);
+ bt_stream_class_put_ref(writer_stream_class);
return writer_stream;
}
static
-struct bt_event_class *get_event_class(struct writer_component *writer_component,
- struct bt_stream_class *writer_stream_class,
- struct bt_event_class *event_class)
+const bt_event_class *get_event_class(struct writer_component *writer_component,
+ const bt_stream_class *writer_stream_class,
+ const bt_event_class *event_class)
{
return bt_stream_class_get_event_class_by_id(writer_stream_class,
bt_event_class_get_id(event_class));
}
static
-struct bt_stream *get_writer_stream(
+const bt_stream *get_writer_stream(
struct writer_component *writer_component,
- struct bt_packet *packet, struct bt_stream *stream)
+ const bt_packet *packet, const bt_stream *stream)
{
- struct bt_stream *writer_stream = NULL;
+ const bt_stream *writer_stream = NULL;
writer_stream = lookup_stream(writer_component, stream);
if (!writer_stream) {
BT_LOGE_STR("Failed to find existing stream.");
goto error;
}
- bt_get(writer_stream);
+ bt_stream_get_ref(writer_stream);
goto end;
error:
- BT_PUT(writer_stream);
+ BT_STREAM_PUT_REF_AND_RESET(writer_stream);
end:
return writer_stream;
}
}
BT_HIDDEN
-enum bt_component_status writer_stream_begin(
+bt_component_status writer_stream_begin(
struct writer_component *writer_component,
- struct bt_stream *stream)
+ const bt_stream *stream)
{
- struct bt_stream_class *stream_class = NULL;
+ const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
- struct bt_stream *writer_stream = NULL;
- enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ const bt_stream *writer_stream = NULL;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
enum fs_writer_stream_state *state;
stream_class = bt_stream_get_class(stream);
- assert(stream_class);
+ BT_ASSERT(stream_class);
fs_writer = get_fs_writer(writer_component, stream_class);
if (!fs_writer) {
error:
ret = BT_COMPONENT_STATUS_ERROR;
end:
- bt_put(stream_class);
+ bt_object_put_ref(stream_class);
return ret;
}
BT_HIDDEN
-enum bt_component_status writer_stream_end(
+bt_component_status writer_stream_end(
struct writer_component *writer_component,
- struct bt_stream *stream)
+ const bt_stream *stream)
{
- struct bt_stream_class *stream_class = NULL;
+ const bt_stream_class *stream_class = NULL;
struct fs_writer *fs_writer;
- struct bt_trace *trace = NULL;
- enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ const bt_trace *trace = NULL;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
enum fs_writer_stream_state *state;
stream_class = bt_stream_get_class(stream);
- assert(stream_class);
+ BT_ASSERT(stream_class);
fs_writer = get_fs_writer(writer_component, stream_class);
if (!fs_writer) {
error:
ret = BT_COMPONENT_STATUS_ERROR;
end:
- BT_PUT(trace);
- BT_PUT(stream_class);
+ BT_OBJECT_PUT_REF_AND_RESET(trace);
+ BT_OBJECT_PUT_REF_AND_RESET(stream_class);
return ret;
}
BT_HIDDEN
-enum bt_component_status writer_new_packet(
+bt_component_status writer_new_packet(
struct writer_component *writer_component,
- struct bt_packet *packet)
+ const bt_packet *packet)
{
- struct bt_stream *stream = NULL, *writer_stream = NULL;
- enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ const bt_stream *stream = NULL, *writer_stream = NULL;
+ bt_component_status ret = BT_COMPONENT_STATUS_OK;
int int_ret;
stream = bt_packet_get_stream(packet);
- assert(stream);
+ BT_ASSERT(stream);
writer_stream = get_writer_stream(writer_component, packet, stream);
if (!writer_stream) {
BT_LOGE_STR("Failed to get writer_stream.");
goto error;
}
- BT_PUT(stream);
+ BT_OBJECT_PUT_REF_AND_RESET(stream);
int_ret = ctf_stream_copy_packet_context(
writer_component->err, packet, writer_stream);
error:
ret = BT_COMPONENT_STATUS_ERROR;
end:
- bt_put(writer_stream);
- bt_put(stream);
+ bt_object_put_ref(writer_stream);
+ bt_object_put_ref(stream);
return ret;
}
BT_HIDDEN
-enum bt_component_status writer_close_packet(
+bt_component_status writer_close_packet(
struct writer_component *writer_component,
- struct bt_packet *packet)
+ const bt_packet *packet)
{
- struct bt_stream *stream = NULL, *writer_stream = NULL;
- enum bt_component_status ret;
+ const bt_stream *stream = NULL, *writer_stream = NULL;
+ bt_component_status ret;
stream = bt_packet_get_stream(packet);
- assert(stream);
+ BT_ASSERT(stream);
writer_stream = lookup_stream(writer_component, stream);
if (!writer_stream) {
BT_LOGE_STR("Failed to find existing stream.");
goto error;
}
- BT_PUT(stream);
+ BT_OBJECT_PUT_REF_AND_RESET(stream);
- bt_get(writer_stream);
+ bt_object_get_ref(writer_stream);
ret = bt_stream_flush(writer_stream);
if (ret) {
goto error;
}
- BT_PUT(writer_stream);
+ BT_OBJECT_PUT_REF_AND_RESET(writer_stream);
ret = BT_COMPONENT_STATUS_OK;
goto end;
error:
ret = BT_COMPONENT_STATUS_ERROR;
end:
- bt_put(writer_stream);
- bt_put(stream);
+ bt_object_put_ref(writer_stream);
+ bt_object_put_ref(stream);
return ret;
}
BT_HIDDEN
-enum bt_component_status writer_output_event(
+bt_component_status writer_output_event(
struct writer_component *writer_component,
- struct bt_event *event)
+ const bt_event *event)
{
- enum bt_component_status ret;
- struct bt_event_class *event_class = NULL, *writer_event_class = NULL;
- struct bt_stream *stream = NULL, *writer_stream = NULL;
- struct bt_stream_class *stream_class = NULL, *writer_stream_class = NULL;
- struct bt_event *writer_event = NULL;
+ bt_component_status ret;
+ const bt_event_class *event_class = NULL, *writer_event_class = NULL;
+ const bt_stream *stream = NULL, *writer_stream = NULL;
+ const bt_stream_class *stream_class = NULL, *writer_stream_class = NULL;
+ const bt_event *writer_event = NULL;
int int_ret;
+ const bt_trace *writer_trace = NULL;
event_class = bt_event_get_class(event);
- assert(event_class);
+ BT_ASSERT(event_class);
stream = bt_event_get_stream(event);
- assert(stream);
+ BT_ASSERT(stream);
writer_stream = lookup_stream(writer_component, stream);
- if (!writer_stream || !bt_get(writer_stream)) {
+ if (!writer_stream || !bt_object_get_ref(writer_stream)) {
BT_LOGE_STR("Failed for find existing stream.");
goto error;
}
stream_class = bt_event_class_get_stream_class(event_class);
- assert(stream_class);
+ BT_ASSERT(stream_class);
writer_stream_class = lookup_stream_class(writer_component, stream_class);
- if (!writer_stream_class || !bt_get(writer_stream_class)) {
+ if (!writer_stream_class || !bt_object_get_ref(writer_stream_class)) {
BT_LOGE_STR("Failed to find existing stream_class.");
goto error;
}
+ writer_trace = bt_stream_class_get_trace(writer_stream_class);
+ BT_ASSERT(writer_trace);
+
writer_event_class = get_event_class(writer_component,
writer_stream_class, event_class);
if (!writer_event_class) {
writer_event_class = ctf_copy_event_class(writer_component->err,
- event_class);
+ writer_trace, event_class);
if (!writer_event_class) {
BT_LOGE_STR("Failed to copy event_class.");
goto error;
error:
ret = BT_COMPONENT_STATUS_ERROR;
end:
- bt_put(writer_event);
- bt_put(writer_event_class);
- bt_put(writer_stream_class);
- bt_put(stream_class);
- bt_put(writer_stream);
- bt_put(stream);
- bt_put(event_class);
+ bt_object_put_ref(writer_trace);
+ bt_object_put_ref(writer_event);
+ bt_object_put_ref(writer_event_class);
+ bt_object_put_ref(writer_stream_class);
+ bt_object_put_ref(stream_class);
+ bt_object_put_ref(writer_stream);
+ bt_object_put_ref(stream);
+ bt_object_put_ref(event_class);
return ret;
}
projects / deliverable / babeltrace.git / blobdiff