}
static
-bt_stream *medop_borrow_stream(
- bt_stream_class *stream_class, int64_t stream_id,
+bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t stream_id,
void *data)
{
struct ctf_fs_ds_file *ds_file = data;
}
static
-enum bt_msg_iter_medium_status medop_seek(
- enum bt_msg_iter_seek_whence whence, off_t offset,
- void *data)
+enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence,
+ off_t offset, void *data)
{
enum bt_msg_iter_medium_status ret =
BT_MSG_ITER_MEDIUM_STATUS_OK;
}
static
-int convert_cycles_to_ns(bt_clock_class *clock_class,
+int convert_cycles_to_ns(struct ctf_clock_class *clock_class,
uint64_t cycles, int64_t *ns)
{
- return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles,
- ns);
+ return bt_util_clock_cycles_to_ns_from_origin(cycles,
+ clock_class->frequency, clock_class->offset_seconds,
+ clock_class->offset_cycles, ns);
}
static
struct bt_msg_iter_packet_properties *props,
off_t packet_size, off_t packet_offset)
{
- int ret;
+ int ret = 0;
struct ctf_stream_class *sc;
sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc,
BT_ASSERT(packet_size >= 0);
entry->packet_size = packet_size;
- /* Convert the packet's bound to nanoseconds since Epoch. */
- ret = convert_cycles_to_ns(sc->default_clock_class,
- props->snapshots.beginning_clock,
- &entry->timestamp_begin_ns);
- if (ret) {
- BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
- goto end;
+ if (props->snapshots.beginning_clock != UINT64_C(-1)) {
+ /* Convert the packet's bound to nanoseconds since Epoch. */
+ ret = convert_cycles_to_ns(sc->default_clock_class,
+ props->snapshots.beginning_clock,
+ &entry->timestamp_begin_ns);
+ if (ret) {
+ BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
+ goto end;
+ }
+ } else {
+ entry->timestamp_begin_ns = UINT64_C(-1);
}
- ret = convert_cycles_to_ns(sc->default_clock_class,
- props->snapshots.end_clock,
- &entry->timestamp_end_ns);
- if (ret) {
- BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
- goto end;
+ if (props->snapshots.end_clock != UINT64_C(-1)) {
+ ret = convert_cycles_to_ns(sc->default_clock_class,
+ props->snapshots.end_clock,
+ &entry->timestamp_end_ns);
+ if (ret) {
+ BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch.");
+ goto end;
+ }
+ } else {
+ entry->timestamp_end_ns = UINT64_C(-1);
}
end:
{
int ret;
struct ctf_fs_ds_index *index = NULL;
- enum bt_msg_iter_status iter_status;
+ enum bt_msg_iter_status iter_status = BT_MSG_ITER_STATUS_OK;
+ off_t current_packet_offset_bytes = 0;
BT_LOGD("Indexing stream file %s", ds_file->file->path->str);
}
do {
- off_t current_packet_offset;
- off_t next_packet_offset;
off_t current_packet_size_bytes;
struct ctf_fs_ds_index_entry *entry;
struct bt_msg_iter_packet_properties props;
- iter_status = bt_msg_iter_get_packet_properties(
- ds_file->msg_iter, &props);
+ if (current_packet_offset_bytes < 0) {
+ BT_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).");
+ goto error;
+ } else if (current_packet_offset_bytes == ds_file->file->size) {
+ /* No more data */
+ break;
+ }
+
+ iter_status = bt_msg_iter_seek(ds_file->msg_iter,
+ current_packet_offset_bytes);
if (iter_status != BT_MSG_ITER_STATUS_OK) {
- if (iter_status == BT_MSG_ITER_STATUS_EOF) {
- break;
- }
goto error;
}
- current_packet_offset =
- bt_msg_iter_get_current_packet_offset(
- ds_file->msg_iter);
- if (current_packet_offset < 0) {
- BT_LOGE_STR("Cannot get the current packet's offset.");
+ iter_status = bt_msg_iter_get_packet_properties(
+ ds_file->msg_iter, &props);
+ if (iter_status != BT_MSG_ITER_STATUS_OK) {
goto error;
}
- current_packet_size_bytes =
- ((props.exp_packet_total_size + 7) & ~7) / CHAR_BIT;
+ if (props.exp_packet_total_size >= 0) {
+ current_packet_size_bytes =
+ (uint64_t) props.exp_packet_total_size / 8;
+ } else {
+ current_packet_size_bytes = ds_file->file->size;
+ }
- if (current_packet_offset + current_packet_size_bytes >
+ if (current_packet_offset_bytes + current_packet_size_bytes >
ds_file->file->size) {
BT_LOGW("Invalid packet size reported in file: stream=\"%s\", "
"packet-offset=%jd, packet-size-bytes=%jd, "
"file-size=%jd",
ds_file->file->path->str,
- current_packet_offset,
+ current_packet_offset_bytes,
current_packet_size_bytes,
ds_file->file->size);
goto error;
}
- next_packet_offset = current_packet_offset +
- current_packet_size_bytes;
+ current_packet_offset_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_bytes - current_packet_size_bytes,
+ current_packet_offset_bytes);
entry = ctf_fs_ds_index_add_new_entry(index);
if (!entry) {
BT_LOGE_STR("Failed to allocate a new index entry.");
}
ret = init_index_entry(entry, ds_file, &props,
- current_packet_size_bytes, current_packet_offset);
+ current_packet_size_bytes, current_packet_offset_bytes);
if (ret) {
goto error;
}
-
- iter_status = bt_msg_iter_seek(ds_file->msg_iter,
- next_packet_offset);
} while (iter_status == BT_MSG_ITER_STATUS_OK);
- if (iter_status != BT_MSG_ITER_STATUS_EOF) {
+ if (iter_status != BT_MSG_ITER_STATUS_OK) {
goto error;
}
}
BT_HIDDEN
-bt_message_iterator_status ctf_fs_ds_file_next(
+bt_self_message_iterator_status ctf_fs_ds_file_next(
struct ctf_fs_ds_file *ds_file,
bt_message **msg)
{
enum bt_msg_iter_status msg_iter_status;
- bt_message_iterator_status status;
+ bt_self_message_iterator_status status;
msg_iter_status = bt_msg_iter_get_next_message(
ds_file->msg_iter, ds_file->pc_msg_iter, msg);
switch (msg_iter_status) {
case BT_MSG_ITER_STATUS_EOF:
- status = BT_MESSAGE_ITERATOR_STATUS_END;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
break;
case BT_MSG_ITER_STATUS_OK:
- status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
break;
case BT_MSG_ITER_STATUS_AGAIN:
/*
case BT_MSG_ITER_STATUS_INVAL:
case BT_MSG_ITER_STATUS_ERROR:
default:
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
break;
}
return status;
projects / babeltrace.git / blobdiff