ds_file->log_level = log_level;
ds_file->self_comp = ctf_fs_trace->self_comp;
- ds_file->pc_msg_iter = pc_msg_iter;
+ ds_file->self_msg_iter = pc_msg_iter;
ds_file->file = ctf_fs_file_create(log_level, ds_file->self_comp);
if (!ds_file->file) {
goto error;
bt_component_class_message_iterator_next_method_status status;
msg_iter_status = bt_msg_iter_get_next_message(
- ds_file->msg_iter, ds_file->pc_msg_iter, msg);
+ ds_file->msg_iter, ds_file->self_msg_iter, msg);
switch (msg_iter_status) {
case BT_MSG_ITER_STATUS_EOF:
bt_self_component *self_comp;
/* Weak */
- struct ctf_fs_metadata *metadata;
+ bt_self_message_iterator *self_msg_iter;
/* Weak */
- bt_self_message_iterator *pc_msg_iter;
+ struct ctf_fs_metadata *metadata;
/* Owned by this */
struct ctf_fs_file *file;
ctf_fs_ds_file_destroy(msg_iter_data->ds_file);
msg_iter_data->ds_file = ctf_fs_ds_file_create(
msg_iter_data->ds_file_group->ctf_fs_trace,
- msg_iter_data->pc_msg_iter,
+ msg_iter_data->self_msg_iter,
msg_iter_data->msg_iter,
msg_iter_data->ds_file_group->stream,
ds_file_info->path->str,
msg_iter_data->log_level = log_level;
msg_iter_data->self_comp = self_comp;
- msg_iter_data->pc_msg_iter = self_msg_iter;
+ msg_iter_data->self_msg_iter = self_msg_iter;
msg_iter_data->msg_iter = bt_msg_iter_create(
port_data->ds_file_group->ctf_fs_trace->metadata->tc,
bt_common_get_page_size(msg_iter_data->log_level) * 8,
bt_self_component *self_comp;
/* Weak */
- bt_self_message_iterator *pc_msg_iter;
+ bt_self_message_iterator *self_msg_iter;
/* Weak, belongs to ctf_fs_trace */
struct ctf_fs_ds_file_group *ds_file_group;
struct dmesg_msg_iter {
struct dmesg_component *dmesg_comp;
- bt_self_message_iterator *pc_msg_iter; /* Weak */
+
+ /* Weak */
+ bt_self_message_iterator *self_msg_iter;
+
char *linebuf;
size_t linebuf_len;
FILE *fp;
if (dmesg_comp->clock_class) {
msg = bt_message_event_create_with_default_clock_snapshot(
- msg_iter->pc_msg_iter,
+ msg_iter->self_msg_iter,
dmesg_comp->event_class, dmesg_comp->stream, ts);
msg_iter->last_clock_value = ts;
} else {
- msg = bt_message_event_create(msg_iter->pc_msg_iter,
+ msg = bt_message_event_create(msg_iter->self_msg_iter,
dmesg_comp->event_class, dmesg_comp->stream);
}
BT_ASSERT(dmesg_comp);
dmesg_msg_iter->dmesg_comp = dmesg_comp;
- dmesg_msg_iter->pc_msg_iter = self_msg_iter;
+ dmesg_msg_iter->self_msg_iter = self_msg_iter;
if (dmesg_comp->params.read_from_stdin) {
dmesg_msg_iter->fp = stdin;
case STATE_EMIT_STREAM_BEGINNING:
BT_ASSERT_DBG(dmesg_msg_iter->tmp_event_msg);
*msg = bt_message_stream_beginning_create(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
+ dmesg_msg_iter->self_msg_iter, dmesg_comp->stream);
dmesg_msg_iter->state = STATE_EMIT_EVENT;
break;
case STATE_EMIT_EVENT:
break;
case STATE_EMIT_STREAM_END:
*msg = bt_message_stream_end_create(
- dmesg_msg_iter->pc_msg_iter, dmesg_comp->stream);
+ dmesg_msg_iter->self_msg_iter, dmesg_comp->stream);
dmesg_msg_iter->state = STATE_DONE;
break;
default: