*/
#include <babeltrace/common-internal.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-source.h>
-#include <babeltrace/graph/private-notification-iterator.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
#include <plugins-common.h>
#include <glib.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include <inttypes.h>
#include <stdbool.h>
#include "fs.h"
struct ctf_fs_ds_file_info *ds_file_info;
int ret = 0;
- assert(notif_iter_data->ds_file_info_index <
+ BT_ASSERT(notif_iter_data->ds_file_info_index <
notif_iter_data->ds_file_group->ds_file_infos->len);
ds_file_info = g_ptr_array_index(
notif_iter_data->ds_file_group->ds_file_infos,
ctf_fs_ds_file_destroy(notif_iter_data->ds_file);
notif_iter_data->ds_file = ctf_fs_ds_file_create(
notif_iter_data->ds_file_group->ctf_fs_trace,
+ notif_iter_data->pc_notif_iter,
notif_iter_data->notif_iter,
notif_iter_data->ds_file_group->stream,
ds_file_info->path->str);
ctf_fs_ds_file_destroy(notif_iter_data->ds_file);
if (notif_iter_data->notif_iter) {
- bt_ctf_notif_iter_destroy(notif_iter_data->notif_iter);
+ bt_notif_iter_destroy(notif_iter_data->notif_iter);
}
g_free(notif_iter_data);
}
-struct bt_notification_iterator_next_return ctf_fs_iterator_next(
- struct bt_private_notification_iterator *iterator)
+static
+enum bt_notification_iterator_status ctf_fs_iterator_next_one(
+ struct ctf_fs_notif_iter_data *notif_iter_data,
+ struct bt_notification **notif)
{
- struct bt_notification_iterator_next_return next_ret;
- struct ctf_fs_notif_iter_data *notif_iter_data =
- bt_private_notification_iterator_get_user_data(iterator);
+ enum bt_notification_iterator_status status;
int ret;
- assert(notif_iter_data->ds_file);
- next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file);
- if (next_ret.status == BT_NOTIFICATION_ITERATOR_STATUS_END) {
- assert(!next_ret.notification);
+ BT_ASSERT(notif_iter_data->ds_file);
+ status = ctf_fs_ds_file_next(notif_iter_data->ds_file, notif);
+
+ if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK &&
+ bt_notification_get_type(*notif) ==
+ BT_NOTIFICATION_TYPE_STREAM_BEGIN) {
+ if (notif_iter_data->skip_stream_begin_notifs) {
+ /*
+ * We already emitted a
+ * BT_NOTIFICATION_TYPE_STREAM_BEGIN
+ * notification: skip this one, get a new one.
+ */
+ BT_PUT(*notif);
+ status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
+ notif);
+ BT_ASSERT(status != BT_NOTIFICATION_ITERATOR_STATUS_END);
+ goto end;
+ } else {
+ /*
+ * First BT_NOTIFICATION_TYPE_STREAM_BEGIN
+ * notification: skip all following.
+ */
+ notif_iter_data->skip_stream_begin_notifs = true;
+ goto end;
+ }
+ }
+
+ if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK &&
+ bt_notification_get_type(*notif) ==
+ BT_NOTIFICATION_TYPE_STREAM_END) {
notif_iter_data->ds_file_info_index++;
if (notif_iter_data->ds_file_info_index ==
notif_iter_data->ds_file_group->ds_file_infos->len) {
/*
* No more stream files to read: we reached the
- * real end.
+ * real end. Emit this
+ * BT_NOTIFICATION_TYPE_STREAM_END notification.
+ * The next time ctf_fs_iterator_next() is
+ * called for this notification iterator,
+ * ctf_fs_ds_file_next() will return
+ * BT_NOTIFICATION_ITERATOR_STATUS_END().
*/
goto end;
}
+ BT_PUT(*notif);
+ bt_notif_iter_reset(notif_iter_data->notif_iter);
+
/*
* Open and start reading the next stream file within
* our stream file group.
*/
ret = notif_iter_data_set_current_ds_file(notif_iter_data);
if (ret) {
- next_ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
- next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file);
+ status = ctf_fs_ds_file_next(notif_iter_data->ds_file, notif);
/*
- * We should not get BT_NOTIFICATION_ITERATOR_STATUS_END
- * with a brand new stream file because empty stream
- * files are not even part of stream file groups, which
- * means we're sure to get at least one pair of "packet
- * begin" and "packet end" notifications in the case of
- * a single, empty packet.
+ * If we get a notification, we expect to get a
+ * BT_NOTIFICATION_TYPE_STREAM_BEGIN notification
+ * because the iterator's state machine emits one before
+ * even requesting the first block of data from the
+ * medium. Skip this notification because we're not
+ * really starting a new stream here, and try getting a
+ * new notification (which, if it works, is a
+ * BT_NOTIFICATION_TYPE_PACKET_BEGIN one). We're sure to
+ * get at least one pair of
+ * BT_NOTIFICATION_TYPE_PACKET_BEGIN and
+ * BT_NOTIFICATION_TYPE_PACKET_END notifications in the
+ * case of a single, empty packet. We know there's at
+ * least one packet because the stream file group does
+ * not contain empty stream files.
*/
- assert(next_ret.status != BT_NOTIFICATION_ITERATOR_STATUS_END);
+ BT_ASSERT(notif_iter_data->skip_stream_begin_notifs);
+
+ if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+ BT_ASSERT(bt_notification_get_type(*notif) ==
+ BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+ BT_PUT(*notif);
+ status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
+ notif);
+ BT_ASSERT(status != BT_NOTIFICATION_ITERATOR_STATUS_END);
+ }
}
end:
- return next_ret;
+ return status;
+}
+
+BT_HIDDEN
+enum bt_notification_iterator_status ctf_fs_iterator_next(
+ struct bt_private_connection_private_notification_iterator *iterator,
+ bt_notification_array notifs, uint64_t capacity,
+ uint64_t *count)
+{
+ enum bt_notification_iterator_status status =
+ BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ struct ctf_fs_notif_iter_data *notif_iter_data =
+ bt_private_connection_private_notification_iterator_get_user_data(iterator);
+ uint64_t i = 0;
+
+ while (i < capacity && status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+ status = ctf_fs_iterator_next_one(notif_iter_data, ¬ifs[i]);
+ if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+ i++;
+ }
+ }
+
+ if (i > 0) {
+ /*
+ * Even if ctf_fs_iterator_next_one() returned something
+ * else than BT_NOTIFICATION_ITERATOR_STATUS_OK, we
+ * accumulated notification objects in the output
+ * notification array, so we need to return
+ * BT_NOTIFICATION_ITERATOR_STATUS_OK so that they are
+ * transfered to downstream. This other status occurs
+ * again the next time muxer_notif_iter_do_next() is
+ * called, possibly without any accumulated
+ * notification, in which case we'll return it.
+ */
+ *count = i;
+ status = BT_NOTIFICATION_ITERATOR_STATUS_OK;
+ }
+
+ return status;
}
-void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it)
+void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it)
{
void *notif_iter_data =
- bt_private_notification_iterator_get_user_data(it);
+ bt_private_connection_private_notification_iterator_get_user_data(it);
ctf_fs_notif_iter_data_destroy(notif_iter_data);
}
enum bt_notification_iterator_status ctf_fs_iterator_init(
- struct bt_private_notification_iterator *it,
+ struct bt_private_connection_private_notification_iterator *it,
struct bt_private_port *port)
{
struct ctf_fs_port_data *port_data;
goto error;
}
- notif_iter_data->notif_iter = bt_ctf_notif_iter_create(
- port_data->ds_file_group->ctf_fs_trace->metadata->trace,
+ notif_iter_data->pc_notif_iter = it;
+ notif_iter_data->notif_iter = bt_notif_iter_create(
+ port_data->ds_file_group->ctf_fs_trace->metadata->tc,
bt_common_get_page_size() * 8,
ctf_fs_ds_file_medops, NULL);
if (!notif_iter_data->notif_iter) {
goto error;
}
- ret = bt_private_notification_iterator_set_user_data(it, notif_iter_data);
+ ret = bt_private_connection_private_notification_iterator_set_user_data(it, notif_iter_data);
if (ret != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
goto error;
}
goto end;
error:
- (void) bt_private_notification_iterator_set_user_data(it, NULL);
+ (void) bt_private_connection_private_notification_iterator_set_user_data(it, NULL);
end:
ctf_fs_notif_iter_data_destroy(notif_iter_data);
g_free(ctf_fs_trace->metadata);
}
- bt_put(ctf_fs_trace->cc_prio_map);
g_free(ctf_fs_trace);
}
* group, the first (earliest) stream file's path is used as
* the stream's unique name.
*/
- assert(ds_file_group->ds_file_infos->len > 0);
+ BT_ASSERT(ds_file_group->ds_file_infos->len > 0);
ds_file_info = g_ptr_array_index(ds_file_group->ds_file_infos, 0);
g_string_assign(name, ds_file_info->path->str);
goto error;
}
+ port_data->ctf_fs = ctf_fs;
port_data->ds_file_group = ds_file_group;
ret = bt_private_component_source_add_output_private_port(
ctf_fs->priv_comp, port_name->str, port_data, NULL);
return ret;
}
-static
-uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace,
- struct bt_ctf_field *packet_header_field)
-{
- struct bt_ctf_field *stream_instance_id_field = NULL;
- uint64_t stream_instance_id = -1ULL;
- int ret;
-
- if (!packet_header_field) {
- goto end;
- }
-
- stream_instance_id_field = bt_ctf_field_structure_get_field_by_name(
- packet_header_field, "stream_instance_id");
- if (!stream_instance_id_field) {
- goto end;
- }
-
- ret = bt_ctf_field_unsigned_integer_get_value(stream_instance_id_field,
- &stream_instance_id);
- if (ret) {
- stream_instance_id = -1ULL;
- goto end;
- }
-
-end:
- bt_put(stream_instance_id_field);
- return stream_instance_id;
-}
-
-uint64_t get_packet_context_timestamp_begin_ns(
- struct ctf_fs_trace *ctf_fs_trace,
- struct bt_ctf_field *packet_context_field)
-{
- int ret;
- struct bt_ctf_field *timestamp_begin_field = NULL;
- struct bt_ctf_field_type *timestamp_begin_ft = NULL;
- uint64_t timestamp_begin_raw_value = -1ULL;
- uint64_t timestamp_begin_ns = -1ULL;
- int64_t timestamp_begin_ns_signed;
- struct bt_ctf_clock_class *timestamp_begin_clock_class = NULL;
- struct bt_ctf_clock_value *clock_value = NULL;
-
- if (!packet_context_field) {
- goto end;
- }
-
- timestamp_begin_field = bt_ctf_field_structure_get_field_by_name(
- packet_context_field, "timestamp_begin");
- if (!timestamp_begin_field) {
- goto end;
- }
-
- timestamp_begin_ft = bt_ctf_field_get_type(timestamp_begin_field);
- assert(timestamp_begin_ft);
- timestamp_begin_clock_class =
- bt_ctf_field_type_integer_get_mapped_clock_class(timestamp_begin_ft);
- if (!timestamp_begin_clock_class) {
- goto end;
- }
-
- ret = bt_ctf_field_unsigned_integer_get_value(timestamp_begin_field,
- ×tamp_begin_raw_value);
- if (ret) {
- goto end;
- }
-
- clock_value = bt_ctf_clock_value_create(timestamp_begin_clock_class,
- timestamp_begin_raw_value);
- if (!clock_value) {
- goto end;
- }
-
- ret = bt_ctf_clock_value_get_value_ns_from_epoch(clock_value,
- ×tamp_begin_ns_signed);
- if (ret) {
- goto end;
- }
-
- timestamp_begin_ns = (uint64_t) timestamp_begin_ns_signed;
-
-end:
- bt_put(timestamp_begin_field);
- bt_put(timestamp_begin_ft);
- bt_put(timestamp_begin_clock_class);
- bt_put(clock_value);
- return timestamp_begin_ns;
-}
-
static
void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info)
{
static
struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path,
- uint64_t begin_ns, struct ctf_fs_ds_index *index)
+ int64_t begin_ns, struct ctf_fs_ds_index *index)
{
struct ctf_fs_ds_file_info *ds_file_info;
static
struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
struct ctf_fs_trace *ctf_fs_trace,
- struct bt_ctf_stream_class *stream_class,
+ struct bt_stream_class *stream_class,
uint64_t stream_instance_id)
{
struct ctf_fs_ds_file_group *ds_file_group;
}
ds_file_group->stream_id = stream_instance_id;
- assert(stream_class);
+ BT_ASSERT(stream_class);
ds_file_group->stream_class = bt_get(stream_class);
ds_file_group->ctf_fs_trace = ctf_fs_trace;
goto end;
static
int ctf_fs_ds_file_group_add_ds_file_info(
struct ctf_fs_ds_file_group *ds_file_group,
- const char *path, uint64_t begin_ns,
+ const char *path, int64_t begin_ns,
struct ctf_fs_ds_index *index)
{
struct ctf_fs_ds_file_info *ds_file_info;
static
int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
- const char *path)
+ struct bt_graph *graph, const char *path)
{
- struct bt_ctf_field *packet_header_field = NULL;
- struct bt_ctf_field *packet_context_field = NULL;
- struct bt_ctf_stream_class *stream_class = NULL;
- uint64_t stream_instance_id = -1ULL;
- uint64_t begin_ns = -1ULL;
+ struct bt_stream_class *stream_class = NULL;
+ int64_t stream_instance_id = -1;
+ int64_t begin_ns = -1;
struct ctf_fs_ds_file_group *ds_file_group = NULL;
bool add_group = false;
int ret;
size_t i;
struct ctf_fs_ds_file *ds_file = NULL;
struct ctf_fs_ds_index *index = NULL;
- struct bt_ctf_notif_iter *notif_iter = NULL;
+ struct bt_notif_iter *notif_iter = NULL;
+ struct ctf_stream_class *sc = NULL;
+ struct bt_notif_iter_packet_properties props;
- notif_iter = bt_ctf_notif_iter_create(ctf_fs_trace->metadata->trace,
+ notif_iter = bt_notif_iter_create(ctf_fs_trace->metadata->tc,
bt_common_get_page_size() * 8, ctf_fs_ds_file_medops, NULL);
if (!notif_iter) {
BT_LOGE_STR("Cannot create a CTF notification iterator.");
goto error;
}
- ds_file = ctf_fs_ds_file_create(ctf_fs_trace, notif_iter, NULL, path);
+ ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, notif_iter,
+ NULL, path);
if (!ds_file) {
goto error;
}
- ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file,
- &packet_header_field, &packet_context_field);
+ ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file,
+ NULL, NULL);
if (ret) {
BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
path);
goto error;
}
- stream_instance_id = get_packet_header_stream_instance_id(ctf_fs_trace,
- packet_header_field);
- begin_ns = get_packet_context_timestamp_begin_ns(ctf_fs_trace,
- packet_context_field);
- stream_class = ctf_utils_stream_class_from_packet_header(
- ctf_fs_trace->metadata->trace, packet_header_field);
- if (!stream_class) {
- goto error;
+ ret = bt_notif_iter_get_packet_properties(ds_file->notif_iter, &props);
+ BT_ASSERT(ret == 0);
+ sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc,
+ props.stream_class_id);
+ BT_ASSERT(sc);
+ stream_class = sc->ir_sc;
+ BT_ASSERT(stream_class);
+ stream_instance_id = props.data_stream_id;
+
+ if (props.snapshots.beginning_clock != UINT64_C(-1)) {
+ BT_ASSERT(sc->default_clock_class);
+ ret = bt_clock_class_cycles_to_ns_from_origin(
+ sc->default_clock_class,
+ props.snapshots.beginning_clock, &begin_ns);
+ if (ret) {
+ BT_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
+ path);
+ goto error;
+ }
}
index = ctf_fs_ds_file_build_index(ds_file);
ds_file->file->path->str);
}
- if (begin_ns == -1ULL) {
+ if (begin_ns == -1) {
/*
* No beggining timestamp to sort the stream files
* within a stream file group, so consider that this
* file must be the only one within its group.
*/
- stream_instance_id = -1ULL;
+ stream_instance_id = -1;
}
- if (stream_instance_id == -1ULL) {
+ if (stream_instance_id == -1) {
/*
* No stream instance ID or no beginning timestamp:
* create a unique stream file group for this stream
goto end;
}
- assert(stream_instance_id != -1ULL);
- assert(begin_ns != -1ULL);
+ BT_ASSERT(stream_instance_id != -1);
+ BT_ASSERT(begin_ns != -1);
/* Find an existing stream file group with this ID */
for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
ctf_fs_ds_file_destroy(ds_file);
if (notif_iter) {
- bt_ctf_notif_iter_destroy(notif_iter);
+ bt_notif_iter_destroy(notif_iter);
}
ctf_fs_ds_index_destroy(index);
- bt_put(packet_header_field);
- bt_put(packet_context_field);
- bt_put(stream_class);
return ret;
}
static
-int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
+int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
+ struct bt_graph *graph)
{
int ret = 0;
const char *basename;
if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) {
/* Ignore the metadata stream. */
- BT_LOGD("Ignoring metadata file `%s/%s`",
+ BT_LOGD("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
continue;
}
if (basename[0] == '.') {
- BT_LOGD("Ignoring hidden file `%s/%s`",
+ BT_LOGD("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
continue;
}
/* Create the file. */
file = ctf_fs_file_create();
if (!file) {
- BT_LOGE("Cannot create stream file object for file `%s/%s`",
+ BT_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`",
ctf_fs_trace->path->str, basename);
goto error;
}
/* Create full path string. */
- g_string_append_printf(file->path, "%s/%s",
+ 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_LOGD("Ignoring non-regular file `%s`",
continue;
}
- ret = add_ds_file_to_ds_file_group(ctf_fs_trace,
+ ret = add_ds_file_to_ds_file_group(ctf_fs_trace, graph,
file->path->str);
if (ret) {
BT_LOGE("Cannot add stream file `%s` to stream file group",
goto error;
}
- if (ds_file_group->stream_id == -1ULL) {
- /* No stream ID */
- ds_file_group->stream = bt_ctf_stream_create(
- ds_file_group->stream_class, name->str);
+ if (ds_file_group->stream_id == UINT64_C(-1)) {
+ /* No stream ID: use 0 */
+ ds_file_group->stream = bt_stream_create_with_id(
+ ds_file_group->stream_class,
+ ctf_fs_trace->next_stream_id);
+ ctf_fs_trace->next_stream_id++;
} else {
/* Specific stream ID */
- ds_file_group->stream = bt_ctf_stream_create_with_id(
- ds_file_group->stream_class, name->str,
- ds_file_group->stream_id);
+ ds_file_group->stream = bt_stream_create_with_id(
+ ds_file_group->stream_class,
+ (uint64_t) ds_file_group->stream_id);
}
- g_string_free(name, TRUE);
-
if (!ds_file_group->stream) {
BT_LOGE("Cannot create stream for DS file group: "
"addr=%p, stream-name=\"%s\"",
ds_file_group, name->str);
+ g_string_free(name, TRUE);
goto error;
}
+
+ ret = bt_stream_set_name(ds_file_group->stream, name->str);
+ if (ret) {
+ BT_LOGE("Cannot set stream's name: "
+ "addr=%p, stream-name=\"%s\"",
+ ds_file_group->stream, name->str);
+ g_string_free(name, TRUE);
+ goto error;
+ }
+
+ g_string_free(name, TRUE);
}
goto end;
return ret;
}
-static
-int create_cc_prio_map(struct ctf_fs_trace *ctf_fs_trace)
-{
- int ret = 0;
- size_t i;
- int count;
-
- assert(ctf_fs_trace);
- ctf_fs_trace->cc_prio_map = bt_clock_class_priority_map_create();
- if (!ctf_fs_trace->cc_prio_map) {
- ret = -1;
- goto end;
- }
-
- count = bt_ctf_trace_get_clock_class_count(
- ctf_fs_trace->metadata->trace);
- assert(count >= 0);
-
- for (i = 0; i < count; i++) {
- struct bt_ctf_clock_class *clock_class =
- bt_ctf_trace_get_clock_class_by_index(
- ctf_fs_trace->metadata->trace, i);
-
- assert(clock_class);
- ret = bt_clock_class_priority_map_add_clock_class(
- ctf_fs_trace->cc_prio_map, clock_class, 0);
- BT_PUT(clock_class);
-
- if (ret) {
- goto end;
- }
- }
-
-end:
- return ret;
-}
-
BT_HIDDEN
struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
- struct ctf_fs_metadata_config *metadata_config)
+ struct ctf_fs_metadata_config *metadata_config,
+ struct bt_graph *graph)
{
struct ctf_fs_trace *ctf_fs_trace;
int ret;
goto error;
}
+ ctf_fs_metadata_init(ctf_fs_trace->metadata);
ctf_fs_trace->ds_file_groups = g_ptr_array_new_with_free_func(
(GDestroyNotify) ctf_fs_ds_file_group_destroy);
if (!ctf_fs_trace->ds_file_groups) {
goto error;
}
- ret = create_ds_file_groups(ctf_fs_trace);
- if (ret) {
- goto error;
- }
-
- ret = create_cc_prio_map(ctf_fs_trace);
+ ret = create_ds_file_groups(ctf_fs_trace, graph);
if (ret) {
goto error;
}
* trace needs. There won't be any more. Therefore it is safe to
* make this trace static.
*/
- (void) bt_ctf_trace_set_is_static(ctf_fs_trace->metadata->trace);
+ (void) bt_trace_make_static(ctf_fs_trace->metadata->trace);
goto end;
error:
ctf_fs_trace_destroy(ctf_fs_trace);
ctf_fs_trace = NULL;
+
end:
return ctf_fs_trace;
}
goto end;
}
- g_string_printf(metadata_path, "%s/%s", path, CTF_FS_METADATA_FILENAME);
+ g_string_printf(metadata_path, "%s" G_DIR_SEPARATOR_S "%s", path, CTF_FS_METADATA_FILENAME);
if (g_file_test(metadata_path->str, G_FILE_TEST_IS_REGULAR)) {
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.");
ret = -1;
}
*trace_paths = g_list_prepend(*trace_paths, norm_path);
- assert(*trace_paths);
+ BT_ASSERT(*trace_paths);
norm_path = NULL;
end:
goto end;
}
- g_string_printf(sub_path, "%s/%s", start_path, basename);
+ g_string_printf(sub_path, "%s" G_DIR_SEPARATOR_S "%s", start_path, basename);
ret = ctf_fs_find_traces(trace_paths, sub_path->str);
g_string_free(sub_path, TRUE);
if (ret) {
last_sep = strrchr(base_path, G_DIR_SEPARATOR);
/* We know there's at least one separator */
- assert(last_sep);
+ BT_ASSERT(last_sep);
/* Distance to base */
base_dist = last_sep - base_path + 1;
GString *trace_name = g_string_new(NULL);
GString *trace_path = node->data;
- assert(trace_name);
+ BT_ASSERT(trace_name);
g_string_assign(trace_name, &trace_path->str[base_dist]);
trace_names = g_list_append(trace_names, trace_name);
}
tn_node = g_list_next(tn_node)) {
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
+ struct bt_graph *graph = bt_component_borrow_graph(
+ bt_component_borrow_from_private(ctf_fs->priv_comp));
+ BT_ASSERT(graph);
ctf_fs_trace = ctf_fs_trace_create(trace_path->str,
- trace_name->str, &ctf_fs->metadata_config);
+ trace_name->str, &ctf_fs->metadata_config,
+ graph);
if (!ctf_fs_trace) {
BT_LOGE("Cannot create trace for `%s`.",
trace_path->str);
}
ret = bt_private_component_set_user_data(priv_comp, ctf_fs);
- assert(ret == BT_COMPONENT_STATUS_OK);
+ BT_ASSERT(ret == BT_COMPONENT_STATUS_OK);
/*
* We don't need to get a new reference here because as long as
* private component should also exist.
*/
ctf_fs->priv_comp = priv_comp;
- value = bt_value_map_get(params, "path");
- if (!bt_value_is_string(value)) {
+ value = bt_value_map_borrow(params, "path");
+ if (value && !bt_value_is_string(value)) {
goto error;
}
value_ret = bt_value_string_get(value, &path_param);
- assert(value_ret == BT_VALUE_STATUS_OK);
- BT_PUT(value);
- value = bt_value_map_get(params, "clock-class-offset-s");
+ BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+ value = bt_value_map_borrow(params, "clock-class-offset-s");
if (value) {
if (!bt_value_is_integer(value)) {
BT_LOGE("clock-class-offset-s should be an integer");
}
value_ret = bt_value_integer_get(value,
&ctf_fs->metadata_config.clock_class_offset_s);
- assert(value_ret == BT_VALUE_STATUS_OK);
- BT_PUT(value);
+ BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
}
- value = bt_value_map_get(params, "clock-class-offset-ns");
+ value = bt_value_map_borrow(params, "clock-class-offset-ns");
if (value) {
if (!bt_value_is_integer(value)) {
BT_LOGE("clock-class-offset-ns should be an integer");
}
value_ret = bt_value_integer_get(value,
&ctf_fs->metadata_config.clock_class_offset_ns);
- assert(value_ret == BT_VALUE_STATUS_OK);
- BT_PUT(value);
+ BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
}
ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy);
ctf_fs_destroy(ctf_fs);
ctf_fs = NULL;
ret = bt_private_component_set_user_data(priv_comp, NULL);
- assert(ret == BT_COMPONENT_STATUS_OK);
+ BT_ASSERT(ret == BT_COMPONENT_STATUS_OK);
end:
- bt_put(value);
return ctf_fs;
}
}
BT_HIDDEN
-struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_method_return ctf_fs_query(
+ struct bt_component_class *comp_class,
+ struct bt_query_executor *query_exec,
const char *object, struct bt_value *params)
{
- struct bt_value *result = NULL;
+ struct bt_component_class_query_method_return ret = {
+ .result = NULL,
+ .status = BT_QUERY_STATUS_OK,
+ };
if (!strcmp(object, "metadata-info")) {
- result = metadata_info_query(comp_class, params);
+ ret = metadata_info_query(comp_class, params);
} else if (!strcmp(object, "trace-info")) {
- result = trace_info_query(comp_class, params);
+ ret = trace_info_query(comp_class, params);
} else {
BT_LOGE("Unknown query object `%s`", object);
+ ret.status = BT_QUERY_STATUS_INVALID_OBJECT;
goto end;
}
end:
- return result;
+ return ret;
}
projects / babeltrace.git / blobdiff