X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=0af063140392ce2472a4be1e36756ea0f892c9bb;hb=89b08333996aedb3378fc37939d489a0768bd955;hp=3f49e00cba439d621116f1ed7e87392884d099d5;hpb=04c0ba87d950a956848ba53f657930ce6b255aee;p=babeltrace.git diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index 3f49e00c..0af06314 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -49,10 +49,8 @@ #include "../common/metadata/decoder.h" #include "query.h" -#define PRINT_ERR_STREAM ctf_fs->error_fp -#define PRINT_PREFIX "ctf-fs" -#define PRINT_DBG_CHECK ctf_fs_debug -#include "../print.h" +#define BT_LOG_TAG "PLUGIN-CTF-FS-SRC" +#include "logging.h" BT_HIDDEN bool ctf_fs_debug; @@ -73,7 +71,7 @@ int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_ite notif_iter_data->ds_file = ctf_fs_ds_file_create( notif_iter_data->ds_file_group->ctf_fs_trace, notif_iter_data->ds_file_group->stream, - ds_file_info->path->str, true); + ds_file_info->path->str); if (!notif_iter_data->ds_file) { ret = -1; } @@ -218,11 +216,9 @@ void ctf_fs_destroy(struct ctf_fs_component *ctf_fs) g_free(ctf_fs); } -static -void ctf_fs_trace_destroy(void *data) +BT_HIDDEN +void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) { - struct ctf_fs_trace *ctf_fs_trace = data; - if (!ctf_fs_trace) { return; } @@ -248,6 +244,13 @@ void ctf_fs_trace_destroy(void *data) g_free(ctf_fs_trace); } +static +void ctf_fs_trace_destroy_notifier(void *data) +{ + struct ctf_fs_trace *trace = data; + ctf_fs_trace_destroy(trace); +} + void ctf_fs_finalize(struct bt_private_component *component) { void *data = bt_private_component_get_user_data(component); @@ -267,13 +270,13 @@ void port_data_destroy(void *data) { } static -int create_one_port_for_trace(struct ctf_fs_trace *ctf_fs_trace, +int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, + struct ctf_fs_trace *ctf_fs_trace, struct ctf_fs_ds_file_group *ds_file_group) { int ret = 0; struct ctf_fs_port_data *port_data = NULL; GString *port_name = NULL; - struct ctf_fs_component *ctf_fs = ctf_fs_trace->ctf_fs; struct ctf_fs_ds_file_info *ds_file_info = g_ptr_array_index(ds_file_group->ds_file_infos, 0); @@ -290,7 +293,7 @@ int create_one_port_for_trace(struct ctf_fs_trace *ctf_fs_trace, assert(ds_file_group->ds_file_infos->len > 0); ds_file_info = g_ptr_array_index(ds_file_group->ds_file_infos, 0); g_string_assign(port_name, ds_file_info->path->str); - PDBG("Creating one port named `%s`\n", port_name->str); + BT_LOGD("Creating one port named `%s`", port_name->str); /* Create output port for this file */ port_data = g_new0(struct ctf_fs_port_data, 1); @@ -322,10 +325,10 @@ end: } static -int create_ports_for_trace(struct ctf_fs_trace *ctf_fs_trace) +int create_ports_for_trace(struct ctf_fs_component *ctf_fs, + struct ctf_fs_trace *ctf_fs_trace) { int ret = 0; - struct ctf_fs_component *ctf_fs = ctf_fs_trace->ctf_fs; size_t i; /* Create one output port for each stream file group */ @@ -333,9 +336,10 @@ int create_ports_for_trace(struct ctf_fs_trace *ctf_fs_trace) struct ctf_fs_ds_file_group *ds_file_group = g_ptr_array_index(ctf_fs_trace->ds_file_groups, i); - ret = create_one_port_for_trace(ctf_fs_trace, ds_file_group); + ret = create_one_port_for_trace(ctf_fs, ctf_fs_trace, + ds_file_group); if (ret) { - PERR("Cannot create output port.\n"); + BT_LOGE("Cannot create output port."); goto end; } } @@ -389,7 +393,7 @@ struct bt_ctf_stream_class *stream_class_from_packet_header( stream_id_field = bt_ctf_field_structure_get_field_by_name( packet_header_field, "stream_id"); if (!stream_id_field) { - goto end; + goto single_stream_class; } ret = bt_ctf_field_unsigned_integer_get_value(stream_id_field, @@ -488,12 +492,13 @@ void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info) g_string_free(ds_file_info->path, TRUE); } + ctf_fs_ds_index_destroy(ds_file_info->index); g_free(ds_file_info); } static struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, - uint64_t begin_ns) + uint64_t begin_ns, struct ctf_fs_ds_index *index) { struct ctf_fs_ds_file_info *ds_file_info; @@ -510,8 +515,11 @@ struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, } ds_file_info->begin_ns = begin_ns; + ds_file_info->index = index; + index = NULL; end: + ctf_fs_ds_index_destroy(index); return ds_file_info; } @@ -577,13 +585,16 @@ end: static int ctf_fs_ds_file_group_add_ds_file_info( struct ctf_fs_ds_file_group *ds_file_group, - const char *path, uint64_t begin_ns) + const char *path, uint64_t begin_ns, + struct ctf_fs_ds_index *index) { struct ctf_fs_ds_file_info *ds_file_info; gint i = 0; int ret = 0; - ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns); + /* Onwership of index is transferred. */ + ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns, index); + index = NULL; if (!ds_file_info) { goto error; } @@ -609,8 +620,8 @@ int ctf_fs_ds_file_group_add_ds_file_info( error: ctf_fs_ds_file_info_destroy(ds_file_info); + ctf_fs_ds_index_destroy(index); ret = -1; - end: return ret; } @@ -622,19 +633,24 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, struct bt_ctf_field *packet_header_field = NULL; struct bt_ctf_field *packet_context_field = NULL; struct bt_ctf_stream_class *stream_class = NULL; - struct ctf_fs_component *ctf_fs = ctf_fs_trace->ctf_fs; uint64_t stream_instance_id = -1ULL; uint64_t begin_ns = -1ULL; struct ctf_fs_ds_file_group *ds_file_group = NULL; bool add_group = false; int ret; size_t i; + struct ctf_fs_ds_file *ds_file; + struct ctf_fs_ds_index *index = NULL; + + ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, path); + if (!ds_file) { + goto error; + } - ret = ctf_fs_ds_file_get_packet_header_context_fields( - ctf_fs_trace, path, &packet_header_field, - &packet_context_field); + ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file, + &packet_header_field, &packet_context_field); if (ret) { - PERR("Cannot get stream file's first packet's header and context fields (`%s`).\n", + BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).", path); goto error; } @@ -649,6 +665,12 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, goto error; } + index = ctf_fs_ds_file_build_index(ds_file); + if (!index) { + BT_LOGW("Failed to index CTF stream file \'%s\'", + ds_file->file->path->str); + } + if (begin_ns == -1ULL) { /* * No beggining timestamp to sort the stream files @@ -674,7 +696,9 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, } ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group, - path, begin_ns); + path, begin_ns, index); + /* Ownership of index is transferred. */ + index = NULL; if (ret) { goto error; } @@ -719,7 +743,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, } ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group, - path, begin_ns); + path, begin_ns, index); + index = NULL; if (ret) { goto error; } @@ -734,7 +759,8 @@ end: if (add_group && ds_file_group) { g_ptr_array_add(ctf_fs_trace->ds_file_groups, ds_file_group); } - + ctf_fs_ds_file_destroy(ds_file); + ctf_fs_ds_index_destroy(index); bt_put(packet_header_field); bt_put(packet_context_field); bt_put(stream_class); @@ -748,12 +774,11 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) const char *basename; GError *error = NULL; GDir *dir = NULL; - struct ctf_fs_component *ctf_fs = ctf_fs_trace->ctf_fs; /* Check each file in the path directory, except specific ones */ dir = g_dir_open(ctf_fs_trace->path->str, 0, &error); if (!dir) { - PERR("Cannot open directory `%s`: %s (code %d)\n", + BT_LOGE("Cannot open directory `%s`: %s (code %d)", ctf_fs_trace->path->str, error->message, error->code); goto error; @@ -764,21 +789,21 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) { /* Ignore the metadata stream. */ - PDBG("Ignoring metadata file `%s/%s`\n", + BT_LOGD("Ignoring metadata file `%s/%s`", ctf_fs_trace->path->str, basename); continue; } if (basename[0] == '.') { - PDBG("Ignoring hidden file `%s/%s`\n", + BT_LOGD("Ignoring hidden file `%s/%s`", ctf_fs_trace->path->str, basename); continue; } /* Create the file. */ - file = ctf_fs_file_create(ctf_fs); + file = ctf_fs_file_create(); if (!file) { - PERR("Cannot create stream file object for file `%s/%s`\n", + BT_LOGE("Cannot create stream file object for file `%s/%s`", ctf_fs_trace->path->str, basename); goto error; } @@ -787,22 +812,22 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) g_string_append_printf(file->path, "%s/%s", ctf_fs_trace->path->str, basename); if (!g_file_test(file->path->str, G_FILE_TEST_IS_REGULAR)) { - PDBG("Ignoring non-regular file `%s`\n", + BT_LOGD("Ignoring non-regular file `%s`", file->path->str); ctf_fs_file_destroy(file); file = NULL; continue; } - ret = ctf_fs_file_open(ctf_fs, file, "rb"); + ret = ctf_fs_file_open(file, "rb"); if (ret) { - PERR("Cannot open stream file `%s`\n", file->path->str); + BT_LOGE("Cannot open stream file `%s`", file->path->str); goto error; } if (file->size == 0) { /* Skip empty stream. */ - PDBG("Ignoring empty file `%s`\n", file->path->str); + BT_LOGD("Ignoring empty file `%s`", file->path->str); ctf_fs_file_destroy(file); continue; } @@ -810,7 +835,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) ret = add_ds_file_to_ds_file_group(ctf_fs_trace, file->path->str); if (ret) { - PDBG("Cannot add stream file `%s` to stream file group\n", + BT_LOGE("Cannot add stream file `%s` to stream file group", file->path->str); ctf_fs_file_destroy(file); goto error; @@ -874,9 +899,9 @@ end: return ret; } -static -struct ctf_fs_trace *ctf_fs_trace_create(struct ctf_fs_component *ctf_fs, - const char *path, const char *name) +BT_HIDDEN +struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name, + struct metadata_overrides *overrides) { struct ctf_fs_trace *ctf_fs_trace; int ret; @@ -886,7 +911,6 @@ struct ctf_fs_trace *ctf_fs_trace_create(struct ctf_fs_component *ctf_fs, goto end; } - ctf_fs_trace->ctf_fs = ctf_fs; ctf_fs_trace->path = g_string_new(path); if (!ctf_fs_trace->path) { goto error; @@ -908,7 +932,7 @@ struct ctf_fs_trace *ctf_fs_trace_create(struct ctf_fs_component *ctf_fs, goto error; } - ret = ctf_fs_metadata_set_trace(ctf_fs_trace); + ret = ctf_fs_metadata_set_trace(ctf_fs_trace, overrides); if (ret) { goto error; } @@ -923,11 +947,6 @@ struct ctf_fs_trace *ctf_fs_trace_create(struct ctf_fs_component *ctf_fs, goto error; } - ret = create_ports_for_trace(ctf_fs_trace); - if (ret) { - goto error; - } - /* * create_ds_file_groups() created all the streams that this * trace needs. There won't be any more. Therefore it is safe to @@ -968,21 +987,20 @@ end: } static -int add_trace_path(struct ctf_fs_component *ctf_fs, GList **trace_paths, - const char *path) +int add_trace_path(GList **trace_paths, const char *path) { GString *norm_path = NULL; int ret = 0; norm_path = bt_common_normalize_path(path, NULL); if (!norm_path) { - PERR("Failed to normalize path `%s`.\n", path); + BT_LOGE("Failed to normalize path `%s`.", path); ret = -1; goto end; } if (strcmp(norm_path->str, "/") == 0) { - PERR("Opening a trace in `/` is not supported.\n"); + BT_LOGE("Opening a trace in `/` is not supported."); ret = -1; goto end; } @@ -999,9 +1017,8 @@ end: return ret; } -static -int find_ctf_traces(struct ctf_fs_component *ctf_fs, - GList **trace_paths, const char *start_path) +BT_HIDDEN +int ctf_fs_find_traces(GList **trace_paths, const char *start_path) { int ret; GError *error = NULL; @@ -1019,7 +1036,7 @@ int find_ctf_traces(struct ctf_fs_component *ctf_fs, * Stop recursion: a CTF trace cannot contain another * CTF trace. */ - ret = add_trace_path(ctf_fs, trace_paths, start_path); + ret = add_trace_path(trace_paths, start_path); goto end; } @@ -1032,12 +1049,12 @@ int find_ctf_traces(struct ctf_fs_component *ctf_fs, dir = g_dir_open(start_path, 0, &error); if (!dir) { if (error->code == G_FILE_ERROR_ACCES) { - PDBG("Cannot open directory `%s`: %s (code %d): continuing\n", + BT_LOGD("Cannot open directory `%s`: %s (code %d): continuing", start_path, error->message, error->code); goto end; } - PERR("Cannot open directory `%s`: %s (code %d)\n", + BT_LOGE("Cannot open directory `%s`: %s (code %d)", start_path, error->message, error->code); ret = -1; goto end; @@ -1052,7 +1069,7 @@ int find_ctf_traces(struct ctf_fs_component *ctf_fs, } g_string_printf(sub_path, "%s/%s", start_path, basename); - ret = find_ctf_traces(ctf_fs, trace_paths, sub_path->str); + ret = ctf_fs_find_traces(trace_paths, sub_path->str); g_string_free(sub_path, TRUE); if (ret) { goto end; @@ -1071,8 +1088,8 @@ end: return ret; } -static -GList *create_trace_names(GList *trace_paths, const char *base_path) { +BT_HIDDEN +GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) { GList *trace_names = NULL; GList *node; const char *last_sep; @@ -1135,28 +1152,32 @@ int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs, GList *trace_names = NULL; GList *tp_node; GList *tn_node; + struct metadata_overrides metadata_overrides = { + .clock_offset_s = ctf_fs->options.clock_offset, + .clock_offset_ns = ctf_fs->options.clock_offset_ns, + }; norm_path = bt_common_normalize_path(path_param, NULL); if (!norm_path) { - PERR("Failed to normalize path: `%s`.\n", + BT_LOGE("Failed to normalize path: `%s`.", path_param); goto error; } - ret = find_ctf_traces(ctf_fs, &trace_paths, norm_path->str); + ret = ctf_fs_find_traces(&trace_paths, norm_path->str); if (ret) { goto error; } if (!trace_paths) { - PERR("No CTF traces recursively found in `%s`.\n", + BT_LOGE("No CTF traces recursively found in `%s`.", path_param); goto error; } - trace_names = create_trace_names(trace_paths, norm_path->str); + trace_names = ctf_fs_create_trace_names(trace_paths, norm_path->str); if (!trace_names) { - PERR("Cannot create trace names from trace paths.\n"); + BT_LOGE("Cannot create trace names from trace paths."); goto error; } @@ -1166,14 +1187,19 @@ int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs, GString *trace_path = tp_node->data; GString *trace_name = tn_node->data; - ctf_fs_trace = ctf_fs_trace_create(ctf_fs, trace_path->str, - trace_name->str); + ctf_fs_trace = ctf_fs_trace_create(trace_path->str, + trace_name->str, &metadata_overrides); if (!ctf_fs_trace) { - PERR("Cannot create trace for `%s`.\n", + BT_LOGE("Cannot create trace for `%s`.", trace_path->str); goto error; } + ret = create_ports_for_trace(ctf_fs, ctf_fs_trace); + if (ret) { + goto error; + } + g_ptr_array_add(ctf_fs->traces, ctf_fs_trace); ctf_fs_trace = NULL; } @@ -1248,8 +1274,7 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, int64_t offset; if (!bt_value_is_integer(value)) { - fprintf(stderr, - "offset-s should be an integer\n"); + BT_LOGE("offset-s should be an integer"); goto error; } ret = bt_value_integer_get(value, &offset); @@ -1263,8 +1288,7 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, int64_t offset; if (!bt_value_is_integer(value)) { - fprintf(stderr, - "offset-ns should be an integer\n"); + BT_LOGE("offset-ns should be an integer"); goto error; } ret = bt_value_integer_get(value, &offset); @@ -1273,14 +1297,13 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, BT_PUT(value); } - ctf_fs->error_fp = stderr; - ctf_fs->page_size = bt_common_get_page_size(); ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy); if (!ctf_fs->port_data) { goto error; } - ctf_fs->traces = g_ptr_array_new_with_free_func(ctf_fs_trace_destroy); + ctf_fs->traces = g_ptr_array_new_with_free_func( + ctf_fs_trace_destroy_notifier); if (!ctf_fs->traces) { goto error; } @@ -1327,8 +1350,10 @@ struct bt_value *ctf_fs_query(struct bt_component_class *comp_class, if (!strcmp(object, "metadata-info")) { result = metadata_info_query(comp_class, params); + } else if (!strcmp(object, "trace-info")) { + result = trace_info_query(comp_class, params); } else { - fprintf(stderr, "Unknown query object `%s`\n", object); + BT_LOGE("Unknown query object `%s`", object); goto end; } end: