projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add query executor
[babeltrace.git]
/
plugins
/
ctf
/
fs-src
/
query.c
diff --git
a/plugins/ctf/fs-src/query.c
b/plugins/ctf/fs-src/query.c
index 3c53b51c96b969e5719d439051938c457a82154b..696d3d43e297b4c2f6eeb31ff18577c103972760 100644
(file)
--- a/
plugins/ctf/fs-src/query.c
+++ b/
plugins/ctf/fs-src/query.c
@@
-46,10
+46,15
@@
struct range {
};
BT_HIDDEN
};
BT_HIDDEN
-struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_return metadata_info_query(
+ struct bt_component_class *comp_class,
struct bt_value *params)
{
struct bt_value *params)
{
- struct bt_value *result = NULL;
+ struct bt_component_class_query_return query_ret = {
+ .result = NULL,
+ .status = BT_QUERY_STATUS_OK,
+ };
+
struct bt_value *path_value = NULL;
char *metadata_text = NULL;
FILE *metadata_fp = NULL;
struct bt_value *path_value = NULL;
char *metadata_text = NULL;
FILE *metadata_fp = NULL;
@@
-59,30
+64,30
@@
struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
const char *path;
bool is_packetized;
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;
}
if (!bt_value_is_map(params)) {
goto error;
}
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");
ret = bt_value_string_get(path_value, &path);
if (ret) {
goto error;
}
path_value = bt_value_map_get(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);
metadata_fp = ctf_fs_metadata_open_file(path);
if (!metadata_fp) {
goto error;
}
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;
}
goto error;
}
@@
-93,26
+98,35
@@
struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
metadata_fp, &metadata_text, bo);
if (ret) {
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 {
long filesize;
goto error;
}
} else {
long filesize;
- fseek(metadata_fp, 0, SEEK_END);
+ ret = fseek(metadata_fp, 0, SEEK_END);
+ if (ret) {
+ BT_LOGE_ERRNO("Failed to seek to the end of the metadata file",
+ ": path=\"%s\"", path);
+ goto error;
+ }
filesize = ftell(metadata_fp);
filesize = ftell(metadata_fp);
+ if (filesize < 0) {
+ 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) {
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) {
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;
}
goto error;
}
@@
-132,24
+146,28
@@
struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
g_string_append(g_metadata_text, metadata_text);
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) {
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;
}
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) {
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:
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);
end:
bt_put(path_value);
@@
-162,8
+180,10
@@
end:
if (metadata_fp) {
fclose(metadata_fp);
}
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_range(struct bt_value *info, struct range *range,
const char *range_name)
@@
-438,10
+458,15
@@
end:
}
BT_HIDDEN
}
BT_HIDDEN
-struct bt_value *trace_info_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_return trace_info_query(
+ struct bt_component_class *comp_class,
struct bt_value *params)
{
struct bt_value *params)
{
- struct bt_value *trace_infos = NULL;
+ struct bt_component_class_query_return query_ret = {
+ .result = NULL,
+ .status = BT_QUERY_STATUS_OK,
+ };
+
struct bt_value *path_value = NULL;
int ret = 0;
const char *path = NULL;
struct bt_value *path_value = NULL;
int ret = 0;
const char *path = NULL;
@@
-453,6
+478,7
@@
struct bt_value *trace_info_query(struct bt_component_class *comp_class,
if (!bt_value_is_map(params)) {
BT_LOGE("Query parameters is not a map value object.");
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;
}
goto error;
}
@@
-460,6
+486,7
@@
struct bt_value *trace_info_query(struct bt_component_class *comp_class,
ret = bt_value_string_get(path_value, &path);
if (ret) {
BT_LOGE("Cannot get `path` string parameter.");
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;
}
goto error;
}
@@
-482,8
+509,9
@@
struct bt_value *trace_info_query(struct bt_component_class *comp_class,
goto error;
}
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;
}
@@
-509,7
+537,7
@@
struct bt_value *trace_info_query(struct bt_component_class *comp_class,
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;
bt_put(trace_info);
if (status != BT_VALUE_STATUS_OK) {
goto error;
@@
-519,7
+547,12
@@
struct bt_value *trace_info_query(struct bt_component_class *comp_class,
goto end;
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);
end:
if (normalized_path) {
g_string_free(normalized_path, TRUE);
@@
-542,5
+575,5
@@
end:
}
/* "path" becomes invalid with the release of path_value. */
bt_put(path_value);
}
/* "path" becomes invalid with the release of path_value. */
bt_put(path_value);
- return
trace_infos
;
+ return
query_ret
;
}
}
This page took
0.04001 seconds
and
4
git commands to generate.