Skip to content

Replay: avoid recursion when adding subscriptions #24438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Replay: avoid recursion when adding subscriptions #24438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions src/modules/replay/Replay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,10 +721,6 @@ Replay::nextDataMessage(std::ifstream &file, Subscription &subscription, int msg
}

switch (message_header.msg_type) {
case (int)ULogMessageType::ADD_LOGGED_MSG:
readAndAddSubscription(file, message_header.msg_size);
break;

case (int)ULogMessageType::DATA:
file.read((char *)&file_msg_id, sizeof(file_msg_id));

Expand All @@ -751,6 +747,7 @@ Replay::nextDataMessage(std::ifstream &file, Subscription &subscription, int msg
break;

case (int)ULogMessageType::REMOVE_LOGGED_MSG: //skip these
case (int)ULogMessageType::ADD_LOGGED_MSG:
case (int)ULogMessageType::PARAMETER:
case (int)ULogMessageType::DROPOUT:
case (int)ULogMessageType::INFO:
Expand Down Expand Up @@ -907,19 +904,26 @@ Replay::run()
ulog_message_header_s message_header;
replay_file.seekg(_data_section_start);

//we know the next message must be an ADD_LOGGED_MSG
ReadAndAndAddSubResult res;

do {
while (true) {
//we are in the Definition & Data Section Message Header section
replay_file.read((char *)&message_header, ULOG_MSG_HEADER_LEN);
res = readAndAddSubscription(replay_file, message_header.msg_size);

if (res == ReadAndAndAddSubResult::kFailure) {
PX4_ERR("Failed to read subscription");
return;
if (!replay_file) {
break;
}

} while (res != ReadAndAndAddSubResult::kSuccess);
if (message_header.msg_type == (int)ULogMessageType::ADD_LOGGED_MSG) {
readAndAddSubscription(replay_file, message_header.msg_size);

} else if (message_header.msg_type == (int)ULogMessageType::DATA) {
// End of Definition & Data Section Message Header section
break;

} else {
// Not important for now, skip
replay_file.seekg(message_header.msg_size, ios::cur);
}
}

const uint64_t timestamp_offset = getTimestampOffset();
uint32_t nr_published_messages = 0;
Expand Down
Loading