}
static
-struct bt_stream *medop_get_stream(
+struct bt_stream *medop_borrow_stream(
struct bt_stream_class *stream_class, uint64_t stream_id,
void *data)
{
BT_HIDDEN
struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops = {
.request_bytes = medop_request_bytes,
- .get_stream = medop_get_stream,
+ .borrow_stream = medop_borrow_stream,
.seek = medop_seek,
};
struct bt_clock_class **timestamp_end_cc)
{
struct bt_field *packet_context = NULL;
- int ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file,
- NULL, &packet_context);
+ int ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file,
+ NULL, &packet_context);
if (ret || !packet_context) {
- BT_LOGD("Cannot retrieve packet context field of stream \'%s\'",
+ BT_LOGD("Cannot retrieve packet context field: ds-file-path=\"%s\"",
ds_file->file->path->str);
ret = -1;
goto end;
timestamp_end_cc, NULL);
end:
- bt_put(packet_context);
return ret;
}
int convert_cycles_to_ns(struct bt_clock_class *clock_class,
uint64_t cycles, int64_t *ns)
{
- int ret = 0;
- struct bt_clock_value *clock_value;
-
- BT_ASSERT(ns);
- clock_value = bt_clock_value_create(clock_class, cycles);
- if (!clock_value) {
- ret = -1;
- goto end;
- }
-
- ret = bt_clock_value_get_value_ns_from_epoch(clock_value, ns);
- if (ret) {
- goto end;
- }
-end:
- bt_put(clock_value);
- return ret;
+ return bt_clock_class_cycles_to_ns(clock_class, cycles, ns);
}
static
int ret;
struct ctf_fs_ds_index *index = NULL;
enum bt_notif_iter_status iter_status;
- struct bt_field *packet_context = NULL;
BT_LOGD("Indexing stream file %s", ds_file->file->path->str);
off_t next_packet_offset;
off_t current_packet_size, current_packet_size_bytes;
struct ctf_fs_ds_index_entry *entry;
+ struct bt_field *packet_context = NULL;
- iter_status = bt_notif_iter_get_packet_header_context_fields(
- ds_file->notif_iter, NULL, &packet_context);
+ iter_status = bt_notif_iter_borrow_packet_header_context_fields(
+ ds_file->notif_iter, NULL, &packet_context);
if (iter_status != BT_NOTIF_ITER_STATUS_OK) {
if (iter_status == BT_NOTIF_ITER_STATUS_EOF) {
break;
}
goto error;
}
+
current_packet_offset =
- bt_notif_iter_get_current_packet_offset(
+ bt_notif_iter_get_current_packet_offset(
ds_file->notif_iter);
if (current_packet_offset < 0) {
BT_LOGE_STR("Cannot get the current packet's offset.");
}
current_packet_size = bt_notif_iter_get_current_packet_size(
- ds_file->notif_iter);
+ ds_file->notif_iter);
if (current_packet_size < 0) {
BT_LOGE("Cannot get packet size: packet-offset=%jd",
current_packet_offset);
goto error;
}
current_packet_size_bytes =
- ((current_packet_size + 7) & ~7) / CHAR_BIT;
+ ((current_packet_size + 7) & ~7) / CHAR_BIT;
if (current_packet_offset + current_packet_size_bytes >
ds_file->file->size) {
}
next_packet_offset = current_packet_offset +
- current_packet_size_bytes;
+ current_packet_size_bytes;
BT_LOGD("Seeking to next packet: current-packet-offset=%jd, "
- "next-packet-offset=%jd", current_packet_offset,
- next_packet_offset);
+ "next-packet-offset=%jd", current_packet_offset,
+ next_packet_offset);
entry = ctf_fs_ds_index_add_new_entry(index);
if (!entry) {
}
ret = init_index_entry(entry, packet_context,
- current_packet_size_bytes,
- current_packet_offset);
+ current_packet_size_bytes,
+ current_packet_offset);
if (ret) {
goto error;
}
iter_status = bt_notif_iter_seek(ds_file->notif_iter,
next_packet_offset);
- BT_PUT(packet_context);
} while (iter_status == BT_NOTIF_ITER_STATUS_OK);
if (iter_status != BT_NOTIF_ITER_STATUS_EOF) {
goto error;
}
+
end:
- bt_put(packet_context);
return index;
+
error:
ctf_fs_ds_index_destroy(index);
index = NULL;
}
BT_HIDDEN
-int ctf_fs_ds_file_get_packet_header_context_fields(
+int ctf_fs_ds_file_borrow_packet_header_context_fields(
struct ctf_fs_ds_file *ds_file,
struct bt_field **packet_header_field,
struct bt_field **packet_context_field)
int ret = 0;
BT_ASSERT(ds_file);
- notif_iter_status = bt_notif_iter_get_packet_header_context_fields(
+ notif_iter_status = bt_notif_iter_borrow_packet_header_context_fields(
ds_file->notif_iter, packet_header_field, packet_context_field);
switch (notif_iter_status) {
case BT_NOTIF_ITER_STATUS_EOF:
error:
ret = -1;
- if (packet_header_field) {
- bt_put(*packet_header_field);
- }
-
- if (packet_context_field) {
- bt_put(*packet_context_field);
- }
-
end:
return ret;
}