Skip to content

Commit

Permalink
Fix comments and logs incorrectly referring to MCAP
Browse files Browse the repository at this point in the history
Signed-off-by: tempate <[email protected]>
  • Loading branch information
Tempate committed Jun 27, 2024
1 parent f8e0431 commit f965d89
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace ddsrecorder {
namespace participants {

/**
* Participant kind in charge of replaying messages read by a \c McapReaderParticipant.
* Participant kind in charge of replaying messages read by a \c BaseReaderParticipant.
* It is mostly equivalent to a \c rtps::SimpleParticipant without reader, only writer.
*/
class ReplayerParticipant : public ddspipe::participants::rtps::SimpleParticipant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace ddsrecorder {
namespace participants {

/**
* Participant that reads MCAP files and passes its messages to other DDS Pipe participants.
* Participant that reads SQL files and passes its messages to other DDS Pipe participants.
*
* @implements BaseReaderParticipant
*/
Expand All @@ -57,7 +57,7 @@ class SqlReaderParticipant : public BaseReaderParticipant
*
* @param config: Structure encapsulating all configuration options.
* @param payload_pool: Owner of every payload contained in sent messages.
* @param file_path: Path to the MCAP file with the messages to be read and sent.
* @param file_path: Path to the SQL file with the messages to be read and sent.
*/
DDSRECORDER_PARTICIPANTS_DllAPI
SqlReaderParticipant(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ std::shared_ptr<ddspipe::core::IReader> BaseReaderParticipant::create_reader(
{
if (!utils::can_cast<ddspipe::core::types::DdsTopic>(topic))
{
logWarning(DDSREPLAYER_MCAP_READER_PARTICIPANT, "Not creating Writer for topic " << topic.topic_name());
logWarning(DDSREPLAYER_SQL_READER_PARTICIPANT, "Not creating Writer for topic " << topic.topic_name());
return std::make_shared<ddspipe::participants::BlankReader>();
}

Expand Down Expand Up @@ -162,7 +162,7 @@ utils::Timestamp BaseReaderParticipant::when_to_start_replay_(

if (time < now)
{
logWarning(DDSREPLAYER_MCAP_READER_PARTICIPANT,
logWarning(DDSREPLAYER_SQL_READER_PARTICIPANT,
"Provided start-replay-time already expired, starting immediately...");
return now;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void SqlReaderParticipant::process_summary(
const auto topic = utils::Heritable<ddspipe::core::types::DdsTopic>::make_heritable(
create_topic_(topic_name, type_name, is_topic_ros2_type));

// Apply the QoS stored in the MCAP file as if they were the discovered QoS.
// Apply the QoS stored in the SQL file as if they were the discovered QoS.
const auto topic_qos_str = reinterpret_cast<const char*>(sqlite3_column_text(stmt, 2));
const auto topic_qos = Serializer::deserialize<ddspipe::core::types::TopicQoS>(topic_qos_str);

Expand All @@ -78,7 +78,7 @@ void SqlReaderParticipant::process_summary(

if (topics_.find(topic_id) != topics_.end())
{
logWarning(DDSREPLAYER_MCAP_READER_PARTICIPANT,
logWarning(DDSREPLAYER_SQL_READER_PARTICIPANT,
"Topic " << topic_name << " with type " << type_name << " already exists. Skipping...");
return;
}
Expand Down Expand Up @@ -149,7 +149,7 @@ void SqlReaderParticipant::process_messages()
// Find the topic
if (topics_.find(topic_id) == topics_.end())
{
logError(DDSREPLAYER_MCAP_READER_PARTICIPANT,
logError(DDSREPLAYER_SQL_READER_PARTICIPANT,
"Failed to find topic " << topic_name << " with type " << type_name << ". "
"Did you process the summary before the messages? Skipping...");
return;
Expand All @@ -160,12 +160,12 @@ void SqlReaderParticipant::process_messages()
// Find the reader for the topic
if (readers_.find(topic) == readers_.end())
{
logError(DDSREPLAYER_MCAP_READER_PARTICIPANT,
logError(DDSREPLAYER_SQL_READER_PARTICIPANT,
"Failed to replay message in topic " << topic << ": topic not found, skipping...");
return;
}

logInfo(DDSREPLAYER_MCAP_READER_PARTICIPANT,
logInfo(DDSREPLAYER_SQL_READER_PARTICIPANT,
"Scheduling message to be replayed in topic " << topic << ".");

// Set publication delay from original log time and configured playback rate
Expand All @@ -186,7 +186,7 @@ void SqlReaderParticipant::process_messages()
// Wait until it's time to write the message
wait_until_timestamp_(time_to_write);

logInfo(DDSREPLAYER_MCAP_READER_PARTICIPANT,
logInfo(DDSREPLAYER_SQL_READER_PARTICIPANT,
"Replaying message in topic " << topic << ".");

// Insert new data in internal reader queue
Expand Down

0 comments on commit f965d89

Please sign in to comment.