Stop stripping the size prefix off
This turns out to be super dangerous to do. A flatbuffer is aligned
assuming that the size is either there or not there. By removing it,
you break alignment.
This necesitates having 2 subclasses of Flatbuffer. A SizePrefixed
version and a non size prefixed version. That lets us distinguish for
methods which care.
Once all that's done, deal with the fallout through the code base,
including logfile_utils and the chaos that causes rippling out.
Change-Id: I91b7be355279a1c19e5c956c33359df01a17eacf
diff --git a/aos/events/logging/logfile_utils_test.cc b/aos/events/logging/logfile_utils_test.cc
index 3644419..14d1de7 100644
--- a/aos/events/logging/logfile_utils_test.cc
+++ b/aos/events/logging/logfile_utils_test.cc
@@ -39,15 +39,15 @@
{
DetachedBufferWriter writer(logfile, std::make_unique<DummyEncoder>());
- writer.QueueSpan(m1.full_span());
- writer.QueueSpan(m2.full_span());
+ writer.QueueSpan(m1.span());
+ writer.QueueSpan(m2.span());
}
SpanReader reader(logfile);
EXPECT_EQ(reader.filename(), logfile);
- EXPECT_EQ(reader.ReadMessage(), m1.full_span());
- EXPECT_EQ(reader.ReadMessage(), m2.full_span());
+ EXPECT_EQ(reader.ReadMessage(), m1.span());
+ EXPECT_EQ(reader.ReadMessage(), m2.span());
EXPECT_EQ(reader.ReadMessage(), absl::Span<const uint8_t>());
}
@@ -69,9 +69,9 @@
{
DetachedBufferWriter writer(logfile, std::make_unique<DummyEncoder>());
- writer.QueueSpan(config.full_span());
- writer.QueueSpan(m1.full_span());
- writer.QueueSpan(m2.full_span());
+ writer.QueueSpan(config.span());
+ writer.QueueSpan(m1.span());
+ writer.QueueSpan(m2.span());
}
MessageReader reader(logfile);
@@ -117,10 +117,10 @@
{
DetachedBufferWriter writer(logfile0, std::make_unique<DummyEncoder>());
- writer.QueueSpan(config0.full_span());
- writer.QueueSpan(m1.full_span());
- writer.QueueSpan(m2.full_span());
- writer.QueueSpan(m3.full_span());
+ writer.QueueSpan(config0.span());
+ writer.QueueSpan(m1.span());
+ writer.QueueSpan(m2.span());
+ writer.QueueSpan(m3.span());
}
const std::vector<LogFile> parts = SortParts({logfile0});
@@ -168,13 +168,13 @@
{
DetachedBufferWriter writer(logfile0, std::make_unique<DummyEncoder>());
- writer.QueueSpan(config0.full_span());
- writer.QueueSpan(m1.full_span());
+ writer.QueueSpan(config0.span());
+ writer.QueueSpan(m1.span());
}
{
DetachedBufferWriter writer(logfile1, std::make_unique<DummyEncoder>());
- writer.QueueSpan(config1.full_span());
- writer.QueueSpan(m2.full_span());
+ writer.QueueSpan(config1.span());
+ writer.QueueSpan(m2.span());
}
const std::vector<LogFile> parts = SortParts({logfile0, logfile1});