zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

DataFlash: factor out validate_structure

mission-4.1.18
Peter Barker 7 years ago committed by Francisco Ferreira
parent
8d7000db2c
commit
5070628230
2 changed files with 88 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 162
      libraries/DataFlash/DataFlash.cpp
  2. 4
      libraries/DataFlash/DataFlash.h

162
libraries/DataFlash/DataFlash.cpp
Unescape View File

@ -204,102 +204,108 @@ void DataFlash_Class::dump_structures(const struct LogStructure *logstructures, @@ -204,102 +204,108 @@ void DataFlash_Class::dump_structures(const struct LogStructure *logstructures,
#endif
}
void DataFlash_Class::validate_structures(const struct LogStructure *logstructures, const uint8_t num_types)
bool DataFlash_Class::validate_structure(const struct LogStructure *logstructure, const int16_t offset)
{
Debug("Validating structures");
bool passed = true;
bool seen_ids[256] = { };
for (uint16_t i=0; i<num_types; i++) {
const struct LogStructure *logstructure = &logstructures[i];
#if DEBUG_LOG_STRUCTURES
Debug("offset=%d ID=%d NAME=%s\n", i, logstructure->msg_type, logstructure->name);
Debug("offset=%d ID=%d NAME=%s\n", i, logstructure->msg_type, logstructure->name);
#endif
// names must be null-terminated
if (logstructure->name[4] != '\0') {
Debug("Message name not NULL-terminated");
passed = false;
}
// names must be null-terminated
if (logstructure->name[4] != '\0') {
Debug("Message name not NULL-terminated");
passed = false;
}
// ensure each message ID is only used once
if (seen_ids[logstructure->msg_type]) {
Debug("ID %d used twice (LogStructure offset=%d)", logstructure->msg_type, i);
passed = false;
}
seen_ids[logstructure->msg_type] = true;
// ensure we have enough labels to cover columns
uint8_t fieldcount = strlen(logstructure->format);
uint8_t labelcount = count_commas(logstructure->labels)+1;
if (fieldcount != labelcount) {
Debug("fieldcount=%u does not match labelcount=%u",
fieldcount, labelcount);
passed = false;
}
// ensure each message ID is only used once
if (seen_ids[logstructure->msg_type]) {
Debug("ID %d used twice (LogStructure offset=%d)", logstructure->msg_type, offset);
passed = false;
}
seen_ids[logstructure->msg_type] = true;
// check that the structure is of an appropriate length to take fields
const int16_t msg_len = Log_Write_calc_msg_len(logstructure->format);
if (msg_len != logstructure->msg_len) {
Debug("Calculated message length for (%s) based on format field (%s) does not match structure size (%d != %u)", logstructure->name, logstructure->format, msg_len, logstructure->msg_len);
passed = false;
}
// ensure we have enough labels to cover columns
uint8_t fieldcount = strlen(logstructure->format);
uint8_t labelcount = count_commas(logstructure->labels)+1;
if (fieldcount != labelcount) {
Debug("fieldcount=%u does not match labelcount=%u",
fieldcount, labelcount);
passed = false;
}
// ensure we have units for each field:
if (strlen(logstructure->units) != fieldcount) {
Debug("fieldcount=%u does not match unitcount=%lu",
fieldcount, strlen(logstructure->units));
passed = false;
}
// check that the structure is of an appropriate length to take fields
const int16_t msg_len = Log_Write_calc_msg_len(logstructure->format);
if (msg_len != logstructure->msg_len) {
Debug("Calculated message length for (%s) based on format field (%s) does not match structure size (%d != %u)", logstructure->name, logstructure->format, msg_len, logstructure->msg_len);
passed = false;
}
// ensure we have multipliers for each field
if (strlen(logstructure->multipliers) != fieldcount) {
Debug("fieldcount=%u does not match multipliercount=%lu",
fieldcount, strlen(logstructure->multipliers));
passed = false;
}
// ensure we have units for each field:
if (strlen(logstructure->units) != fieldcount) {
Debug("fieldcount=%u does not match unitcount=%lu",
fieldcount, strlen(logstructure->units));
passed = false;
}
// ensure the FMTU messages reference valid units
for (uint8_t j=0; j<strlen(logstructure->units); j++) {
char logunit = logstructure->units[j];
uint8_t k;
for (k=0; k<_num_units; k++) {
if (logunit == _units[k].ID) {
// found this one
break;
}
}
if (k == _num_units) {
Debug("invalid unit=%c", logunit);
passed = false;
// ensure we have multipliers for each field
if (strlen(logstructure->multipliers) != fieldcount) {
Debug("fieldcount=%u does not match multipliercount=%lu",
fieldcount, strlen(logstructure->multipliers));
passed = false;
}
// ensure the FMTU messages reference valid units
for (uint8_t j=0; j<strlen(logstructure->units); j++) {
char logunit = logstructure->units[j];
uint8_t k;
for (k=0; k<_num_units; k++) {
if (logunit == _units[k].ID) {
// found this one
break;
}
}
if (k == _num_units) {
Debug("invalid unit=%c", logunit);
passed = false;
}
}
// ensure the FMTU messages reference valid units
for (uint8_t j=0; j<strlen(logstructure->multipliers); j++) {
char logmultiplier = logstructure->multipliers[j];
uint8_t k;
for (k=0; k<_num_multipliers; k++) {
if (logmultiplier == '-') {
// no sensible multiplier
break;
}
if (logmultiplier == '?') {
// currently unknown multiplier....
break;
}
if (logmultiplier == _multipliers[k].ID) {
// found this one
break;
}
// ensure the FMTU messages reference valid units
for (uint8_t j=0; j<strlen(logstructure->multipliers); j++) {
char logmultiplier = logstructure->multipliers[j];
uint8_t k;
for (k=0; k<_num_multipliers; k++) {
if (logmultiplier == '-') {
// no sensible multiplier
break;
}
if (k == _num_multipliers) {
Debug("invalid multiplier=%c", logmultiplier);
passed = false;
if (logmultiplier == '?') {
// currently unknown multiplier....
break;
}
if (logmultiplier == _multipliers[k].ID) {
// found this one
break;
}
}
if (k == _num_multipliers) {
Debug("invalid multiplier=%c", logmultiplier);
passed = false;
}
}
return passed;
}
void DataFlash_Class::validate_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
Debug("Validating structures");
bool passed = true;
for (uint16_t i=0; i<num_types; i++) {
const struct LogStructure *logstructure = &logstructures[i];
passed = validate_structure(logstructure, i) && passed;
}
if (!passed) {
Debug("Log structures are invalid");
abort();

4
libraries/DataFlash/DataFlash.h
Unescape View File

@ -319,11 +319,15 @@ private: @@ -319,11 +319,15 @@ private:
private:
static DataFlash_Class *_instance;
bool validate_structure(const struct LogStructure *logstructure, int16_t offset);
void validate_structures(const struct LogStructure *logstructures, const uint8_t num_types);
void dump_structure_field(const struct LogStructure *logstructure, const char *label, const uint8_t fieldnum);
void dump_structures(const struct LogStructure *logstructures, const uint8_t num_types);
const char* unit_name(const uint8_t unit_id);
double multiplier_name(const uint8_t multiplier_id);
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
bool seen_ids[256] = { };
#endif
void Log_Write_EKF_Timing(const char *name, uint64_t time_us, const struct ekf_timing &timing);

Write Preview
Loading…
Cancel
Save