fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-17 18:37:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor replay: split timestamp offset into separate method

Browse Source
This commit is contained in:
Beat Küng
2017-07-14 09:52:11 +02:00
committed by Lorenz Meier
parent 950273dbcf
commit cef3a29ac9
2 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/replay/replay.hpp
+10
View File
@@ -112,6 +112,16 @@ protected:
int publication_counter = 0;
};
/**
* Find the offset & field size in bytes for a given field name
* @param format format string, as specified by ULog
* @param field_name search for this field
* @param offset returned offset
* @param field_size returned field size
* @return true if found, false otherwise
*/
static bool findFieldOffset(const std::string &format, const std::string &field_name, int &offset, int &field_size);
/**
* publish an orb topic
* @param sub
src/modules/replay/replay_main.cpp
+38 -31
View File
@@ -332,42 +332,18 @@ bool Replay::readAndAddSubscription(std::ifstream &file, uint16_t msg_size)
subscription.multi_id = multi_id;
//find the timestamp offset (not necessarily the first field)
string fields = orb_meta->o_fields;
size_t prev_field_end = 0;
size_t field_end = fields.find(';');
bool timestamp_found = false;
subscription.timestamp_offset = 0;
while (field_end != string::npos && !timestamp_found) {
size_t space_pos = fields.find(' ', prev_field_end);
if (space_pos != string::npos) {
string type_name_full = fields.substr(prev_field_end, space_pos - prev_field_end);
string field_name = fields.substr(space_pos + 1, field_end - space_pos - 1);
if (field_name == "timestamp") {
timestamp_found = true;
if (type_name_full != "uint64_t") {
PX4_ERR("Unsupported timestamp type %s, ignoring the topic %s", type_name_full.c_str(),
orb_meta->o_name);
return true;
}
} else {
subscription.timestamp_offset += sizeOfFullType(type_name_full);
}
}
prev_field_end = field_end + 1;
field_end = fields.find(';', prev_field_end);
}
//find the timestamp offset
int field_size;
bool timestamp_found = findFieldOffset(orb_meta->o_fields, "timestamp", subscription.timestamp_offset, field_size);
if (!timestamp_found) {
return true;
}
if (field_size != 8) {
PX4_ERR("Unsupported timestamp with size %i, ignoring the topic %s", field_size, orb_meta->o_name);
return true;
}
//find first data message (and the timestamp)
streampos cur_pos = file.tellg();
@@ -398,6 +374,37 @@ bool Replay::readAndAddSubscription(std::ifstream &file, uint16_t msg_size)
return true;
}
bool Replay::findFieldOffset(const string &format, const string &field_name, int &offset, int &field_size)
{
size_t prev_field_end = 0;
size_t field_end = format.find(';');
offset = 0;
field_size = 0;
while (field_end != string::npos) {
size_t space_pos = format.find(' ', prev_field_end);
if (space_pos != string::npos) {
string type_name_full = format.substr(prev_field_end, space_pos - prev_field_end);
string cur_field_name = format.substr(space_pos + 1, field_end - space_pos - 1);
if (cur_field_name == field_name) {
field_size = sizeOfFullType(type_name_full);
return true;
} else {
offset += sizeOfFullType(type_name_full);
}
}
prev_field_end = field_end + 1;
field_end = format.find(';', prev_field_end);
}
return false;
}
bool Replay::readAndHandleAdditionalMessages(std::ifstream &file, std::streampos end_position)
{
ulog_message_header_s message_header;