X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fmetadata.c;h=383944c4011fce9515d62e63cfb06677e8648d55;hb=297941e39c831c8a469b0d39ac7c06897a8d01dc;hp=91465cb98bf6d7462acc0747599368616df4cf16;hpb=55314f2a6c08045f6f7ca7700a4932628eff1b87;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c
index 91465cb9..383944c4 100644
--- a/plugins/ctf/fs-src/metadata.c
+++ b/plugins/ctf/fs-src/metadata.c
@@ -40,8 +40,6 @@
 #define BT_LOG_TAG "PLUGIN-CTF-FS-METADATA-SRC"
 #include "logging.h"
 
-#define NSEC_PER_SEC 1000000000LL
-
 BT_HIDDEN
 FILE *ctf_fs_metadata_open_file(const char *trace_path)
 {
@@ -99,12 +97,15 @@ end:
 }
 
 int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace,
-		struct metadata_overrides *overrides)
+		struct ctf_fs_metadata_config *config)
 {
 	int ret = 0;
 	struct ctf_fs_file *file = NULL;
 	struct ctf_metadata_decoder *metadata_decoder = NULL;
-	int64_t clock_offset_adjustment = 0;
+	struct ctf_metadata_decoder_config decoder_config = {
+		.clock_class_offset_s = config ? config->clock_class_offset_s : 0,
+		.clock_class_offset_ns = config ? config->clock_class_offset_ns : 0,
+	};
 
 	file = get_file(ctf_fs_trace->path->str);
 	if (!file) {
@@ -113,12 +114,8 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace,
 		goto end;
 	}
 
-	if (overrides) {
-		clock_offset_adjustment =
-			overrides->clock_offset_s * NSEC_PER_SEC +
-			overrides->clock_offset_ns;
-	}
-	metadata_decoder = ctf_metadata_decoder_create(clock_offset_adjustment,
+	metadata_decoder = ctf_metadata_decoder_create(
+		config ? &decoder_config : NULL,
 		ctf_fs_trace->name->str);
 	if (!metadata_decoder) {
 		BT_LOGE("Cannot create metadata decoder object");