return TRUE;
}
+void destroy_stream_state_key(gpointer key)
+{
+ g_free((enum fs_writer_stream_state *) key);
+}
+
static
void trace_is_static_listener(struct bt_ctf_trace *trace, void *data)
{
struct bt_ctf_trace *writer_trace = NULL;
char trace_name[PATH_MAX];
enum bt_component_status ret;
- struct fs_writer *fs_writer;
+ struct bt_ctf_stream *stream = NULL;
+ struct fs_writer *fs_writer = NULL;
+ int nr_stream, i;
/* FIXME: replace with trace name when it will work. */
snprintf(trace_name, PATH_MAX, "%s/%s_%03d",
goto error;
}
fs_writer->writer = ctf_writer;
+ fs_writer->trace = trace;
+ fs_writer->writer_trace = writer_trace;
+ 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);
fs_writer->stream_map = g_hash_table_new_full(g_direct_hash,
g_direct_equal, NULL, (GDestroyNotify) unref_stream);
- fs_writer->trace = trace;
- fs_writer->writer_trace = writer_trace;
- BT_PUT(writer_trace);
+ fs_writer->stream_states = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, destroy_stream_state_key);
+
+ /* Set all the existing streams in the unknown state. */
+ nr_stream = bt_ctf_trace_get_stream_count(trace);
+ for (i = 0; i < nr_stream; i++) {
+ enum fs_writer_stream_state *v;
+
+ stream = bt_ctf_trace_get_stream_by_index(trace, i);
+ if (!stream) {
+ fprintf(writer_component->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
+ v = g_new0(enum fs_writer_stream_state, 1);
+ if (!v) {
+ fprintf(writer_component->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ *v = FS_WRITER_UNKNOWN_STREAM;
+
+ g_hash_table_insert(fs_writer->stream_states, stream, v);
+ BT_PUT(stream);
+ }
+
+ /* Check if the trace is already static or register a listener. */
if (bt_ctf_trace_is_static(trace)) {
fs_writer->trace_static = 1;
fs_writer->static_listener_id = -1;
fprintf(writer_component->err,
"[error] %s in %s:%d\n", __func__, __FILE__,
__LINE__);
- g_free(fs_writer);
- fs_writer = NULL;
goto error;
}
fs_writer->static_listener_id = ret;
goto end;
error:
+ g_free(fs_writer);
+ fs_writer = NULL;
bt_put(writer_trace);
+ bt_put(stream);
BT_PUT(ctf_writer);
end:
return fs_writer;
g_hash_table_foreach_remove(fs_writer->stream_map,
empty_ht, NULL);
g_hash_table_destroy(fs_writer->stream_map);
+
+ /* Empty the stream state HT. */
+ g_hash_table_foreach_remove(fs_writer->stream_states,
+ empty_ht, NULL);
+ g_hash_table_destroy(fs_writer->stream_states);
}
BT_HIDDEN
struct fs_writer *fs_writer;
struct bt_ctf_stream *writer_stream = NULL;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ enum fs_writer_stream_state *state;
stream_class = bt_ctf_stream_get_class(stream);
if (!stream_class) {
__func__, __FILE__, __LINE__);
goto error;
}
+
+ /* Set the stream as active */
+ state = g_hash_table_lookup(fs_writer->stream_states, stream);
+ if (*state != FS_WRITER_UNKNOWN_STREAM) {
+ fprintf(writer_component->err, "[error] Unexpected stream "
+ "state %d\n", *state);
+ goto error;
+ }
+ *state = FS_WRITER_ACTIVE_STREAM;
+
writer_stream = insert_new_stream(writer_component, fs_writer,
stream_class, stream);
if (!writer_stream) {
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,
struct fs_writer *fs_writer;
struct bt_ctf_trace *trace = NULL;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+ enum fs_writer_stream_state *state;
stream_class = bt_ctf_stream_get_class(stream);
if (!stream_class) {
__func__, __FILE__, __LINE__);
goto error;
}
+
+ state = g_hash_table_lookup(fs_writer->stream_states, stream);
+ if (*state != FS_WRITER_ACTIVE_STREAM) {
+ fprintf(writer_component->err, "[error] Unexpected stream "
+ "state %d\n", *state);
+ goto error;
+ }
+ *state = FS_WRITER_COMPLETED_STREAM;
+
g_hash_table_remove(fs_writer->stream_map, stream);
- assert(fs_writer->active_streams > 0);
- fs_writer->active_streams--;
- if (fs_writer->active_streams == 0 && fs_writer->trace_static) {
- writer_close(writer_component, fs_writer);
- g_hash_table_remove(writer_component->trace_map,
- fs_writer->trace);
+ if (fs_writer->trace_static) {
+ int trace_completed = 1;
+
+ g_hash_table_foreach(fs_writer->stream_states,
+ check_completed_trace, &trace_completed);
+ if (trace_completed) {
+ writer_close(writer_component, fs_writer);
+ g_hash_table_remove(writer_component->trace_map,
+ fs_writer->trace);
+ }
}
goto end;