projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ctfser: have dedicated signed/unsigned integer writing functions
[babeltrace.git] / plugins / ctf / fs-sink / write.c
diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index b386eec88c14f6bf02d968ee4a49e94569a1e4b8..82057e025608b3b07d39f7e0fada9fcd406e504e 100644 (file)
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -38,15 +38,15 @@
 #include "writer.h"
 
 static
-void unref_stream_class(const struct bt_stream_class *writer_stream_class)
+void unref_stream_class(const bt_stream_class *writer_stream_class)
 {
-       bt_object_put_ref(writer_stream_class);
+       bt_stream_class_put_ref(writer_stream_class);
 }
 
 static
-void unref_stream(const struct bt_stream_class *writer_stream)
+void unref_stream(const bt_stream_class *writer_stream)
 {
-       bt_object_put_ref(writer_stream);
+       bt_stream_class_put_ref(writer_stream);
 }
 
 static
@@ -59,7 +59,7 @@ static
 gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
 {
        int ret;
-       const struct bt_stream *writer_stream = value;
+       const bt_stream *writer_stream = value;
 
        ret = bt_stream_flush(writer_stream);
        if (ret) {
@@ -86,7 +86,7 @@ void check_completed_trace(gpointer key, gpointer value, gpointer user_data)
 }
 
 static
-void trace_is_static_listener(const 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;
@@ -103,15 +103,15 @@ void trace_is_static_listener(const struct bt_trace *trace, void *data)
 }
 
 static
-const 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,
-               const struct bt_stream_class *stream_class)
+               const bt_stream_class *stream_class)
 {
-       const struct bt_stream_class *writer_stream_class = NULL;
-       const 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);
        BT_ASSERT(trace);
@@ -145,17 +145,17 @@ const struct bt_stream_class *insert_new_stream_class(
        goto end;
 
 error:
-       BT_OBJECT_PUT_REF_AND_RESET(writer_stream_class);
+       BT_STREAM_CLASS_PUT_REF_AND_RESET(writer_stream_class);
 end:
-       bt_object_put_ref(writer_trace);
-       bt_object_put_ref(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, const struct bt_stream *stream)
+               struct fs_writer *fs_writer, const bt_stream *stream)
 {
        enum fs_writer_stream_state *v = NULL;
 
@@ -214,7 +214,7 @@ end:
 
 static
 int make_trace_path(struct writer_component *writer_component,
-               const struct bt_trace *trace, char *trace_path)
+               const bt_trace *trace, char *trace_path)
 {
        int ret;
        const char *trace_name;
@@ -280,13 +280,13 @@ end:
 static
 struct fs_writer *insert_new_writer(
                struct writer_component *writer_component,
-               const struct bt_trace *trace)
+               const bt_trace *trace)
 {
        struct bt_ctf_writer *ctf_writer = NULL;
-       const struct bt_trace *writer_trace = NULL;
+       const bt_trace *writer_trace = NULL;
        char trace_path[PATH_MAX];
-       enum bt_component_status ret;
-       const struct bt_stream *stream = NULL;
+       bt_component_status ret;
+       const bt_stream *stream = NULL;
        struct fs_writer *fs_writer = NULL;
        int nr_stream, i;
 
@@ -328,7 +328,7 @@ struct fs_writer *insert_new_writer(
        fs_writer->trace = trace;
        fs_writer->writer_trace = writer_trace;
        fs_writer->writer_component = writer_component;
-       BT_OBJECT_PUT_REF_AND_RESET(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,
@@ -343,7 +343,7 @@ struct fs_writer *insert_new_writer(
                BT_ASSERT(stream);
 
                insert_new_stream_state(writer_component, fs_writer, stream);
-               BT_OBJECT_PUT_REF_AND_RESET(stream);
+               BT_STREAM_PUT_REF_AND_RESET(stream);
        }
 
        /* Check if the trace is already static or register a listener. */
@@ -366,8 +366,8 @@ struct fs_writer *insert_new_writer(
 error:
        g_free(fs_writer);
        fs_writer = NULL;
-       bt_object_put_ref(writer_trace);
-       bt_object_put_ref(stream);
+       bt_trace_put_ref(writer_trace);
+       bt_stream_put_ref(stream);
        BT_OBJECT_PUT_REF_AND_RESET(ctf_writer);
 end:
        return fs_writer;
@@ -375,9 +375,9 @@ end:
 
 static
 struct fs_writer *get_fs_writer(struct writer_component *writer_component,
-               const struct bt_stream_class *stream_class)
+               const bt_stream_class *stream_class)
 {
-       const struct bt_trace *trace = NULL;
+       const bt_trace *trace = NULL;
        struct fs_writer *fs_writer;
 
        trace = bt_stream_class_get_trace(stream_class);
@@ -388,7 +388,7 @@ struct fs_writer *get_fs_writer(struct writer_component *writer_component,
        if (!fs_writer) {
                fs_writer = insert_new_writer(writer_component, trace);
        }
-       BT_OBJECT_PUT_REF_AND_RESET(trace);
+       BT_TRACE_PUT_REF_AND_RESET(trace);
 
        return fs_writer;
 }
@@ -396,9 +396,9 @@ struct fs_writer *get_fs_writer(struct writer_component *writer_component,
 static
 struct fs_writer *get_fs_writer_from_stream(
                struct writer_component *writer_component,
-               const struct bt_stream *stream)
+               const bt_stream *stream)
 {
-       const 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);
@@ -406,42 +406,42 @@ struct fs_writer *get_fs_writer_from_stream(
 
        fs_writer = get_fs_writer(writer_component, stream_class);
 
-       bt_object_put_ref(stream_class);
+       bt_stream_class_put_ref(stream_class);
        return fs_writer;
 }
 
 static
-const struct bt_stream_class *lookup_stream_class(
+const bt_stream_class *lookup_stream_class(
                struct writer_component *writer_component,
-               const struct bt_stream_class *stream_class)
+               const bt_stream_class *stream_class)
 {
        struct fs_writer *fs_writer = get_fs_writer(
                        writer_component, stream_class);
        BT_ASSERT(fs_writer);
-       return (const struct bt_stream_class *) g_hash_table_lookup(
+       return (const bt_stream_class *) g_hash_table_lookup(
                        fs_writer->stream_class_map, (gpointer) stream_class);
 }
 
 static
-const struct bt_stream *lookup_stream(struct writer_component *writer_component,
-               const 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);
        BT_ASSERT(fs_writer);
-       return (const struct bt_stream *) g_hash_table_lookup(
+       return (const bt_stream *) g_hash_table_lookup(
                        fs_writer->stream_map, (gpointer) stream);
 }
 
 static
-const struct bt_stream *insert_new_stream(
+const bt_stream *insert_new_stream(
                struct writer_component *writer_component,
                struct fs_writer *fs_writer,
-               const struct bt_stream_class *stream_class,
-               const struct bt_stream *stream)
+               const bt_stream_class *stream_class,
+               const bt_stream *stream)
 {
-       const struct bt_stream *writer_stream = NULL;
-       const struct bt_stream_class *writer_stream_class = NULL;
+       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,
@@ -454,7 +454,7 @@ const struct bt_stream *insert_new_stream(
                        goto error;
                }
        }
-       bt_object_get_ref(writer_stream_class);
+       bt_stream_class_get_ref(writer_stream_class);
 
        writer_stream = bt_stream_create(writer_stream_class,
                bt_stream_get_name(stream));
@@ -466,40 +466,40 @@ const struct bt_stream *insert_new_stream(
        goto end;
 
 error:
-       BT_OBJECT_PUT_REF_AND_RESET(writer_stream);
+       BT_STREAM_PUT_REF_AND_RESET(writer_stream);
 end:
        bt_object_put_ref(ctf_writer);
-       bt_object_put_ref(writer_stream_class);
+       bt_stream_class_put_ref(writer_stream_class);
        return writer_stream;
 }
 
 static
-const struct bt_event_class *get_event_class(struct writer_component *writer_component,
-               const struct bt_stream_class *writer_stream_class,
-               const 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
-const struct bt_stream *get_writer_stream(
+const bt_stream *get_writer_stream(
                struct writer_component *writer_component,
-               const struct bt_packet *packet, const struct bt_stream *stream)
+               const bt_packet *packet, const bt_stream *stream)
 {
-       const 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_object_get_ref(writer_stream);
+       bt_stream_get_ref(writer_stream);
 
        goto end;
 
 error:
-       BT_OBJECT_PUT_REF_AND_RESET(writer_stream);
+       BT_STREAM_PUT_REF_AND_RESET(writer_stream);
 end:
        return writer_stream;
 }
@@ -530,14 +530,14 @@ void writer_close(struct writer_component *writer_component,
 }
 
 BT_HIDDEN
-enum bt_component_status writer_stream_begin(
+bt_component_status writer_stream_begin(
                struct writer_component *writer_component,
-               const struct bt_stream *stream)
+               const bt_stream *stream)
 {
-       const struct bt_stream_class *stream_class = NULL;
+       const bt_stream_class *stream_class = NULL;
        struct fs_writer *fs_writer;
-       const 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);
@@ -582,14 +582,14 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status writer_stream_end(
+bt_component_status writer_stream_end(
                struct writer_component *writer_component,
-               const struct bt_stream *stream)
+               const bt_stream *stream)
 {
-       const struct bt_stream_class *stream_class = NULL;
+       const bt_stream_class *stream_class = NULL;
        struct fs_writer *fs_writer;
-       const 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);
@@ -633,12 +633,12 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status writer_new_packet(
+bt_component_status writer_new_packet(
                struct writer_component *writer_component,
-               const struct bt_packet *packet)
+               const bt_packet *packet)
 {
-       const 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);
@@ -676,12 +676,12 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status writer_close_packet(
+bt_component_status writer_close_packet(
                struct writer_component *writer_component,
-               const struct bt_packet *packet)
+               const bt_packet *packet)
 {
-       const 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);
        BT_ASSERT(stream);
@@ -715,17 +715,17 @@ end:
 }
 
 BT_HIDDEN
-enum bt_component_status writer_output_event(
+bt_component_status writer_output_event(
                struct writer_component *writer_component,
-               const struct bt_event *event)
+               const bt_event *event)
 {
-       enum bt_component_status ret;
-       const struct bt_event_class *event_class = NULL, *writer_event_class = NULL;
-       const struct bt_stream *stream = NULL, *writer_stream = NULL;
-       const struct bt_stream_class *stream_class = NULL, *writer_stream_class = NULL;
-       const 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 struct bt_trace *writer_trace = NULL;
+       const bt_trace *writer_trace = NULL;
 
        event_class = bt_event_get_class(event);
        BT_ASSERT(event_class);
BabelTrace - Trace Format Babel Tower
This page took 0.031208 seconds and 4 git commands to generate.