From f30762e5afa0e61a609d2d7efe1d36264cf7acfa Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 2 Nov 2019 23:23:03 -0400 Subject: [PATCH] Rename pc_msg_iter fields to self_msg_iter The pc prefix means "private connection", which is not a concept present in the API anymore. Rename to "self_msg_iter", which is a more contemporary term. Change-Id: I76ab362cab05d1dd480549fc285060854375e1e7 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2321 CI-Build: Francis Deslauriers Tested-by: jenkins Reviewed-by: Francis Deslauriers --- src/plugins/ctf/fs-src/data-stream-file.c | 4 ++-- src/plugins/ctf/fs-src/data-stream-file.h | 4 ++-- src/plugins/ctf/fs-src/fs.c | 4 ++-- src/plugins/ctf/fs-src/fs.h | 2 +- src/plugins/text/dmesg/dmesg.c | 15 +++++++++------ 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c index ff2b3d8b..20b60cce 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.c +++ b/src/plugins/ctf/fs-src/data-stream-file.c @@ -648,7 +648,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( 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; @@ -755,7 +755,7 @@ bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next( 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: diff --git a/src/plugins/ctf/fs-src/data-stream-file.h b/src/plugins/ctf/fs-src/data-stream-file.h index af81915d..0517020e 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.h +++ b/src/plugins/ctf/fs-src/data-stream-file.h @@ -54,10 +54,10 @@ struct ctf_fs_ds_file { 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; diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c index c9315227..f03a3635 100644 --- a/src/plugins/ctf/fs-src/fs.c +++ b/src/plugins/ctf/fs-src/fs.c @@ -69,7 +69,7 @@ int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data 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, @@ -276,7 +276,7 @@ bt_component_class_message_iterator_initialize_method_status ctf_fs_iterator_ini 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, diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h index e645f177..bf2e254e 100644 --- a/src/plugins/ctf/fs-src/fs.h +++ b/src/plugins/ctf/fs-src/fs.h @@ -181,7 +181,7 @@ struct ctf_fs_msg_iter_data { 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; diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c index c516672c..0d755e73 100644 --- a/src/plugins/text/dmesg/dmesg.c +++ b/src/plugins/text/dmesg/dmesg.c @@ -49,7 +49,10 @@ struct dmesg_component; 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; @@ -533,11 +536,11 @@ skip_ts: 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); } @@ -678,7 +681,7 @@ bt_component_class_message_iterator_initialize_method_status dmesg_msg_iter_init 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; @@ -796,7 +799,7 @@ handle_state: 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: @@ -806,7 +809,7 @@ handle_state: 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: -- 2.34.1