}
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)
{
struct bt_stream_class *ds_file_stream_class;
struct bt_stream *stream = NULL;
- ds_file_stream_class = bt_stream_get_class(ds_file->stream);
- bt_put(ds_file_stream_class);
-
+ ds_file_stream_class = bt_stream_borrow_class(ds_file->stream);
if (stream_class != ds_file_stream_class) {
/*
* Not supported: two packets described by two different
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,
};
}
static
-struct bt_clock_class *get_field_mapped_clock_class(
+struct bt_clock_class *borrow_field_mapped_clock_class(
struct bt_field *field)
{
struct bt_field_type *field_type;
struct bt_clock_class *clock_class = NULL;
- field_type = bt_field_get_type(field);
+ field_type = bt_field_borrow_type(field);
if (!field_type) {
goto end;
}
- clock_class = bt_field_type_integer_get_mapped_clock_class(
- field_type);
+ clock_class = bt_field_type_integer_borrow_mapped_clock_class(
+ field_type);
if (!clock_class) {
goto end;
}
+
end:
- bt_put(field_type);
return clock_class;
}
static
-int get_packet_bounds_from_packet_context(
+int borrow_packet_bounds_from_packet_context(
struct bt_field *packet_context,
struct bt_clock_class **_timestamp_begin_cc,
struct bt_field **_timestamp_begin,
struct bt_field *timestamp_begin = NULL;
struct bt_field *timestamp_end = NULL;
- timestamp_begin = bt_field_structure_get_field_by_name(
+ timestamp_begin = bt_field_structure_borrow_field_by_name(
packet_context, "timestamp_begin");
if (!timestamp_begin) {
BT_LOGD_STR("Cannot retrieve timestamp_begin field in packet context.");
goto end;
}
- timestamp_begin_cc = get_field_mapped_clock_class(timestamp_begin);
+ timestamp_begin_cc = borrow_field_mapped_clock_class(timestamp_begin);
if (!timestamp_begin_cc) {
BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_begin.");
}
- timestamp_end = bt_field_structure_get_field_by_name(
+ timestamp_end = bt_field_structure_borrow_field_by_name(
packet_context, "timestamp_end");
if (!timestamp_end) {
BT_LOGD_STR("Cannot retrieve timestamp_end field in packet context.");
goto end;
}
- timestamp_end_cc = get_field_mapped_clock_class(timestamp_end);
+ timestamp_end_cc = borrow_field_mapped_clock_class(timestamp_end);
if (!timestamp_end_cc) {
BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_end.");
}
if (_timestamp_begin_cc) {
- *_timestamp_begin_cc = bt_get(timestamp_begin_cc);
+ *_timestamp_begin_cc = timestamp_begin_cc;
}
if (_timestamp_begin) {
- *_timestamp_begin = bt_get(timestamp_begin);
+ *_timestamp_begin = timestamp_begin;
}
if (_timestamp_end_cc) {
- *_timestamp_end_cc = bt_get(timestamp_end_cc);
+ *_timestamp_end_cc = timestamp_end_cc;
}
if (_timestamp_end) {
- *_timestamp_end = bt_get(timestamp_end);
+ *_timestamp_end = timestamp_end;
}
end:
- bt_put(timestamp_begin_cc);
- bt_put(timestamp_end_cc);
- bt_put(timestamp_begin);
- bt_put(timestamp_end);
return ret;
}
static
-int get_ds_file_packet_bounds_clock_classes(struct ctf_fs_ds_file *ds_file,
+int borrow_ds_file_packet_bounds_clock_classes(struct ctf_fs_ds_file *ds_file,
struct bt_clock_class **timestamp_begin_cc,
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;
}
- ret = get_packet_bounds_from_packet_context(packet_context,
+ ret = borrow_packet_bounds_from_packet_context(packet_context,
timestamp_begin_cc, NULL,
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
BT_LOGD("Building index from .idx file of stream file %s",
ds_file->file->path->str);
- ret = get_ds_file_packet_bounds_clock_classes(ds_file,
+ ret = borrow_ds_file_packet_bounds_clock_classes(ds_file,
×tamp_begin_cc, ×tamp_end_cc);
if (ret) {
BT_LOGD_STR("Cannot get clock classes of \"timestamp_begin\" "
if (mapped_file) {
g_mapped_file_unref(mapped_file);
}
- bt_put(timestamp_begin_cc);
- bt_put(timestamp_end_cc);
return index;
error:
ctf_fs_ds_index_destroy(index);
struct bt_clock_class *timestamp_begin_cc = NULL;
struct bt_clock_class *timestamp_end_cc = NULL;
- ret = get_packet_bounds_from_packet_context(packet_context,
+ ret = borrow_packet_bounds_from_packet_context(packet_context,
×tamp_begin_cc, ×tamp_begin,
×tamp_end_cc, ×tamp_end);
if (ret || !timestamp_begin_cc || !timestamp_begin ||
BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
goto end;
}
+
end:
- bt_put(timestamp_begin);
- bt_put(timestamp_begin_cc);
- bt_put(timestamp_end);
- bt_put(timestamp_end_cc);
return ret;
}
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;
}
projects / babeltrace.git / blobdiff