X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fmetadata.c;h=1576a9e76f2242ebd16bce7ce52f85a51f03ce32;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=42e0532414f0d65670ce7898994f2ff0d9eea37e;hpb=d9c39b0a4ad9517178899334c0ca89fd20901609;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/metadata.c b/src/plugins/ctf/fs-src/metadata.c
index 42e05324..1576a9e7 100644
--- a/src/plugins/ctf/fs-src/metadata.c
+++ b/src/plugins/ctf/fs-src/metadata.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include "common/assert.h"
 #include <glib.h>
 #include "common/uuid.h"
@@ -102,12 +101,15 @@ int ctf_fs_metadata_set_trace_class(
 		.self_comp = self_comp,
 		.clock_class_offset_s = config ? config->clock_class_offset_s : 0,
 		.clock_class_offset_ns = config ? config->clock_class_offset_ns : 0,
+		.force_clock_class_origin_unix_epoch =
+			config ? config->force_clock_class_origin_unix_epoch : false,
+		.create_trace_class = true,
 	};
 	bt_logging_level log_level = ctf_fs_trace->log_level;
 
 	file = get_file(ctf_fs_trace->path->str, log_level, self_comp);
 	if (!file) {
-		BT_COMP_LOGE("Cannot create metadata file object");
+		BT_COMP_LOGE("Cannot create metadata file object.");
 		ret = -1;
 		goto end;
 	}
@@ -115,15 +117,15 @@ int ctf_fs_metadata_set_trace_class(
 	ctf_fs_trace->metadata->decoder = ctf_metadata_decoder_create(
 		&decoder_config);
 	if (!ctf_fs_trace->metadata->decoder) {
-		BT_COMP_LOGE("Cannot create metadata decoder object");
+		BT_COMP_LOGE("Cannot create metadata decoder object.");
 		ret = -1;
 		goto end;
 	}
 
-	ret = ctf_metadata_decoder_decode(ctf_fs_trace->metadata->decoder,
-		file->fp);
+	ret = ctf_metadata_decoder_append_content(
+		ctf_fs_trace->metadata->decoder, file->fp);
 	if (ret) {
-		BT_COMP_LOGE("Cannot decode metadata file");
+		BT_COMP_LOGE("Cannot update metadata decoder's content.");
 		goto end;
 	}