_BT_COMP_LOG_COMP_NA_STR, \
##__VA_ARGS__)
+/* Logs with level `_lvl` for self component class `_self_comp_class` */
+#define BT_COMP_CLASS_LOG(_lvl, _self_comp_class, _fmt, ...) \
+ BT_LOG_WRITE((_lvl), BT_LOG_TAG, _BT_COMP_LOG_COMP_PREFIX _fmt, \
+ bt_component_class_get_name( \
+ bt_self_component_class_as_component_class( \
+ _self_comp_class)), ##__VA_ARGS__)
+
#define BT_COMP_LOG_CUR_LVL(_lvl, _cur_lvl, _self_comp, _fmt, ...) \
BT_LOG_WRITE_CUR_LVL((_lvl), (_cur_lvl), BT_LOG_TAG, \
_BT_COMP_LOG_COMP_PREFIX _fmt, \
#define BT_COMP_LOG_SUPPORTED
+/* Logs and appends error cause from component context. */
+#define BT_COMP_LOG_APPEND_CAUSE(_self_comp, _lvl, _fmt, ...) \
+ do { \
+ BT_COMP_LOG(_lvl, _self_comp, _fmt, ##__VA_ARGS__); \
+ (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT( \
+ _self_comp, _fmt, ##__VA_ARGS__); \
+ } while (0)
+
+/* Logs error and appends error cause from component context. */
+#define BT_COMP_LOGE_APPEND_CAUSE(_self_comp, _fmt, ...) \
+ BT_COMP_LOG_APPEND_CAUSE(_self_comp, BT_LOG_ERROR, _fmt, ##__VA_ARGS__)
+
+/* Logs and appends error cause from component class context. */
+#define BT_COMP_CLASS_LOG_APPEND_CAUSE(_self_comp_class, _lvl, _fmt, ...) \
+ do { \
+ BT_COMP_CLASS_LOG(_lvl, _self_comp_class, _fmt, ##__VA_ARGS__); \
+ (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT_CLASS( \
+ _self_comp_class, _fmt, ##__VA_ARGS__); \
+ } while (0)
+
+/* Logs error and appends error cause from component class context. */
+#define BT_COMP_CLASS_LOGE_APPEND_CAUSE(_self_comp_class, _fmt, ...) \
+ BT_COMP_CLASS_LOG_APPEND_CAUSE(_self_comp_class, BT_LOG_ERROR, _fmt, ##__VA_ARGS__)
+
+/*
+ * Logs and appends error cause from component class context - the errno
+ * edition.
+ */
+#define BT_COMP_CLASS_LOG_APPEND_CAUSE_ERRNO(_self_comp_class, _lvl, _msg, _fmt, ...) \
+ do { \
+ const char *error_str = g_strerror(errno); \
+ BT_COMP_CLASS_LOG(_lvl, _self_comp_class, _msg ": %s" _fmt, error_str, \
+ ##__VA_ARGS__); \
+ (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT_CLASS( \
+ _self_comp_class, _msg ": %s" _fmt, error_str, ##__VA_ARGS__); \
+ } while (0)
+
+/*
+ * Logs error and appends error cause from component class context - the errno
+ * edition.
+ */
+#define BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(_self_comp_class, _fmt, ...) \
+ BT_COMP_CLASS_LOG_APPEND_CAUSE_ERRNO(_self_comp_class, BT_LOG_ERROR, _fmt, \
+ ##__VA_ARGS__)
+
+/*
+ * Logs error and appends error cause from component or component class context,
+ * depending on whichever is set.
+ */
+#define BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(_self_comp, _self_comp_class, _fmt, ...) \
+ do { \
+ /* Only one of `_self_comp` and `_self_comp_class` must be set. */ \
+ BT_ASSERT((!!(_self_comp) != (!!_self_comp_class))); \
+ if (_self_comp) { \
+ BT_COMP_LOGE_APPEND_CAUSE(_self_comp, _fmt, ##__VA_ARGS__); \
+ } else { \
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(_self_comp_class, _fmt, ##__VA_ARGS__); \
+ } \
+ } while (0)
+
#endif /* BABELTRACE_LOGGING_COMP_LOGGING_H */
bt_component_class_message_iterator_init_method_status ret =
BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
bt_logging_level log_level;
- bt_self_component *self_comp;
+ bt_self_component *self_comp =
+ bt_self_component_source_as_self_component(self_comp_src);
port_data = bt_self_component_port_get_data(
bt_self_component_port_output_as_self_component_port(
self_port));
BT_ASSERT(port_data);
log_level = port_data->ctf_fs->log_level;
- self_comp = port_data->ctf_fs->self_comp;
msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1);
if (!msg_iter_data) {
ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
ctf_fs_ds_file_medops, NULL, msg_iter_data->log_level,
self_comp);
if (!msg_iter_data->msg_iter) {
- BT_COMP_LOGE_STR("Cannot create a CTF message iterator.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create a CTF message iterator.");
ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
}
ctf_fs->log_level = log_level;
- ctf_fs->self_comp = self_comp;
ctf_fs->port_data =
g_ptr_array_new_with_free_func(port_data_destroy_notifier);
if (!ctf_fs->port_data) {
static
int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
struct ctf_fs_trace *ctf_fs_trace,
- struct ctf_fs_ds_file_group *ds_file_group)
+ struct ctf_fs_ds_file_group *ds_file_group,
+ bt_self_component_source *self_comp_src)
{
int ret = 0;
struct ctf_fs_port_data *port_data = NULL;
gchar *port_name;
bt_logging_level log_level = ctf_fs->log_level;
- bt_self_component *self_comp = ctf_fs->self_comp;
+ bt_self_component *self_comp =
+ bt_self_component_source_as_self_component(self_comp_src);
port_name = ctf_fs_make_port_name(ds_file_group);
if (!port_name) {
port_data->ctf_fs = ctf_fs;
port_data->ds_file_group = ds_file_group;
ret = bt_self_component_source_add_output_port(
- ctf_fs->self_comp_src, port_name, port_data, NULL);
+ self_comp_src, port_name, port_data, NULL);
if (ret) {
goto error;
}
static
int create_ports_for_trace(struct ctf_fs_component *ctf_fs,
- struct ctf_fs_trace *ctf_fs_trace)
+ struct ctf_fs_trace *ctf_fs_trace,
+ bt_self_component_source *self_comp_src)
{
int ret = 0;
size_t i;
bt_logging_level log_level = ctf_fs_trace->log_level;
- bt_self_component *self_comp = ctf_fs_trace->self_comp;
+ bt_self_component *self_comp =
+ bt_self_component_source_as_self_component(self_comp_src);
/* Create one output port for each stream file group */
for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
ret = create_one_port_for_trace(ctf_fs, ctf_fs_trace,
- ds_file_group);
+ ds_file_group, self_comp_src);
if (ret) {
- BT_COMP_LOGE("Cannot create output port.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create output port.");
goto end;
}
}
ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
if (ret) {
- BT_COMP_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot get stream file's first packet's header and context fields (`%s`).",
path);
goto error;
}
sc->default_clock_class->offset_seconds,
sc->default_clock_class->offset_cycles, &begin_ns);
if (ret) {
- BT_COMP_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot convert clock cycles to nanoseconds from origin (`%s`).",
path);
goto error;
}
/* Check each file in the path directory, except specific ones */
dir = g_dir_open(ctf_fs_trace->path->str, 0, &error);
if (!dir) {
- BT_COMP_LOGE("Cannot open directory `%s`: %s (code %d)",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot open directory `%s`: %s (code %d)",
ctf_fs_trace->path->str, error->message,
error->code);
goto error;
/* Create the file. */
file = ctf_fs_file_create(log_level, self_comp);
if (!file) {
- BT_COMP_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
goto error;
}
ret = ctf_fs_file_open(file, "rb");
if (ret) {
- BT_COMP_LOGE("Cannot open stream file `%s`", file->path->str);
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot open stream file `%s`",
+ file->path->str);
goto error;
}
ret = add_ds_file_to_ds_file_group(ctf_fs_trace,
file->path->str);
if (ret) {
- BT_COMP_LOGE("Cannot add stream file `%s` to stream file group",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot add stream file `%s` to stream file group",
file->path->str);
ctf_fs_file_destroy(file);
goto error;
norm_path = bt_common_normalize_path(path, NULL);
if (!norm_path) {
- BT_COMP_LOGE("Failed to normalize path `%s`.", path);
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to normalize path `%s`.", path);
ret = -1;
goto end;
}
// FIXME: Remove or ifdef for __MINGW32__
if (strcmp(norm_path->str, "/") == 0) {
- BT_COMP_LOGE("Opening a trace in `/` is not supported.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Opening a trace in `/` is not supported.");
ret = -1;
goto end;
}
goto end;
}
- BT_COMP_LOGE("Cannot open directory `%s`: %s (code %d)",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot open directory `%s`: %s (code %d)",
start_path, error->message, error->code);
ret = -1;
goto end;
static
int ctf_fs_component_create_ctf_fs_traces_one_root(
struct ctf_fs_component *ctf_fs,
- const char *path_param)
+ const char *path_param,
+ bt_self_component *self_comp,
+ bt_self_component_class *self_comp_class)
{
struct ctf_fs_trace *ctf_fs_trace = NULL;
int ret = 0;
GList *tp_node;
GList *tn_node;
bt_logging_level log_level = ctf_fs->log_level;
- bt_self_component *self_comp = ctf_fs->self_comp;
norm_path = bt_common_normalize_path(path_param, NULL);
if (!norm_path) {
- BT_COMP_LOGE("Failed to normalize path: `%s`.",
- path_param);
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
+ "Failed to normalize path: `%s`.", path_param);
goto error;
}
}
if (!trace_paths) {
- BT_COMP_LOGE("No CTF traces recursively found in `%s`.",
- path_param);
- (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(
- ctf_fs->self_comp,
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
"No CTF traces recursively found in `%s`.", path_param);
goto error;
}
trace_names = ctf_fs_create_trace_names(trace_paths, norm_path->str);
if (!trace_names) {
- BT_COMP_LOGE("Cannot create trace names from trace paths.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot create trace names from trace paths.");
goto error;
}
&ctf_fs->metadata_config,
log_level);
if (!ctf_fs_trace) {
- BT_COMP_LOGE("Cannot create trace for `%s`.",
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create trace for `%s`.",
trace_path->str);
goto error;
}
ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter,
NULL, index_entry->path, log_level);
if (!ds_file) {
- BT_LOGE_STR("Failed to create a ctf_fs_ds_file");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to create a ctf_fs_ds_file");
ret = -1;
goto end;
}
default_cc->frequency, default_cc->offset_seconds,
default_cc->offset_cycles, ts_ns);
if (ret) {
- BT_LOGE_STR("Failed to convert clock snapshot to timestamp");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Failed to convert clock snapshot to timestamp");
goto end;
}
last_entry, &last_entry->timestamp_end,
&last_entry->timestamp_end_ns);
if (ret) {
- BT_LOGE_STR("Failed to decode stream's last packet to get its last event's clock snapshot.");
+ BT_COMP_LOGE_APPEND_CAUSE(trace->self_comp,
+ "Failed to decode stream's last packet to get its last event's clock snapshot.");
goto end;
}
}
curr_entry, &curr_entry->timestamp_begin,
&curr_entry->timestamp_begin_ns);
if (ret) {
- BT_LOGE_STR("Failed to decode first event's clock snapshot");
+ BT_COMP_LOGE_APPEND_CAUSE(trace->self_comp,
+ "Failed to decode first event's clock snapshot");
goto end;
}
&last_entry->timestamp_end,
&last_entry->timestamp_end_ns);
if (ret) {
- BT_LOGE_STR("Failed to decode last event's clock snapshot");
+ BT_COMP_LOGE_APPEND_CAUSE(trace->self_comp,
+ "Failed to decode last event's clock snapshot");
goto end;
}
}
* produced earlier.
*/
static
-int fix_packet_index_tracer_bugs(struct ctf_fs_component *ctf_fs)
+int fix_packet_index_tracer_bugs(struct ctf_fs_component *ctf_fs,
+ bt_self_component *self_comp)
{
int ret = 0;
guint trace_i;
BT_LOGI_STR("Trace may be affected by LTTng tracer packet timestamp bug. Fixing up.");
ret = fix_index_lttng_event_after_packet_bug(trace);
if (ret) {
- BT_LOGE_STR("Failed to fix LTTng event-after-packet bug.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Failed to fix LTTng event-after-packet bug.");
goto end;
}
trace->metadata->tc->quirks.lttng_event_after_packet = true;
BT_LOGI_STR("Trace may be affected by barectf tracer packet timestamp bug. Fixing up.");
ret = fix_index_barectf_event_before_packet_bug(trace);
if (ret) {
- BT_LOGE_STR("Failed to fix barectf event-before-packet bug.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Failed to fix barectf event-before-packet bug.");
goto end;
}
trace->metadata->tc->quirks.barectf_event_before_packet = true;
¤t_tracer_info)) {
ret = fix_index_lttng_crash_quirk(trace);
if (ret) {
- BT_LOGE_STR("Failed to fix lttng-crash timestamp quirks.");
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Failed to fix lttng-crash timestamp quirks.");
goto end;
}
trace->metadata->tc->quirks.lttng_crash = true;
return ret;
}
-int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp,
+int ctf_fs_component_create_ctf_fs_traces(
struct ctf_fs_component *ctf_fs,
- const bt_value *paths_value)
+ const bt_value *paths_value,
+ bt_self_component *self_comp,
+ bt_self_component_class *self_comp_class)
{
int ret = 0;
uint64_t i;
const char *input = bt_value_string_get(path_value);
ret = ctf_fs_component_create_ctf_fs_traces_one_root(ctf_fs,
- input);
+ input, self_comp, self_comp_class);
if (ret) {
goto end;
}
ret = merge_traces_with_same_uuid(ctf_fs);
if (ret) {
- BT_LOGE_STR("Failed to merge traces with the same UUID.");
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
+ "Failed to merge traces with the same UUID.");
}
- ret = fix_packet_index_tracer_bugs(ctf_fs);
+ ret = fix_packet_index_tracer_bugs(ctf_fs, self_comp);
if (ret) {
- BT_LOGE_STR("Failed to fix packet index tracer bugs.");
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
+ "Failed to fix packet index tracer bugs.");
}
end:
return ret;
}
if (!ds_file_group->stream) {
- BT_COMP_LOGE("Cannot create stream for DS file group: "
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot create stream for DS file group: "
"addr=%p, stream-name=\"%s\"",
ds_file_group, name->str);
goto error;
ret = bt_stream_set_name(ds_file_group->stream,
name->str);
if (ret) {
- BT_COMP_LOGE("Cannot set stream's name: "
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot set stream's name: "
"addr=%p, stream-name=\"%s\"",
ds_file_group->stream, name->str);
goto error;
static
bool validate_inputs_parameter(struct ctf_fs_component *ctf_fs,
- const bt_value *inputs)
+ const bt_value *inputs, bt_self_component *self_comp,
+ bt_self_component_class *self_comp_class)
{
bool ret;
bt_value_type type;
uint64_t i;
bt_logging_level log_level = ctf_fs->log_level;
- bt_self_component *self_comp = ctf_fs->self_comp;
if (!inputs) {
- BT_COMP_LOGE("missing \"inputs\" parameter");
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp,
+ self_comp_class, "missing \"inputs\" parameter");
goto error;
}
type = bt_value_get_type(inputs);
if (type != BT_VALUE_TYPE_ARRAY) {
- BT_COMP_LOGE("`inputs` parameter: expecting array value: type=%s",
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp,
+ self_comp_class, "`inputs` parameter: expecting array value: type=%s",
bt_common_value_type_string(type));
goto error;
}
elem = bt_value_array_borrow_element_by_index_const(inputs, i);
type = bt_value_get_type(elem);
if (type != BT_VALUE_TYPE_STRING) {
- BT_COMP_LOGE("`inputs` parameter: expecting string value: index=%" PRIu64 ", type=%s",
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
+ "`inputs` parameter: expecting string value: index=%" PRIu64 ", type=%s",
i, bt_common_value_type_string(type));
goto error;
}
}
bool read_src_fs_parameters(const bt_value *params,
- const bt_value **inputs, struct ctf_fs_component *ctf_fs) {
+ const bt_value **inputs, struct ctf_fs_component *ctf_fs,
+ bt_self_component *self_comp,
+ bt_self_component_class *self_comp_class) {
bool ret;
const bt_value *value;
bt_logging_level log_level = ctf_fs->log_level;
- bt_self_component *self_comp = ctf_fs->self_comp;
/* inputs parameter */
*inputs = bt_value_map_borrow_entry_value_const(params, "inputs");
- if (!validate_inputs_parameter(ctf_fs, *inputs)) {
+ if (!validate_inputs_parameter(ctf_fs, *inputs, self_comp, self_comp_class)) {
goto error;
}
"clock-class-offset-s");
if (value) {
if (!bt_value_is_signed_integer(value)) {
- BT_COMP_LOGE("clock-class-offset-s must be an integer");
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
+ "clock-class-offset-s must be an integer");
goto error;
}
ctf_fs->metadata_config.clock_class_offset_s =
"clock-class-offset-ns");
if (value) {
if (!bt_value_is_signed_integer(value)) {
- BT_COMP_LOGE("clock-class-offset-ns must be an integer");
+ BT_COMP_OR_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp, self_comp_class,
+ "clock-class-offset-ns must be an integer");
goto error;
}
ctf_fs->metadata_config.clock_class_offset_ns =
static
struct ctf_fs_component *ctf_fs_create(
- bt_self_component_source *self_comp_src,
- const bt_value *params)
+ const bt_value *params,
+ bt_self_component_source *self_comp_src,
+ bt_self_component_class *self_comp_class)
{
struct ctf_fs_component *ctf_fs = NULL;
guint i;
goto error;
}
- if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) {
+ if (!read_src_fs_parameters(params, &inputs_value, ctf_fs,
+ self_comp, self_comp_class)) {
goto error;
}
bt_self_component_set_data(self_comp, ctf_fs);
- ctf_fs->self_comp = self_comp;
- ctf_fs->self_comp_src = self_comp_src;
- if (ctf_fs_component_create_ctf_fs_traces(self_comp_src, ctf_fs, inputs_value)) {
+ if (ctf_fs_component_create_ctf_fs_traces(ctf_fs, inputs_value,
+ self_comp, self_comp_class)) {
goto error;
}
goto error;
}
- if (create_ports_for_trace(ctf_fs, trace)) {
+ if (create_ports_for_trace(ctf_fs, trace, self_comp_src)) {
goto error;
}
}
BT_HIDDEN
bt_component_class_init_method_status ctf_fs_init(
- bt_self_component_source *self_comp,
+ bt_self_component_source *self_comp_src,
const bt_value *params, __attribute__((unused)) void *init_method_data)
{
struct ctf_fs_component *ctf_fs;
bt_component_class_init_method_status ret =
BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
- ctf_fs = ctf_fs_create(self_comp, params);
+ ctf_fs = ctf_fs_create(params, self_comp_src, NULL);
if (!ctf_fs) {
ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
}
#include "common/macros.h"
#include <babeltrace2/babeltrace.h>
#include "fs.h"
+#include "logging/comp-logging.h"
#define METADATA_TEXT_SIG "/* CTF 1.8"
BT_HIDDEN
bt_component_class_query_method_status metadata_info_query(
- bt_self_component_class_source *comp_class,
+ bt_self_component_class_source *self_comp_class_src,
const bt_value *params, bt_logging_level log_level,
const bt_value **user_result)
{
bt_component_class_query_method_status status =
BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+ bt_self_component_class *self_comp_class =
+ bt_self_component_class_source_as_self_component_class(self_comp_class_src);
bt_value *result = NULL;
const bt_value *path_value = NULL;
char *metadata_text = NULL;
BT_ASSERT(params);
if (!bt_value_is_map(params)) {
- BT_LOGE_STR("Query parameters is not a map value object.");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Query parameters is not a map value object.");
status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
path_value = bt_value_map_borrow_entry_value_const(params, "path");
if (!path_value) {
- BT_LOGE_STR("Mandatory `path` parameter missing");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Mandatory `path` parameter missing");
status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
if (!bt_value_is_string(path_value)) {
- BT_LOGE_STR("`path` parameter is required to be a string value");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "`path` parameter is required to be a string value");
status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
BT_ASSERT(path);
metadata_fp = ctf_fs_metadata_open_file(path);
if (!metadata_fp) {
- BT_LOGE("Cannot open trace metadata: path=\"%s\".", path);
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Cannot open trace metadata: path=\"%s\".", path);
goto error;
}
metadata_fp, &metadata_text, bo, NULL, NULL,
log_level, NULL);
if (ret) {
- BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Cannot decode packetized metadata file: path=\"%s\"",
path);
goto error;
}
ret = fseek(metadata_fp, 0, SEEK_END);
if (ret) {
- BT_LOGE_ERRNO("Failed to seek to the end of the metadata file",
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(self_comp_class,
+ "Failed to seek to the end of the metadata file",
": path=\"%s\"", path);
goto error;
}
filesize = ftell(metadata_fp);
if (filesize < 0) {
- BT_LOGE_ERRNO("Failed to get the current position in the metadata file",
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(self_comp_class,
+ "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) {
- BT_LOGE_STR("Cannot allocate buffer for metadata text.");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Cannot allocate buffer for metadata text.");
goto error;
}
if (fread(metadata_text, filesize, 1, metadata_fp) != 1) {
- BT_LOGE_ERRNO("Cannot read metadata file", ": path=\"%s\"",
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE_ERRNO(self_comp_class,
+ "Cannot read metadata file", ": path=\"%s\"",
path);
goto error;
}
ret = bt_value_map_insert_string_entry(result, "text",
g_metadata_text->str);
if (ret) {
- BT_LOGE_STR("Cannot insert metadata text into query result.");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Cannot insert metadata text into query result.");
goto error;
}
ret = bt_value_map_insert_bool_entry(result, "is-packetized",
is_packetized);
if (ret) {
- BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Cannot insert \"is-packetized\" attribute into query result.");
goto error;
}
BT_HIDDEN
bt_component_class_query_method_status trace_info_query(
- bt_self_component_class_source *comp_class,
+ bt_self_component_class_source *self_comp_class_src,
const bt_value *params, bt_logging_level log_level,
const bt_value **user_result)
{
struct ctf_fs_component *ctf_fs = NULL;
bt_component_class_query_method_status status =
BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+ bt_self_component_class *self_comp_class =
+ bt_self_component_class_source_as_self_component_class(
+ self_comp_class_src);
bt_value *result = NULL;
const bt_value *inputs_value = NULL;
int ret = 0;
BT_ASSERT(params);
if (!bt_value_is_map(params)) {
- BT_LOGE("Query parameters is not a map value object.");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Query parameters is not a map value object.");
status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
goto error;
}
- if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) {
+ if (!read_src_fs_parameters(params, &inputs_value, ctf_fs, NULL,
+ self_comp_class)) {
status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
- if (ctf_fs_component_create_ctf_fs_traces(NULL, ctf_fs, inputs_value)) {
+ if (ctf_fs_component_create_ctf_fs_traces(ctf_fs, inputs_value, NULL,
+ self_comp_class)) {
goto error;
}
trace_info = bt_value_map_create();
if (!trace_info) {
- BT_LOGE("Failed to create trace info map.");
+ BT_COMP_CLASS_LOGE_APPEND_CAUSE(self_comp_class,
+ "Failed to create trace info map.");
goto error;
}
projects / babeltrace.git / commitdiff
