X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-sink%2Fwrite.c;h=feee19472fe086fc7c3a90258e734b50f0ad0053;hb=11344f2ef348fb839333c9edc4e32309730e69e0;hp=cf8112fd521af54b4160c364004629507f7f817d;hpb=2881e5b54242d6abc3f153c1c193667387637154;p=babeltrace.git diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c index cf8112fd..feee1947 100644 --- a/plugins/ctf/fs-sink/write.c +++ b/plugins/ctf/fs-sink/write.c @@ -53,20 +53,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 @@ -147,6 +181,118 @@ 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) +{ + int n = 0; + struct dirent *d; + DIR *dir = opendir(path); + int ret; + + /* non-existent directory. */ + if (!dir) { + ret = 0; + goto end; + } + + while ((d = readdir(dir)) != NULL) { + if (++n > 2) { + break; + } + } + + ret = closedir(dir); + if (ret) { + perror("closedir"); + goto end; + } + + if (n <= 2) { + ret = 0; + } else { + ret = -1; + } + +end: + return ret; +} + +static +int make_trace_path(struct writer_component *writer_component, + struct bt_ctf_trace *trace, char *trace_path) +{ + int ret; + const char *trace_name; + + 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; + } + } + + /* Sanitize the trace name. */ + if (strlen(trace_name) == 2 && !strcmp(trace_name, "..")) { + fprintf(writer_component->err, "[error] Trace name cannot " + "be \"..\"\n"); + goto error; + } + + if (strstr(trace_name, "../")) { + fprintf(writer_component->err, "[error] Trace name cannot " + "contain \"../\", received \"%s\"\n", + trace_name); + goto error; + + } + + snprintf(trace_path, PATH_MAX, "%s/%s", + writer_component->base_path->str, + trace_name); + /* + * 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: + ret = -1; +end: + return ret; +} + static struct fs_writer *insert_new_writer( struct writer_component *writer_component, @@ -154,20 +300,29 @@ struct fs_writer *insert_new_writer( { struct bt_ctf_writer *ctf_writer = NULL; struct bt_ctf_trace *writer_trace = NULL; - char trace_name[PATH_MAX]; + char trace_path[PATH_MAX]; enum bt_component_status ret; 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", - writer_component->base_path->str, - writer_component->trace_name_base->str, - writer_component->trace_id++); - printf_verbose("CTF-Writer creating trace in %s\n", trace_name); + 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; + } - ctf_writer = bt_ctf_writer_create(trace_name); + ret = make_trace_path(writer_component, trace, trace_path); + if (ret) { + fprintf(writer_component->err, "[error] %s in %s:%d\n", + __func__, __FILE__, __LINE__); + goto error; + } + + printf("ctf.fs sink creating trace in %s\n", trace_path); + + ctf_writer = bt_ctf_writer_create(trace_path); if (!ctf_writer) { fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -201,6 +356,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); @@ -229,7 +385,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__, @@ -239,6 +395,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,7 +569,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); } @@ -424,7 +581,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. */ @@ -483,7 +640,6 @@ enum bt_component_status writer_stream_begin( __func__, __FILE__, __LINE__); goto error; } - fs_writer->active_streams++; goto end; @@ -494,16 +650,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, @@ -567,7 +713,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; @@ -586,23 +731,21 @@ enum bt_component_status writer_new_packet( } BT_PUT(stream); - writer_packet_context = ctf_copy_packet_context(writer_component->err, - packet, writer_stream, 1); - 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; @@ -610,7 +753,6 @@ error: ret = BT_COMPONENT_STATUS_ERROR; end: bt_put(writer_stream); - bt_put(writer_packet_context); bt_put(stream); return ret; }