#include "query.h"
#include <stdbool.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include "metadata.h"
#include "../common/metadata/decoder.h"
#include <babeltrace/common-internal.h>
#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/babeltrace.h>
#include "fs.h"
#define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
};
BT_HIDDEN
-struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_method_return metadata_info_query(
+ struct bt_component_class *comp_class,
struct bt_value *params)
{
- struct bt_value *result = NULL;
+ struct bt_component_class_query_method_return query_ret = {
+ .result = NULL,
+ .status = BT_QUERY_STATUS_OK,
+ };
+
struct bt_value *path_value = NULL;
char *metadata_text = NULL;
FILE *metadata_fp = NULL;
const char *path;
bool is_packetized;
- result = bt_value_map_create();
- if (!result) {
+ query_ret.result = bt_value_map_create();
+ if (!query_ret.result) {
+ query_ret.status = BT_QUERY_STATUS_NOMEM;
goto error;
}
+ BT_ASSERT(params);
+
if (!bt_value_is_map(params)) {
- fprintf(stderr,
- "Query parameters is not a map value object\n");
+ BT_LOGE_STR("Query parameters is not a map value object.");
+ query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
goto error;
}
- path_value = bt_value_map_get(params, "path");
+ path_value = bt_value_map_borrow(params, "path");
ret = bt_value_string_get(path_value, &path);
if (ret) {
- fprintf(stderr,
- "Cannot get `path` string parameter\n");
+ BT_LOGE_STR("Cannot get `path` string parameter.");
+ query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
goto error;
}
- assert(path);
+ BT_ASSERT(path);
metadata_fp = ctf_fs_metadata_open_file(path);
if (!metadata_fp) {
- fprintf(stderr,
- "Cannot open trace at path `%s`\n", path);
+ BT_LOGE("Cannot open trace metadata: path=\"%s\".", path);
goto error;
}
ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
metadata_fp, &metadata_text, bo);
if (ret) {
- fprintf(stderr,
- "Cannot decode packetized metadata file\n");
+ BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
+ path);
goto error;
}
} else {
ret = fseek(metadata_fp, 0, SEEK_END);
if (ret) {
- fprintf(stderr, "Error in fseek: %s", strerror(errno));
+ BT_LOGE_ERRNO("Failed to seek to the end of the metadata file",
+ ": path=\"%s\"", path);
goto error;
}
filesize = ftell(metadata_fp);
if (filesize < 0) {
- fprintf(stderr, "Error in ftell: %s", strerror(errno));
+ BT_LOGE_ERRNO("Failed to get the current position in the metadata file",
+ ": path=\"%s\"", path);
goto error;
}
rewind(metadata_fp);
metadata_text = malloc(filesize + 1);
if (!metadata_text) {
- fprintf(stderr,
- "Cannot allocate buffer for metadata text\n");
+ BT_LOGE_STR("Cannot allocate buffer for metadata text.");
goto error;
}
if (fread(metadata_text, filesize, 1, metadata_fp) != 1) {
- fprintf(stderr,
- "Cannot read metadata file\n");
+ BT_LOGE_ERRNO("Cannot read metadata file", ": path=\"%s\"",
+ path);
goto error;
}
g_string_append(g_metadata_text, metadata_text);
- ret = bt_value_map_insert_string(result, "text",
+ ret = bt_value_map_insert_string(query_ret.result, "text",
g_metadata_text->str);
if (ret) {
- fprintf(stderr, "Cannot insert metadata text into result\n");
+ BT_LOGE_STR("Cannot insert metadata text into query result.");
goto error;
}
- ret = bt_value_map_insert_bool(result, "is-packetized",
+ ret = bt_value_map_insert_bool(query_ret.result, "is-packetized",
is_packetized);
if (ret) {
- fprintf(stderr, "Cannot insert is packetized into result\n");
+ BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
goto error;
}
goto end;
error:
- BT_PUT(result);
+ BT_PUT(query_ret.result);
+
+ if (query_ret.status >= 0) {
+ query_ret.status = BT_QUERY_STATUS_ERROR;
+ }
end:
- bt_put(path_value);
free(metadata_text);
if (g_metadata_text) {
if (metadata_fp) {
fclose(metadata_fp);
}
- return result;
+
+ return query_ret;
}
+
static
int add_range(struct bt_value *info, struct range *range,
const char *range_name)
}
static
-int add_stream_ids(struct bt_value *info, struct bt_ctf_stream *stream)
+int add_stream_ids(struct bt_value *info, struct bt_stream *stream)
{
int ret = 0;
int64_t stream_class_id, stream_instance_id;
enum bt_value_status status;
- struct bt_ctf_stream_class *stream_class = NULL;
+ struct bt_stream_class *stream_class = NULL;
- stream_instance_id = bt_ctf_stream_get_id(stream);
+ stream_instance_id = bt_stream_get_id(stream);
if (stream_instance_id != -1) {
status = bt_value_map_insert_integer(info, "id",
stream_instance_id);
}
}
- stream_class = bt_ctf_stream_get_class(stream);
+ stream_class = bt_stream_borrow_class(stream);
if (!stream_class) {
ret = -1;
goto end;
}
- stream_class_id = bt_ctf_stream_class_get_id(stream_class);
+ stream_class_id = bt_stream_class_get_id(stream_class);
if (stream_class_id == -1) {
ret = -1;
goto end;
ret = -1;
goto end;
}
+
end:
- bt_put(stream_class);
return ret;
}
goto end;
}
- trace = ctf_fs_trace_create(trace_path, trace_name, NULL);
+ trace = ctf_fs_trace_create(trace_path, trace_name, NULL, NULL);
if (!trace) {
BT_LOGE("Failed to create fs trace at \'%s\'", trace_path);
ret = -1;
goto end;
}
- assert(trace->ds_file_groups);
+ BT_ASSERT(trace->ds_file_groups);
/* Add trace range info only if it contains streams. */
if (trace->ds_file_groups->len == 0) {
ret = -1;
if (ret) {
goto end;
}
- ret = add_range(trace_info, &trace_intersection,
- "intersection-range-ns");
- if (ret) {
- goto end;
+
+ if (trace_intersection.begin_ns < trace_intersection.end_ns) {
+ ret = add_range(trace_info, &trace_intersection,
+ "intersection-range-ns");
+ if (ret) {
+ goto end;
+ }
}
status = bt_value_map_insert(trace_info, "streams", file_groups);
}
BT_HIDDEN
-struct bt_value *trace_info_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_method_return trace_info_query(
+ struct bt_component_class *comp_class,
struct bt_value *params)
{
- struct bt_value *trace_infos = NULL;
+ struct bt_component_class_query_method_return query_ret = {
+ .result = NULL,
+ .status = BT_QUERY_STATUS_OK,
+ };
+
struct bt_value *path_value = NULL;
int ret = 0;
const char *path = NULL;
GList *tn_node = NULL;
GString *normalized_path = NULL;
+ BT_ASSERT(params);
+
if (!bt_value_is_map(params)) {
BT_LOGE("Query parameters is not a map value object.");
+ query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
goto error;
}
- path_value = bt_value_map_get(params, "path");
+ path_value = bt_value_map_borrow(params, "path");
ret = bt_value_string_get(path_value, &path);
if (ret) {
BT_LOGE("Cannot get `path` string parameter.");
+ query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
goto error;
}
BT_LOGE("Failed to normalize path: `%s`.", path);
goto error;
}
- assert(path);
+ BT_ASSERT(path);
ret = ctf_fs_find_traces(&trace_paths, normalized_path->str);
if (ret) {
goto error;
}
- trace_infos = bt_value_array_create();
- if (!trace_infos) {
+ query_ret.result = bt_value_array_create();
+ if (!query_ret.result) {
+ query_ret.status = BT_QUERY_STATUS_NOMEM;
goto error;
}
goto error;
}
- status = bt_value_array_append(trace_infos, trace_info);
+ status = bt_value_array_append(query_ret.result, trace_info);
bt_put(trace_info);
if (status != BT_VALUE_STATUS_OK) {
goto error;
goto end;
error:
- BT_PUT(trace_infos);
+ BT_PUT(query_ret.result);
+
+ if (query_ret.status >= 0) {
+ query_ret.status = BT_QUERY_STATUS_ERROR;
+ }
+
end:
if (normalized_path) {
g_string_free(normalized_path, TRUE);
g_list_free(trace_names);
}
/* "path" becomes invalid with the release of path_value. */
- bt_put(path_value);
- return trace_infos;
+ return query_ret;
}
projects / babeltrace.git / blobdiff