commit 1bcd0e7422273cc0fb88021bec5dcbeeed915af7
author Austin Schuh <austin.linux@gmail.com> Wed Aug 26 21:50:45 2020 -0700
committer Austin Schuh <austin.linux@gmail.com> Mon Aug 31 18:28:47 2020 -0700
tree edc7273b287a4a14d11d6035f935198c4c3052af
parent a9a82ea9ab3b996b09cf4bbb0542f0c576cd5f0c

Rename Builder to fbb to be more consistent

All of flatbuffers calls it a "fbb".  No reason to stop now...

Change-Id: I0bd886dd326c6b5022b81dd2addf95a63d777ac9

aos/flatbuffers.h

diff --git a/aos/flatbuffers.h b/aos/flatbuffers.h
index e016770..392a7eb 100644
--- a/aos/flatbuffers.h
+++ b/aos/flatbuffers.h
@@ -263,23 +263,23 @@
 
   void Reset() {
     CHECK(!allocator_.is_allocated()) << ": May not reset while building";
-    builder_ = flatbuffers::FlatBufferBuilder(Size, &allocator_);
-    builder_.ForceDefaults(true);
+    fbb_ = flatbuffers::FlatBufferBuilder(Size, &allocator_);
+    fbb_.ForceDefaults(true);
   }
 
-  flatbuffers::FlatBufferBuilder *Builder() {
+  flatbuffers::FlatBufferBuilder *fbb() {
     CHECK(!allocator_.allocated())
         << ": Array backed flatbuffer can only be built once";
-    builder_ = flatbuffers::FlatBufferBuilder(Size, &allocator_);
-    builder_.ForceDefaults(true);
-    return &builder_;
+    fbb_ = flatbuffers::FlatBufferBuilder(Size, &allocator_);
+    fbb_.ForceDefaults(true);
+    return &fbb_;
   }
 
   void Finish(flatbuffers::Offset<T> root) {
     CHECK(allocator_.allocated()) << ": Cannot finish if not building";
-    builder_.Finish(root);
-    data_ = builder_.GetBufferPointer();
-    size_ = builder_.GetSize();
+    fbb_.Finish(root);
+    data_ = fbb_.GetBufferPointer();
+    size_ = fbb_.GetSize();
     DCHECK_LE(size_, Size);
   }
 
@@ -296,7 +296,7 @@
  private:
   std::array<uint8_t, Size> buffer_;
   PreallocatedAllocator allocator_;
-  flatbuffers::FlatBufferBuilder builder_;
+  flatbuffers::FlatBufferBuilder fbb_;
   uint8_t *data_ = nullptr;
   size_t size_ = 0;
 };
@@ -343,8 +343,6 @@
  private:
   flatbuffers::DetachedBuffer buffer_;
 };
-// TODO(austin): Need a way to get our hands on the max size.  Can start with
-// "large" for now.
 
 }  // namespace aos
 

aos/network/message_bridge_server_lib.cc

diff --git a/aos/network/message_bridge_server_lib.cc b/aos/network/message_bridge_server_lib.cc
index 93e4c90..8a575aa 100644
--- a/aos/network/message_bridge_server_lib.cc
+++ b/aos/network/message_bridge_server_lib.cc
@@ -527,7 +527,7 @@
   // Build up the timestamp message.  Do it here so that we don't have invalid
   // data in it.
   FlatbufferFixedAllocatorArray<Timestamp, 1000> timestamp_copy;
-  flatbuffers::FlatBufferBuilder *fbb = timestamp_copy.Builder();
+  flatbuffers::FlatBufferBuilder *fbb = timestamp_copy.fbb();
 
   if (client_statistics_fetcher_.get()) {
     // Build up the list of client offsets.