fs-sink: useless active_stream member

[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 3ac1b6f2fcca8f88f16ede98b677340586f1c559..f6dff143a41a4b5fc6da241bc8688182e223db23 100644 (file)
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -58,15 +58,45 @@ gboolean empty_ht(gpointer key, gpointer value, gpointer user_data)
        return TRUE;
 }
 
+gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
+{
+       struct bt_ctf_stream *writer_stream = value;
+
+       bt_ctf_stream_flush(writer_stream);
+
+       return TRUE;
+}
+
 void destroy_stream_state_key(gpointer key)
 {
        g_free((enum fs_writer_stream_state *) key);
 }
 
+void check_completed_trace(gpointer key, gpointer value, gpointer user_data)
+{
+       enum fs_writer_stream_state *state = value;
+       int *trace_completed = user_data;
+
+       if (*state != FS_WRITER_COMPLETED_STREAM) {
+               *trace_completed = 0;
+       }
+}
+
 static
 void trace_is_static_listener(struct bt_ctf_trace *trace, void *data)
 {
-       *((int *) data) = 1;
+       struct fs_writer *fs_writer = data;
+       int trace_completed = 1;
+
+       fs_writer->trace_static = 1;
+
+       g_hash_table_foreach(fs_writer->stream_states,
+                       check_completed_trace, &trace_completed);
+       if (trace_completed) {
+               writer_close(fs_writer->writer_component, fs_writer);
+               g_hash_table_remove(fs_writer->writer_component->trace_map,
+                               fs_writer->trace);
+       }
 }
 
 static
@@ -258,6 +288,7 @@ struct fs_writer *insert_new_writer(
        fs_writer->writer = ctf_writer;
        fs_writer->trace = trace;
        fs_writer->writer_trace = writer_trace;
+       fs_writer->writer_component = writer_component;
        BT_PUT(writer_trace);
        fs_writer->stream_class_map = g_hash_table_new_full(g_direct_hash,
                        g_direct_equal, NULL, (GDestroyNotify) unref_stream_class);
@@ -286,7 +317,7 @@ struct fs_writer *insert_new_writer(
                fs_writer->static_listener_id = -1;
        } else {
                ret = bt_ctf_trace_add_is_static_listener(trace,
-                               trace_is_static_listener, &fs_writer->trace_static);
+                               trace_is_static_listener, fs_writer);
                if (ret < 0) {
                        fprintf(writer_component->err,
                                        "[error] %s in %s:%d\n", __func__, __FILE__,
@@ -481,7 +512,7 @@ void writer_close(struct writer_component *writer_component,
 
        /* Empty the stream HT. */
        g_hash_table_foreach_remove(fs_writer->stream_map,
-                       empty_ht, NULL);
+                       empty_streams_ht, NULL);
        g_hash_table_destroy(fs_writer->stream_map);
 
        /* Empty the stream state HT. */
@@ -540,7 +571,6 @@ enum bt_component_status writer_stream_begin(
                                __func__, __FILE__, __LINE__);
                goto error;
        }
-       fs_writer->active_streams++;
 
        goto end;
 
@@ -551,16 +581,6 @@ end:
        return ret;
 }
 
-void check_completed_trace(gpointer key, gpointer value, gpointer user_data)
-{
-       enum fs_writer_stream_state *state = value;
-       int *trace_completed = user_data;
-
-       if (*state != FS_WRITER_COMPLETED_STREAM) {
-               *trace_completed = 0;
-       }
-}
-
 BT_HIDDEN
 enum bt_component_status writer_stream_end(
                struct writer_component *writer_component,