struct bt_notification **notif)
{
enum bt_notification_iterator_status status;
+ struct bt_private_notification *priv_notif;
int ret;
BT_ASSERT(notif_iter_data->ds_file);
- status = ctf_fs_ds_file_next(notif_iter_data->ds_file, notif);
+ status = ctf_fs_ds_file_next(notif_iter_data->ds_file, &priv_notif);
+ *notif = bt_notification_borrow_from_private(priv_notif);
if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK &&
bt_notification_get_type(*notif) ==
*/
BT_OBJECT_PUT_REF_AND_RESET(*notif);
status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
- notif);
+ &priv_notif);
+ *notif = bt_notification_borrow_from_private(priv_notif);
BT_ASSERT(status != BT_NOTIFICATION_ITERATOR_STATUS_END);
goto end;
} else {
goto end;
}
- status = ctf_fs_ds_file_next(notif_iter_data->ds_file, notif);
+ status = ctf_fs_ds_file_next(notif_iter_data->ds_file, &priv_notif);
+ *notif = bt_notification_borrow_from_private(priv_notif);
/*
* If we get a notification, we expect to get a
BT_NOTIFICATION_TYPE_STREAM_BEGIN);
BT_OBJECT_PUT_REF_AND_RESET(*notif);
status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
- notif);
+ &priv_notif);
+ *notif = bt_notification_borrow_from_private(priv_notif);
BT_ASSERT(status != BT_NOTIFICATION_ITERATOR_STATUS_END);
}
}
port_data->ctf_fs = ctf_fs;
port_data->ds_file_group = ds_file_group;
- ret = bt_private_component_source_add_output_private_port(
+ ret = bt_private_component_source_add_output_port(
ctf_fs->priv_comp, port_name->str, port_data, NULL);
if (ret) {
goto error;
static
struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
struct ctf_fs_trace *ctf_fs_trace,
- struct bt_stream_class *stream_class,
+ struct bt_private_stream_class *stream_class,
uint64_t stream_instance_id)
{
struct ctf_fs_ds_file_group *ds_file_group;
static
int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
- struct bt_graph *graph, const char *path)
+ const char *path)
{
- struct bt_stream_class *stream_class = NULL;
+ struct bt_private_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;
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,
+ bt_clock_class_borrow_from_private(
+ sc->default_clock_class),
props.snapshots.beginning_clock, &begin_ns);
if (ret) {
BT_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
}
static
-int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
- struct bt_graph *graph)
+int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
{
int ret = 0;
const char *basename;
continue;
}
- ret = add_ds_file_to_ds_file_group(ctf_fs_trace, graph,
+ 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",
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 = bt_private_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_stream_create_with_id(
+ ds_file_group->stream = bt_private_stream_create_with_id(
ds_file_group->stream_class,
(uint64_t) ds_file_group->stream_id);
}
goto error;
}
- ret = bt_stream_set_name(ds_file_group->stream, name->str);
+ ret = bt_private_stream_set_name(ds_file_group->stream,
+ name->str);
if (ret) {
BT_LOGE("Cannot set stream's name: "
"addr=%p, stream-name=\"%s\"",
BT_HIDDEN
struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
- struct ctf_fs_metadata_config *metadata_config,
- struct bt_graph *graph)
+ struct ctf_fs_metadata_config *metadata_config)
{
struct ctf_fs_trace *ctf_fs_trace;
int ret;
goto error;
}
- ret = create_ds_file_groups(ctf_fs_trace, graph);
+ ret = create_ds_file_groups(ctf_fs_trace);
if (ret) {
goto error;
}
* trace needs. There won't be any more. Therefore it is safe to
* make this trace static.
*/
- (void) bt_trace_make_static(ctf_fs_trace->metadata->trace);
+ (void) bt_private_trace_make_static(ctf_fs_trace->metadata->trace);
goto end;
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,
- graph);
+ trace_name->str, &ctf_fs->metadata_config);
if (!ctf_fs_trace) {
BT_LOGE("Cannot create trace for `%s`.",
trace_path->str);
struct bt_value *value = NULL;
const char *path_param;
enum bt_component_status ret;
- enum bt_value_status value_ret;
ctf_fs = g_new0(struct ctf_fs_component, 1);
if (!ctf_fs) {
goto error;
}
- value_ret = bt_value_string_get(value, &path_param);
- BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+ path_param = bt_value_string_get(value);
value = bt_value_map_borrow_entry_value(params, "clock-class-offset-s");
if (value) {
if (!bt_value_is_integer(value)) {
BT_LOGE("clock-class-offset-s should be an integer");
goto error;
}
- value_ret = bt_value_integer_get(value,
- &ctf_fs->metadata_config.clock_class_offset_s);
- BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+ ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_get(value);
}
value = bt_value_map_borrow_entry_value(params, "clock-class-offset-ns");
BT_LOGE("clock-class-offset-ns should be an integer");
goto error;
}
- value_ret = bt_value_integer_get(value,
- &ctf_fs->metadata_config.clock_class_offset_ns);
- BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+ ctf_fs->metadata_config.clock_class_offset_ns = bt_value_integer_get(value);
}
ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy);
projects / babeltrace.git / blobdiff