projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctf: add metadata decoder config. and `strict-metadata` param in src.ctf.fs
[babeltrace.git]
/
plugins
/
ctf
/
fs-src
/
fs.c
diff --git
a/plugins/ctf/fs-src/fs.c
b/plugins/ctf/fs-src/fs.c
index f6a9f791d983695352151e1f8e2bca08a38c5873..aa1d6b1f40481809764fdaf9d38c1f483f49bbde 100644
(file)
--- a/
plugins/ctf/fs-src/fs.c
+++ b/
plugins/ctf/fs-src/fs.c
@@
-898,7
+898,7
@@
end:
BT_HIDDEN
struct ctf_fs_trace *ctf_fs_trace_create(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_metadata_config *metadata_config
)
{
struct ctf_fs_trace *ctf_fs_trace;
int ret;
{
struct ctf_fs_trace *ctf_fs_trace;
int ret;
@@
-929,7
+929,7
@@
struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
goto error;
}
goto error;
}
- ret = ctf_fs_metadata_set_trace(ctf_fs_trace,
overrides
);
+ ret = ctf_fs_metadata_set_trace(ctf_fs_trace,
metadata_config
);
if (ret) {
goto error;
}
if (ret) {
goto error;
}
@@
-1149,10
+1149,6
@@
int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
GList *trace_names = NULL;
GList *tp_node;
GList *tn_node;
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) {
norm_path = bt_common_normalize_path(path_param, NULL);
if (!norm_path) {
@@
-1185,7
+1181,7
@@
int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
GString *trace_name = tn_node->data;
ctf_fs_trace = ctf_fs_trace_create(trace_path->str,
GString *trace_name = tn_node->data;
ctf_fs_trace = ctf_fs_trace_create(trace_path->str,
- trace_name->str, &
metadata_overrides
);
+ trace_name->str, &
ctf_fs->metadata_config
);
if (!ctf_fs_trace) {
BT_LOGE("Cannot create trace for `%s`.",
trace_path->str);
if (!ctf_fs_trace) {
BT_LOGE("Cannot create trace for `%s`.",
trace_path->str);
@@
-1266,31
+1262,41
@@
struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
ret = bt_value_string_get(value, &path_param);
assert(ret == 0);
BT_PUT(value);
ret = bt_value_string_get(value, &path_param);
assert(ret == 0);
BT_PUT(value);
- value = bt_value_map_get(params, "offset-s");
+ value = bt_value_map_get(params, "
clock-class-
offset-s");
if (value) {
if (value) {
- int64_t offset;
+ if (!bt_value_is_integer(value)) {
+ BT_LOGE("clock-class-offset-s should be an integer");
+ goto error;
+ }
+ ret = bt_value_integer_get(value,
+ &ctf_fs->metadata_config.clock_class_offset_s);
+ assert(ret == 0);
+ BT_PUT(value);
+ }
+ value = bt_value_map_get(params, "clock-class-offset-ns");
+ if (value) {
if (!bt_value_is_integer(value)) {
if (!bt_value_is_integer(value)) {
- BT_LOGE("
offset-
s should be an integer");
+ BT_LOGE("
clock-class-offset-n
s should be an integer");
goto error;
}
goto error;
}
- ret = bt_value_integer_get(value, &offset);
+ ret = bt_value_integer_get(value,
+ &ctf_fs->metadata_config.clock_class_offset_ns);
assert(ret == 0);
assert(ret == 0);
- ctf_fs->options.clock_offset = offset;
BT_PUT(value);
}
BT_PUT(value);
}
- value = bt_value_map_get(params, "
offset-ns
");
+ value = bt_value_map_get(params, "
strict-metadata
");
if (value) {
if (value) {
-
int64_t offse
t;
+
bt_bool stric
t;
- if (!bt_value_is_
integer
(value)) {
- BT_LOGE("
offset-ns should be an integer
");
+ if (!bt_value_is_
bool
(value)) {
+ BT_LOGE("
strict-metadata should be a boolean
");
goto error;
}
goto error;
}
- ret = bt_value_
integer_get(value, &offse
t);
+ ret = bt_value_
bool_get(value, &stric
t);
assert(ret == 0);
assert(ret == 0);
- ctf_fs->
options.clock_offset_ns = offse
t;
+ ctf_fs->
metadata_config.strict = !!stric
t;
BT_PUT(value);
}
BT_PUT(value);
}
This page took
0.025729 seconds
and
4
git commands to generate.