X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwrite.c;h=9495787d2fc2b22b7967e248da64b857e4821227;hb=bfe3fb96e15f218b2b48054752797fc4981c1fac;hp=3ac1b6f2fcca8f88f16ede98b677340586f1c559;hpb=9b4f54fb0049703e0df1c634c0aa9f96e22c2c89;p=babeltrace.git diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c index 3ac1b6f2..9495787d 100644 --- a/plugins/ctf/fs-sink/write.c +++ b/plugins/ctf/fs-sink/write.c @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -53,20 +54,54 @@ void unref_stream(struct bt_ctf_stream_class *writer_stream) bt_put(writer_stream); } +static gboolean empty_ht(gpointer key, gpointer value, gpointer user_data) { return TRUE; } +static +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; +} + +static void destroy_stream_state_key(gpointer key) { g_free((enum fs_writer_stream_state *) key); } +static +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 @@ -114,6 +149,14 @@ struct bt_ctf_stream_class *insert_new_stream_class( goto error; } + ret = bt_ctf_trace_add_stream_class(writer_trace, writer_stream_class); + if (ret) { + fprintf(writer_component->err, + "[error] %s in %s:%d\n", __func__, __FILE__, + __LINE__); + goto error; + } + g_hash_table_insert(fs_writer->stream_class_map, (gpointer) stream_class, writer_stream_class); @@ -147,6 +190,47 @@ enum fs_writer_stream_state *insert_new_stream_state( return v; } +/* + * Make sure the output path is valid for a single trace: either it does + * not exists or it is empty. + * + * Return 0 if the path is valid, -1 otherwise. + */ +static +bool valid_single_trace_path(const char *path) +{ + GError *error = NULL; + GDir *dir = NULL; + int ret = 0; + + dir = g_dir_open(path, 0, &error); + + /* Non-existent directory. */ + if (!dir) { + /* For any other error, return an error */ + if (error->code != G_FILE_ERROR_NOENT) { + ret = -1; + } + goto end; + } + + /* g_dir_read_name skips "." and "..", error out on first result */ + while (g_dir_read_name(dir) != NULL) { + ret = -1; + break; + } + +end: + if (dir) { + g_dir_close(dir); + } + if (error) { + g_error_free(error); + } + + return ret; +} + static int make_trace_path(struct writer_component *writer_component, struct bt_ctf_trace *trace, char *trace_path) @@ -154,11 +238,14 @@ int make_trace_path(struct writer_component *writer_component, int ret; const char *trace_name; - trace_name = bt_ctf_trace_get_name(trace); - if (!trace_name) { - trace_name = writer_component->trace_name_base->str; + if (writer_component->single_trace) { + trace_name = "\0"; + } else { + trace_name = bt_ctf_trace_get_name(trace); + if (!trace_name) { + trace_name = writer_component->trace_name_base->str; + } } - /* XXX: we might have to skip the first level, TBD. */ /* Sanitize the trace name. */ if (strlen(trace_name) == 2 && !strcmp(trace_name, "..")) { @@ -178,22 +265,34 @@ int make_trace_path(struct writer_component *writer_component, snprintf(trace_path, PATH_MAX, "%s/%s", writer_component->base_path->str, trace_name); - if (g_file_test(trace_path, G_FILE_TEST_EXISTS)) { - int i = 0; - do { - snprintf(trace_path, PATH_MAX, "%s/%s-%d", - writer_component->base_path->str, - trace_name, ++i); - } while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX); - if (i == INT_MAX) { - fprintf(writer_component->err, "[error] Unable to find " - "a unique trace path\n"); + /* + * Append a suffix if the trace_path exists and we are not in + * single-trace mode. + */ + if (writer_component->single_trace) { + if (valid_single_trace_path(trace_path) != 0) { + fprintf(writer_component->err, + "[error] Invalid output directory\n"); goto error; } + } else { + if (g_file_test(trace_path, G_FILE_TEST_EXISTS)) { + int i = 0; + + do { + snprintf(trace_path, PATH_MAX, "%s/%s-%d", + writer_component->base_path->str, + trace_name, ++i); + } while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX); + if (i == INT_MAX) { + fprintf(writer_component->err, "[error] Unable to find " + "a unique trace path\n"); + goto error; + } + } } ret = 0; - goto end; error: @@ -215,6 +314,13 @@ struct fs_writer *insert_new_writer( struct fs_writer *fs_writer = NULL; int nr_stream, i; + if (writer_component->single_trace && writer_component->nr_traces > 0) { + fprintf(writer_component->err, "[error] Trying to process more " + "than one trace but --single-trace mode " + "enabled\n"); + goto error; + } + ret = make_trace_path(writer_component, trace, trace_path); if (ret) { fprintf(writer_component->err, "[error] %s in %s:%d\n", @@ -258,6 +364,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 +393,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__, @@ -296,6 +403,7 @@ struct fs_writer *insert_new_writer( fs_writer->static_listener_id = ret; } + writer_component->nr_traces++; g_hash_table_insert(writer_component->trace_map, (gpointer) trace, fs_writer); @@ -412,8 +520,8 @@ struct bt_ctf_stream *insert_new_stream( } bt_get(writer_stream_class); - writer_stream = bt_ctf_writer_create_stream(ctf_writer, - writer_stream_class); + writer_stream = bt_ctf_stream_create(writer_stream_class, + bt_ctf_stream_get_name(stream)); if (!writer_stream) { fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -469,7 +577,7 @@ BT_HIDDEN void writer_close(struct writer_component *writer_component, struct fs_writer *fs_writer) { - if (fs_writer->static_listener_id > 0) { + if (fs_writer->static_listener_id >= 0) { bt_ctf_trace_remove_is_static_listener(fs_writer->trace, fs_writer->static_listener_id); } @@ -481,7 +589,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 +648,6 @@ enum bt_component_status writer_stream_begin( __func__, __FILE__, __LINE__); goto error; } - fs_writer->active_streams++; goto end; @@ -551,16 +658,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, @@ -624,7 +721,6 @@ enum bt_component_status writer_new_packet( struct bt_ctf_packet *packet) { struct bt_ctf_stream *stream = NULL, *writer_stream = NULL; - struct bt_ctf_field *writer_packet_context = NULL; enum bt_component_status ret = BT_COMPONENT_STATUS_OK; int int_ret; @@ -643,23 +739,21 @@ enum bt_component_status writer_new_packet( } BT_PUT(stream); - writer_packet_context = ctf_copy_packet_context(writer_component->err, - packet, writer_stream); - if (!writer_packet_context) { + int_ret = ctf_stream_copy_packet_context( + writer_component->err, packet, writer_stream); + if (int_ret < 0) { fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); goto error; } - int_ret = bt_ctf_stream_set_packet_context(writer_stream, - writer_packet_context); - if (int_ret < 0) { - fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__, - __FILE__, __LINE__); + ret = ctf_stream_copy_packet_header(writer_component->err, + packet, writer_stream); + if (ret != 0) { + fprintf(writer_component->err, "[error] %s in %s:%d\n", + __func__, __FILE__, __LINE__); goto error; } - BT_PUT(writer_stream); - BT_PUT(writer_packet_context); goto end; @@ -667,7 +761,6 @@ error: ret = BT_COMPONENT_STATUS_ERROR; end: bt_put(writer_stream); - bt_put(writer_packet_context); bt_put(stream); return ret; }