X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwrite.c;h=9495787d2fc2b22b7967e248da64b857e4821227;hb=5d8d2cdc7657d6cf6761fb22c08ee8bbcb3a6c82;hp=a3cc5c8bbfa99141205cb64574f8cb96fa7f0fe5;hpb=ec273a889c7b3ee1dd41dcab0a3663cf64bd0dcd;p=babeltrace.git diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c index a3cc5c8b..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 @@ -148,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); @@ -181,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) @@ -188,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, "..")) { @@ -212,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: @@ -249,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", @@ -331,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); @@ -447,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__); @@ -648,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; @@ -667,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; @@ -691,7 +761,6 @@ error: ret = BT_COMPONENT_STATUS_ERROR; end: bt_put(writer_stream); - bt_put(writer_packet_context); bt_put(stream); return ret; }