rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logging of live data structs was: data points #3614 

handling request past end of fragments
This commit is contained in:
rusefillc 2022-04-13 23:31:32 -04:00
parent 57df620087
commit 44ed81fce0
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/console/binary/FragmentEntry.cpp
View File

@ -11,11 +11,13 @@
/**
* copy dataLength of fragmented outputs starting at dataOffset into destination starting at zero
*/
void copyRange(uint8_t *destination, FragmentEntry *fragments, size_t dataOffset, size_t dataLength) {
void copyRange(uint8_t *destination,
FragmentEntry *fragments, int fragmentsCount,
size_t dataOffset, size_t dataLength) {
int fragmentIndex = 0;
// scroll to starting fragment
while (dataOffset > fragments[fragmentIndex].size) {
while (dataOffset > fragments[fragmentIndex].size && fragmentIndex <= fragmentsCount) {
dataOffset -= fragments[fragmentIndex].size;
fragmentIndex ++;
}
@ -23,9 +25,16 @@ void copyRange(uint8_t *destination, FragmentEntry *fragments, size_t dataOffset
int destinationIndex = 0;
while (dataLength > 0) {
if (fragmentIndex > fragmentsCount) {
// somehow we are past the end of fragments - fill with zeros
memset(destination + destinationIndex, 0, dataLength);
return;
}
int copyNowSize = minI(dataLength, fragments[fragmentIndex].size - dataOffset);
const uint8_t *fromBase = fragments[fragmentIndex].data;
if (fromBase == nullptr) {
// we have no buffer for this fragment - fill with zeroes
memset(destination + destinationIndex, 0, copyNowSize);
} else {
memcpy(destination + destinationIndex, fromBase + dataOffset, copyNowSize);

4
firmware/console/binary/FragmentEntry.h
View File

@ -24,4 +24,6 @@ struct FragmentEntry {
}
};
void copyRange(uint8_t *destination, FragmentEntry *fragments, size_t dataOffset, size_t dataLength);
void copyRange(uint8_t *destination,
FragmentEntry *fragments, int fragmentsCount,
size_t dataOffset, size_t dataLength);

14
unit_tests/tests/test_scattered_outputs.cpp
View File

@ -11,22 +11,30 @@ static FragmentEntry fragments[] = {
};
TEST(outputs, fragments) {
ASSERT_EQ(3, efi::size(fragments));
uint8_t buffer[120];
{
uint8_t expected[] = {9, 10, 11, 12, 13};
copyRange(buffer, fragments, 8, 5);
copyRange(buffer, fragments, efi::size(fragments), 8, 5);
EXPECT_TRUE( 0 == std::memcmp(buffer, expected, sizeof(expected)));
}
{
uint8_t expected[] = {13, 14, 15};
copyRange(buffer, fragments, 12, 3);
copyRange(buffer, fragments, efi::size(fragments), 12, 3);
EXPECT_TRUE( 0 == std::memcmp(buffer, expected, sizeof(expected)));
}
{
uint8_t expected[] = {15, 0, 0};
copyRange(buffer, fragments, 14, 3);
copyRange(buffer, fragments, efi::size(fragments), 14, 3);
EXPECT_TRUE( 0 == std::memcmp(buffer, expected, sizeof(expected)));
}
{
uint8_t expected[] = {0, 0, 0};
copyRange(buffer, fragments, efi::size(fragments), 114, 3);
EXPECT_TRUE( 0 == std::memcmp(buffer, expected, sizeof(expected)));
}
}