* SOFTWARE.
*/
+#define BT_COMP_LOG_SELF_COMP self_comp
#define BT_LOG_OUTPUT_LEVEL log_level
#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/META"
-#include "logging/log.h"
+#include "logging/comp-logging.h"
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
-#include <stdbool.h>
#include "common/assert.h"
#include <glib.h>
-#include "compat/uuid.h"
+#include "common/uuid.h"
#include "compat/memstream.h"
#include <babeltrace2/babeltrace.h>
}
static struct ctf_fs_file *get_file(const char *trace_path,
- bt_logging_level log_level)
+ bt_logging_level log_level, bt_self_component *self_comp)
{
- struct ctf_fs_file *file = ctf_fs_file_create(log_level);
+ struct ctf_fs_file *file = ctf_fs_file_create(log_level, self_comp);
if (!file) {
goto error;
BT_HIDDEN
int ctf_fs_metadata_set_trace_class(
- bt_self_component_source *self_comp,
+ bt_self_component *self_comp,
struct ctf_fs_trace *ctf_fs_trace,
struct ctf_fs_metadata_config *config)
{
struct ctf_fs_file *file = NULL;
struct ctf_metadata_decoder_config decoder_config = {
.log_level = ctf_fs_trace->log_level,
- .self_comp = bt_self_component_source_as_self_component(self_comp),
+ .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);
+ file = get_file(ctf_fs_trace->path->str, log_level, self_comp);
if (!file) {
- BT_LOGE("Cannot create metadata file object");
+ BT_COMP_LOGE("Cannot create metadata file object.");
ret = -1;
goto end;
}
ctf_fs_trace->metadata->decoder = ctf_metadata_decoder_create(
&decoder_config);
if (!ctf_fs_trace->metadata->decoder) {
- BT_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_LOGE("Cannot decode metadata file");
+ BT_COMP_LOGE("Cannot update metadata decoder's content.");
goto end;
}
BT_HIDDEN
void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata)
{
- if (metadata->text) {
- free(metadata->text);
- }
+ free(metadata->text);
if (metadata->trace_class) {
BT_TRACE_CLASS_PUT_REF_AND_RESET(metadata->trace_class);