* SOFTWARE.
*/
+#define BT_COMP_LOG_SELF_COMP (ds_file->self_comp)
#define BT_LOG_OUTPUT_LEVEL (ds_file->log_level)
#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS"
-#include "logging/log.h"
+#include "plugins/comp-logging.h"
#include <stdlib.h>
#include <stdio.h>
}
if (bt_munmap(ds_file->mmap_addr, ds_file->mmap_len)) {
- BT_LOGE_ERRNO("Cannot memory-unmap file",
+ BT_COMP_LOGE_ERRNO("Cannot memory-unmap file",
": address=%p, size=%zu, file_path=\"%s\", file=%p",
ds_file->mmap_addr, ds_file->mmap_len,
ds_file->file ? ds_file->file->path->str : "NULL",
PROT_READ, MAP_PRIVATE, fileno(ds_file->file->fp),
ds_file->mmap_offset);
if (ds_file->mmap_addr == MAP_FAILED) {
- BT_LOGE("Cannot memory-map address (size %zu) of file \"%s\" (%p) at offset %jd: %s",
+ BT_COMP_LOGE("Cannot memory-map address (size %zu) of file \"%s\" (%p) at offset %jd: %s",
ds_file->mmap_len, ds_file->file->path->str,
ds_file->file->fp, (intmax_t) ds_file->mmap_offset,
strerror(errno));
if (remaining_mmap_bytes(ds_file) == 0) {
/* Are we at the end of the file? */
if (ds_file->mmap_offset >= ds_file->file->size) {
- BT_LOGD("Reached end of file \"%s\" (%p)",
+ BT_COMP_LOGD("Reached end of file \"%s\" (%p)",
ds_file->file->path->str, ds_file->file->fp);
status = BT_MSG_ITER_MEDIUM_STATUS_EOF;
goto end;
case BT_MSG_ITER_MEDIUM_STATUS_EOF:
goto end;
default:
- BT_LOGE("Cannot memory-map next region of file \"%s\" (%p)",
+ BT_COMP_LOGE("Cannot memory-map next region of file \"%s\" (%p)",
ds_file->file->path->str,
ds_file->file->fp);
goto error;
if (whence != BT_MSG_ITER_SEEK_WHENCE_SET ||
offset < 0 || offset > file_size) {
- BT_LOGE("Invalid medium seek request: whence=%d, offset=%jd, "
+ BT_COMP_LOGE("Invalid medium seek request: whence=%d, offset=%jd, "
"file-size=%jd", (int) whence, offset,
file_size);
ret = BT_MSG_ITER_MEDIUM_STATUS_INVAL;
off_t offset_in_mapping = offset %
bt_common_get_page_size(ds_file->log_level);
- BT_LOGD("Medium seek request cannot be accomodated by the current "
+ BT_COMP_LOGD("Medium seek request cannot be accomodated by the current "
"file mapping: offset=%jd, mmap-offset=%jd, "
"mmap-len=%zu", offset, ds_file->mmap_offset,
ds_file->mmap_len);
struct ctf_stream_class *sc;
struct bt_msg_iter_packet_properties props;
- BT_LOGI("Building index from .idx file of stream file %s",
+ BT_COMP_LOGI("Building index from .idx file of stream file %s",
ds_file->file->path->str);
ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
if (ret) {
- BT_LOGI_STR("Cannot read first packet's header and context fields.");
+ BT_COMP_LOGI_STR("Cannot read first packet's header and context fields.");
goto error;
}
props.stream_class_id);
BT_ASSERT(sc);
if (!sc->default_clock_class) {
- BT_LOGI_STR("Cannot find stream class's default clock class.");
+ BT_COMP_LOGI_STR("Cannot find stream class's default clock class.");
goto error;
}
/* Look for index file in relative path index/name.idx. */
basename = g_path_get_basename(ds_file->file->path->str);
if (!basename) {
- BT_LOGE("Cannot get the basename of datastream file %s",
+ BT_COMP_LOGE("Cannot get the basename of datastream file %s",
ds_file->file->path->str);
goto error;
}
directory = g_path_get_dirname(ds_file->file->path->str);
if (!directory) {
- BT_LOGE("Cannot get dirname of datastream file %s",
+ BT_COMP_LOGE("Cannot get dirname of datastream file %s",
ds_file->file->path->str);
goto error;
}
index_basename = g_string_new(basename);
if (!index_basename) {
- BT_LOGE_STR("Cannot allocate index file basename string");
+ BT_COMP_LOGE_STR("Cannot allocate index file basename string");
goto error;
}
index_basename->str, NULL);
mapped_file = g_mapped_file_new(index_file_path, FALSE, NULL);
if (!mapped_file) {
- BT_LOGD("Cannot create new mapped file %s",
+ BT_COMP_LOGD("Cannot create new mapped file %s",
index_file_path);
goto error;
}
*/
filesize = g_mapped_file_get_length(mapped_file);
if (filesize < sizeof(*header)) {
- BT_LOGW("Invalid LTTng trace index file: "
+ BT_COMP_LOGW("Invalid LTTng trace index file: "
"file size (%zu bytes) < header size (%zu bytes)",
filesize, sizeof(*header));
goto error;
file_pos = g_mapped_file_get_contents(mapped_file) + sizeof(*header);
if (be32toh(header->magic) != CTF_INDEX_MAGIC) {
- BT_LOGW_STR("Invalid LTTng trace index: \"magic\" field validation failed");
+ BT_COMP_LOGW_STR("Invalid LTTng trace index: \"magic\" field validation failed");
goto error;
}
file_index_entry_size = be32toh(header->packet_index_len);
file_entry_count = (filesize - sizeof(*header)) / file_index_entry_size;
if ((filesize - sizeof(*header)) % file_index_entry_size) {
- BT_LOGW("Invalid LTTng trace index: the index's size after the header "
+ BT_COMP_LOGW("Invalid LTTng trace index: the index's size after the header "
"(%zu bytes) is not a multiple of the index entry size "
"(%zu bytes)", (filesize - sizeof(*header)),
sizeof(*header));
goto error;
}
- index = ctf_fs_ds_index_create(ds_file->log_level);
+ index = ctf_fs_ds_index_create(ds_file->log_level, ds_file->self_comp);
if (!index) {
goto error;
}
uint64_t packet_size = be64toh(file_index->packet_size);
if (packet_size % CHAR_BIT) {
- BT_LOGW("Invalid packet size encountered in LTTng trace index file");
+ BT_COMP_LOGW("Invalid packet size encountered in LTTng trace index file");
goto error;
}
index_entry->offset = be64toh(file_index->offset);
if (i != 0 && index_entry->offset < (index_entry - 1)->offset) {
- BT_LOGW("Invalid, non-monotonic, packet offset encountered in LTTng trace index file: "
+ BT_COMP_LOGW("Invalid, non-monotonic, packet offset encountered in LTTng trace index file: "
"previous offset=%" PRIu64 ", current offset=%" PRIu64,
(index_entry - 1)->offset, index_entry->offset);
goto error;
index_entry->timestamp_begin = be64toh(file_index->timestamp_begin);
index_entry->timestamp_end = be64toh(file_index->timestamp_end);
if (index_entry->timestamp_end < index_entry->timestamp_begin) {
- BT_LOGW("Invalid packet time bounds encountered in LTTng trace index file (begin > end): "
+ BT_COMP_LOGW("Invalid packet time bounds encountered in LTTng trace index file (begin > end): "
"timestamp_begin=%" PRIu64 "timestamp_end=%" PRIu64,
index_entry->timestamp_begin,
index_entry->timestamp_end);
index_entry->timestamp_begin,
&index_entry->timestamp_begin_ns);
if (ret) {
- BT_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch during index parsing");
+ BT_COMP_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch during index parsing");
goto error;
}
ret = convert_cycles_to_ns(sc->default_clock_class,
index_entry->timestamp_end,
&index_entry->timestamp_end_ns);
if (ret) {
- BT_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch during LTTng trace index parsing");
+ BT_COMP_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch during LTTng trace index parsing");
goto error;
}
/* Validate that the index addresses the complete stream. */
if (ds_file->file->size != total_packets_size) {
- BT_LOGW("Invalid LTTng trace index file; indexed size != stream file size: "
+ BT_COMP_LOGW("Invalid LTTng trace index file; indexed size != stream file size: "
"file-size=%" PRIu64 ", total-packets-size=%" PRIu64,
ds_file->file->size, total_packets_size);
goto error;
props->snapshots.beginning_clock,
&entry->timestamp_begin_ns);
if (ret) {
- BT_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
+ BT_COMP_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
goto end;
}
} else {
props->snapshots.end_clock,
&entry->timestamp_end_ns);
if (ret) {
- BT_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
+ BT_COMP_LOGI_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
goto end;
}
} else {
enum bt_msg_iter_status iter_status = BT_MSG_ITER_STATUS_OK;
off_t current_packet_offset_bytes = 0;
- BT_LOGI("Indexing stream file %s", ds_file->file->path->str);
+ BT_COMP_LOGI("Indexing stream file %s", ds_file->file->path->str);
- index = ctf_fs_ds_index_create(ds_file->log_level);
+ index = ctf_fs_ds_index_create(ds_file->log_level, ds_file->self_comp);
if (!index) {
goto error;
}
struct bt_msg_iter_packet_properties props;
if (current_packet_offset_bytes < 0) {
- BT_LOGE_STR("Cannot get the current packet's offset.");
+ BT_COMP_LOGE_STR("Cannot get the current packet's offset.");
goto error;
} else if (current_packet_offset_bytes > ds_file->file->size) {
- BT_LOGE_STR("Unexpected current packet's offset (larger than file).");
+ BT_COMP_LOGE_STR("Unexpected current packet's offset (larger than file).");
goto error;
} else if (current_packet_offset_bytes == ds_file->file->size) {
/* No more data */
if (current_packet_offset_bytes + current_packet_size_bytes >
ds_file->file->size) {
- BT_LOGW("Invalid packet size reported in file: stream=\"%s\", "
+ BT_COMP_LOGW("Invalid packet size reported in file: stream=\"%s\", "
"packet-offset=%jd, packet-size-bytes=%jd, "
"file-size=%jd",
ds_file->file->path->str,
index_entry = g_new0(struct ctf_fs_ds_index_entry, 1);
if (!index_entry) {
- BT_LOGE_STR("Failed to allocate a new index entry.");
+ BT_COMP_LOGE_STR("Failed to allocate a new index entry.");
goto error;
}
g_ptr_array_add(index->entries, index_entry);
current_packet_offset_bytes += current_packet_size_bytes;
- BT_LOGD("Seeking to next packet: current-packet-offset=%jd, "
+ BT_COMP_LOGD("Seeking to next packet: current-packet-offset=%jd, "
"next-packet-offset=%jd",
current_packet_offset_bytes - current_packet_size_bytes,
current_packet_offset_bytes);
}
ds_file->log_level = log_level;
+ ds_file->self_comp = ctf_fs_trace->self_comp;
ds_file->pc_msg_iter = pc_msg_iter;
- ds_file->file = ctf_fs_file_create(log_level);
+ ds_file->file = ctf_fs_file_create(log_level, ds_file->self_comp);
if (!ds_file->file) {
goto error;
}
goto end;
}
- BT_LOGI("Failed to build index from .index file; "
+ BT_COMP_LOGI("Failed to build index from .index file; "
"falling back to stream indexing.");
index = build_index_from_stream_file(ds_file);
end:
}
BT_HIDDEN
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level)
+struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level,
+ bt_self_component *self_comp)
{
struct ctf_fs_ds_index *index = g_new0(struct ctf_fs_ds_index, 1);
if (!index) {
- BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG,
+ BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_comp,
"Failed to allocate index");
goto error;
}
index->entries = g_ptr_array_new_with_free_func((GDestroyNotify) g_free);
if (!index->entries) {
- BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG,
+ BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_comp,
"Failed to allocate index entries.");
goto error;
}
struct ctf_fs_ds_file {
bt_logging_level log_level;
+ /* Weak */
+ bt_self_component *self_comp;
+
/* Weak */
struct ctf_fs_metadata *metadata;
struct ctf_fs_ds_file *ds_file);
BT_HIDDEN
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level);
+struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level,
+ bt_self_component *self_comp);
BT_HIDDEN
void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
* SOFTWARE.
*/
+#define BT_COMP_LOG_SELF_COMP (file->self_comp)
#define BT_LOG_OUTPUT_LEVEL (file->log_level)
#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/FILE"
-#include "logging/log.h"
+#include "plugins/comp-logging.h"
#include <stdio.h>
#include <sys/types.h>
}
if (file->fp) {
- BT_LOGD("Closing file \"%s\" (%p)",
+ BT_COMP_LOGD("Closing file \"%s\" (%p)",
file->path ? file->path->str : NULL, file->fp);
if (fclose(file->fp)) {
- BT_LOGE("Cannot close file \"%s\": %s",
+ BT_COMP_LOGE("Cannot close file \"%s\": %s",
file->path ? file->path->str : "NULL",
strerror(errno));
}
}
BT_HIDDEN
-struct ctf_fs_file *ctf_fs_file_create(bt_logging_level log_level)
+struct ctf_fs_file *ctf_fs_file_create(bt_logging_level log_level,
+ bt_self_component *self_comp)
{
struct ctf_fs_file *file = g_new0(struct ctf_fs_file, 1);
}
file->log_level = log_level;
+ file->self_comp = self_comp;
file->path = g_string_new(NULL);
if (!file->path) {
goto error;
int ret = 0;
struct stat stat;
- BT_LOGI("Opening file \"%s\" with mode \"%s\"", file->path->str, mode);
+ BT_COMP_LOGI("Opening file \"%s\" with mode \"%s\"", file->path->str, mode);
file->fp = fopen(file->path->str, mode);
if (!file->fp) {
- BT_LOGE("Cannot open file \"%s\" with mode \"%s\": %s",
+ BT_COMP_LOGE("Cannot open file \"%s\" with mode \"%s\": %s",
file->path->str, mode, strerror(errno));
goto error;
}
- BT_LOGI("Opened file: %p", file->fp);
+ BT_COMP_LOGI("Opened file: %p", file->fp);
if (fstat(fileno(file->fp), &stat)) {
- BT_LOGE("Cannot get file information: %s", strerror(errno));
+ BT_COMP_LOGE("Cannot get file information: %s", strerror(errno));
goto error;
}
file->size = stat.st_size;
- BT_LOGI("File is %jd bytes", (intmax_t) file->size);
+ BT_COMP_LOGI("File is %jd bytes", (intmax_t) file->size);
goto end;
error:
if (file->fp) {
if (fclose(file->fp)) {
- BT_LOGE("Cannot close file \"%s\": %s", file->path->str,
+ BT_COMP_LOGE("Cannot close file \"%s\": %s", file->path->str,
strerror(errno));
}
}
void ctf_fs_file_destroy(struct ctf_fs_file *file);
BT_HIDDEN
-struct ctf_fs_file *ctf_fs_file_create(bt_logging_level log_level);
+struct ctf_fs_file *ctf_fs_file_create(bt_logging_level log_level,
+ bt_self_component *self_comp);
BT_HIDDEN
int ctf_fs_file_open(struct ctf_fs_file *file, const char *mode);
* SOFTWARE.
*/
+#define BT_COMP_LOG_SELF_COMP self_comp
#define BT_LOG_OUTPUT_LEVEL log_level
#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS"
-#include "logging/log.h"
+#include "plugins/comp-logging.h"
#include "common/common.h"
#include <babeltrace2/babeltrace.h>
BT_HIDDEN
bt_self_message_iterator_status ctf_fs_iterator_init(
bt_self_message_iterator *self_msg_iter,
- bt_self_component_source *self_comp,
+ bt_self_component_source *self_comp_src,
bt_self_component_port_output *self_port)
{
struct ctf_fs_port_data *port_data;
bt_self_message_iterator_status ret =
BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
bt_logging_level log_level;
+ bt_self_component *self_comp;
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_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
}
msg_iter_data->log_level = log_level;
+ msg_iter_data->self_comp = self_comp;
msg_iter_data->pc_msg_iter = self_msg_iter;
msg_iter_data->msg_iter = bt_msg_iter_create(
port_data->ds_file_group->ctf_fs_trace->metadata->tc,
bt_common_get_page_size(msg_iter_data->log_level) * 8,
- ctf_fs_ds_file_medops, NULL, msg_iter_data->log_level, NULL);
+ ctf_fs_ds_file_medops, NULL, msg_iter_data->log_level,
+ self_comp);
if (!msg_iter_data->msg_iter) {
- BT_LOGE_STR("Cannot create a CTF message iterator.");
+ BT_COMP_LOGE_STR("Cannot create a CTF message iterator.");
ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
goto error;
}
ctf_fs_trace_destroy(trace);
}
-struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level)
+struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level,
+ bt_self_component *self_comp)
{
struct ctf_fs_component *ctf_fs;
}
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) {
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;
port_name = ctf_fs_make_port_name(ds_file_group);
if (!port_name) {
goto error;
}
- BT_LOGI("Creating one port named `%s`", port_name);
+ BT_COMP_LOGI("Creating one port named `%s`", port_name);
/* Create output port for this file */
port_data = g_new0(struct ctf_fs_port_data, 1);
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, port_name, port_data, NULL);
+ ctf_fs->self_comp_src, port_name, port_data, NULL);
if (ret) {
goto error;
}
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;
/* Create one output port for each stream file group */
for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
ret = create_one_port_for_trace(ctf_fs, ctf_fs_trace,
ds_file_group);
if (ret) {
- BT_LOGE("Cannot create output port.");
+ BT_COMP_LOGE("Cannot create output port.");
goto end;
}
}
struct ctf_stream_class *sc = NULL;
struct bt_msg_iter_packet_properties props;
bt_logging_level log_level = ctf_fs_trace->log_level;
+ bt_self_component *self_comp = ctf_fs_trace->self_comp;
msg_iter = bt_msg_iter_create(ctf_fs_trace->metadata->tc,
bt_common_get_page_size(log_level) * 8,
- ctf_fs_ds_file_medops, NULL, log_level, NULL);
+ ctf_fs_ds_file_medops, NULL, log_level, self_comp);
if (!msg_iter) {
- BT_LOGE_STR("Cannot create a CTF message iterator.");
+ BT_COMP_LOGE_STR("Cannot create a CTF message iterator.");
goto error;
}
ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
if (ret) {
- BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
+ BT_COMP_LOGE("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_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
+ BT_COMP_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
path);
goto error;
}
index = ctf_fs_ds_file_build_index(ds_file);
if (!index) {
- BT_LOGW("Failed to index CTF stream file \'%s\'",
+ BT_COMP_LOGW("Failed to index CTF stream file \'%s\'",
ds_file->file->path->str);
}
GError *error = NULL;
GDir *dir = NULL;
bt_logging_level log_level = ctf_fs_trace->log_level;
+ bt_self_component *self_comp = ctf_fs_trace->self_comp;
/* Check each file in the path directory, except specific ones */
dir = g_dir_open(ctf_fs_trace->path->str, 0, &error);
if (!dir) {
- BT_LOGE("Cannot open directory `%s`: %s (code %d)",
+ BT_COMP_LOGE("Cannot open directory `%s`: %s (code %d)",
ctf_fs_trace->path->str, error->message,
error->code);
goto error;
if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) {
/* Ignore the metadata stream. */
- BT_LOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`",
+ BT_COMP_LOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
continue;
}
if (basename[0] == '.') {
- BT_LOGI("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`",
+ BT_COMP_LOGI("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
continue;
}
/* Create the file. */
- file = ctf_fs_file_create(log_level);
+ file = ctf_fs_file_create(log_level, self_comp);
if (!file) {
- BT_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`",
+ BT_COMP_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
goto error;
}
g_string_append_printf(file->path, "%s" G_DIR_SEPARATOR_S "%s",
ctf_fs_trace->path->str, basename);
if (!g_file_test(file->path->str, G_FILE_TEST_IS_REGULAR)) {
- BT_LOGI("Ignoring non-regular file `%s`",
+ BT_COMP_LOGI("Ignoring non-regular file `%s`",
file->path->str);
ctf_fs_file_destroy(file);
file = NULL;
ret = ctf_fs_file_open(file, "rb");
if (ret) {
- BT_LOGE("Cannot open stream file `%s`", file->path->str);
+ BT_COMP_LOGE("Cannot open stream file `%s`", file->path->str);
goto error;
}
if (file->size == 0) {
/* Skip empty stream. */
- BT_LOGI("Ignoring empty file `%s`", file->path->str);
+ BT_COMP_LOGI("Ignoring empty file `%s`", file->path->str);
ctf_fs_file_destroy(file);
continue;
}
ret = add_ds_file_to_ds_file_group(ctf_fs_trace,
file->path->str);
if (ret) {
- BT_LOGE("Cannot add stream file `%s` to stream file group",
+ BT_COMP_LOGE("Cannot add stream file `%s` to stream file group",
file->path->str);
ctf_fs_file_destroy(file);
goto error;
static
int set_trace_name(bt_trace *trace, const char *name_suffix,
- bt_logging_level log_level)
+ bt_logging_level log_level, bt_self_component *self_comp)
{
int ret = 0;
const bt_trace_class *tc = bt_trace_borrow_class_const(trace);
name = g_string_new(NULL);
if (!name) {
- BT_LOGE_STR("Failed to allocate a GString.");
+ BT_COMP_LOGE_STR("Failed to allocate a GString.");
ret = -1;
goto end;
}
}
static
-struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp,
+struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component *self_comp,
const char *path, const char *name,
struct ctf_fs_metadata_config *metadata_config,
bt_logging_level log_level)
}
ctf_fs_trace->log_level = log_level;
+ ctf_fs_trace->self_comp = self_comp;
ctf_fs_trace->path = g_string_new(path);
if (!ctf_fs_trace->path) {
goto error;
goto error;
}
- ret = ctf_fs_metadata_set_trace_class(self_comp,
- ctf_fs_trace, metadata_config);
+ ret = ctf_fs_metadata_set_trace_class(self_comp, ctf_fs_trace,
+ metadata_config);
if (ret) {
goto error;
}
}
if (ctf_fs_trace->trace) {
- ret = set_trace_name(ctf_fs_trace->trace, name, log_level);
+ ret = set_trace_name(ctf_fs_trace->trace, name, log_level,
+ self_comp);
if (ret) {
goto error;
}
static
int add_trace_path(GList **trace_paths, const char *path,
- bt_logging_level log_level)
+ bt_logging_level log_level, bt_self_component *self_comp)
{
GString *norm_path = NULL;
int ret = 0;
norm_path = bt_common_normalize_path(path, NULL);
if (!norm_path) {
- BT_LOGE("Failed to normalize path `%s`.", path);
+ BT_COMP_LOGE("Failed to normalize path `%s`.", path);
ret = -1;
goto end;
}
// FIXME: Remove or ifdef for __MINGW32__
if (strcmp(norm_path->str, "/") == 0) {
- BT_LOGE("Opening a trace in `/` is not supported.");
+ BT_COMP_LOGE("Opening a trace in `/` is not supported.");
ret = -1;
goto end;
}
static
int ctf_fs_find_traces(GList **trace_paths, const char *start_path,
- bt_logging_level log_level)
+ bt_logging_level log_level, bt_self_component *self_comp)
{
int ret;
GError *error = NULL;
* Stop recursion: a CTF trace cannot contain another
* CTF trace.
*/
- ret = add_trace_path(trace_paths, start_path, log_level);
+ ret = add_trace_path(trace_paths, start_path, log_level,
+ self_comp);
goto end;
}
dir = g_dir_open(start_path, 0, &error);
if (!dir) {
if (error->code == G_FILE_ERROR_ACCES) {
- BT_LOGI("Cannot open directory `%s`: %s (code %d): continuing",
+ BT_COMP_LOGI("Cannot open directory `%s`: %s (code %d): continuing",
start_path, error->message, error->code);
goto end;
}
- BT_LOGE("Cannot open directory `%s`: %s (code %d)",
+ BT_COMP_LOGE("Cannot open directory `%s`: %s (code %d)",
start_path, error->message, error->code);
ret = -1;
goto end;
g_string_printf(sub_path, "%s" G_DIR_SEPARATOR_S "%s", start_path, basename);
ret = ctf_fs_find_traces(trace_paths, sub_path->str,
- log_level);
+ log_level, self_comp);
g_string_free(sub_path, TRUE);
if (ret) {
goto end;
/* Helper for ctf_fs_component_create_ctf_fs_traces, to handle a single path/root. */
static
-int ctf_fs_component_create_ctf_fs_traces_one_root(bt_self_component_source *self_comp,
+int ctf_fs_component_create_ctf_fs_traces_one_root(
struct ctf_fs_component *ctf_fs,
const char *path_param)
{
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_LOGE("Failed to normalize path: `%s`.",
+ BT_COMP_LOGE("Failed to normalize path: `%s`.",
path_param);
goto error;
}
- ret = ctf_fs_find_traces(&trace_paths, norm_path->str, log_level);
+ ret = ctf_fs_find_traces(&trace_paths, norm_path->str, log_level,
+ self_comp);
if (ret) {
goto error;
}
if (!trace_paths) {
- BT_LOGE("No CTF traces recursively found in `%s`.",
+ BT_COMP_LOGE("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_LOGE("Cannot create trace names from trace paths.");
+ BT_COMP_LOGE("Cannot create trace names from trace paths.");
goto error;
}
&ctf_fs->metadata_config,
log_level);
if (!ctf_fs_trace) {
- BT_LOGE("Cannot create trace for `%s`.",
+ BT_COMP_LOGE("Cannot create trace for `%s`.",
trace_path->str);
goto error;
}
dest_trace->metadata->tc, src_group->sc->id);
BT_ASSERT(sc);
- index = ctf_fs_ds_index_create(dest_trace->log_level);
+ index = ctf_fs_ds_index_create(dest_trace->log_level,
+ dest_trace->self_comp);
if (!index) {
ret = -1;
goto end;
const bt_value *path_value = bt_value_array_borrow_element_by_index_const(paths_value, i);
const char *path = bt_value_string_get(path_value);
- ret = ctf_fs_component_create_ctf_fs_traces_one_root(self_comp, ctf_fs, path);
+ ret = ctf_fs_component_create_ctf_fs_traces_one_root(ctf_fs,
+ path);
if (ret) {
goto end;
}
GString *name = NULL;
guint i;
bt_logging_level log_level = ctf_fs_trace->log_level;
+ bt_self_component *self_comp = ctf_fs_trace->self_comp;
for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
struct ctf_fs_ds_file_group *ds_file_group =
}
if (!ds_file_group->stream) {
- BT_LOGE("Cannot create stream for DS file group: "
+ BT_COMP_LOGE("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_LOGE("Cannot set stream's name: "
+ BT_COMP_LOGE("Cannot set stream's name: "
"addr=%p, stream-name=\"%s\"",
ds_file_group->stream, name->str);
goto error;
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 (!paths) {
- BT_LOGE("missing \"paths\" parameter");
+ BT_COMP_LOGE("missing \"paths\" parameter");
goto error;
}
type = bt_value_get_type(paths);
if (type != BT_VALUE_TYPE_ARRAY) {
- BT_LOGE("`paths` parameter: expecting array value: type=%s",
+ BT_COMP_LOGE("`paths` parameter: expecting array value: type=%s",
bt_common_value_type_string(type));
goto error;
}
elem = bt_value_array_borrow_element_by_index_const(paths, i);
type = bt_value_get_type(elem);
if (type != BT_VALUE_TYPE_STRING) {
- BT_LOGE("`paths` parameter: expecting string value: index=%" PRIu64 ", type=%s",
+ BT_COMP_LOGE("`paths` parameter: expecting string value: index=%" PRIu64 ", type=%s",
i, bt_common_value_type_string(type));
goto error;
}
bool ret;
const bt_value *value;
bt_logging_level log_level = ctf_fs->log_level;
+ bt_self_component *self_comp = ctf_fs->self_comp;
/* paths parameter */
*paths = bt_value_map_borrow_entry_value_const(params, "paths");
"clock-class-offset-s");
if (value) {
if (!bt_value_is_signed_integer(value)) {
- BT_LOGE("clock-class-offset-s must be an integer");
+ BT_COMP_LOGE("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_LOGE("clock-class-offset-ns must be an integer");
+ BT_COMP_LOGE("clock-class-offset-ns must be an integer");
goto error;
}
ctf_fs->metadata_config.clock_class_offset_ns =
bt_self_component_source_as_self_component(self_comp_src);
ctf_fs = ctf_fs_component_create(bt_component_get_logging_level(
- bt_self_component_as_component(self_comp)));
+ bt_self_component_as_component(self_comp)), self_comp);
if (!ctf_fs) {
goto error;
}
}
bt_self_component_set_data(self_comp, ctf_fs);
-
- /*
- * We don't need to get a new reference here because as long as
- * our private ctf_fs_component object exists, the containing
- * private component should also exist.
- */
- ctf_fs->self_comp = self_comp_src;
+ 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, paths_value)) {
goto error;
struct ctf_fs_file {
bt_logging_level log_level;
+ /* Weak */
+ bt_self_component *self_comp;
+
/* Owned by this */
GString *path;
bt_logging_level log_level;
/* Weak, guaranteed to exist */
- bt_self_component_source *self_comp;
+ bt_self_component_source *self_comp_src;
+
+ /* Weak */
+ bt_self_component *self_comp;
/* Array of struct ctf_fs_port_data *, owned by this */
GPtrArray *port_data;
struct ctf_fs_trace {
bt_logging_level log_level;
+ /* Weak */
+ bt_self_component *self_comp;
+
/* Owned by this */
struct ctf_fs_metadata *metadata;
struct ctf_fs_msg_iter_data {
bt_logging_level log_level;
+ /* Weak */
+ bt_self_component *self_comp;
+
/* Weak */
bt_self_message_iterator *pc_msg_iter;
/* Create and initialize a new, empty ctf_fs_component. */
BT_HIDDEN
-struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level);
+struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level,
+ bt_self_component *self_comp);
/*
* Search recursively under all paths in `paths_value` (an array of strings),
* 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 "plugins/comp-logging.h"
#include <stdio.h>
#include <stdint.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,
};
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);
if (ret) {
- BT_LOGE("Cannot decode metadata file");
+ BT_COMP_LOGE("Cannot decode metadata file");
goto end;
}
void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata);
BT_HIDDEN
-int ctf_fs_metadata_set_trace_class(bt_self_component_source *self_comp,
+int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp,
struct ctf_fs_trace *ctf_fs_trace,
struct ctf_fs_metadata_config *config);
goto error;
}
- ctf_fs = ctf_fs_component_create(log_level);
+ ctf_fs = ctf_fs_component_create(log_level, NULL);
if (!ctf_fs) {
goto error;
}
projects / babeltrace.git / commitdiff
