mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-01 19:58:15 +00:00
* First working hack of adding 64-bit. Don't judge :) * Made vector_downward work on 64 bit types * vector_downward uses size_t, added offset64 to reflection * cleaned up adding offset64 in parser * Add C++ testing skeleton for 64-bit * working test for CreateVector64 * working >2 GiB buffers * support for large strings * simplified CreateString<> to just provide the offset type * generalize CreateVector template * update test_64.afb due to upstream format change * Added Vector64 type, which is just an alias for vector ATM * Switch to Offset64 for Vector64 * Update for reflection bfbs output change * Starting to add support for vector64 type in C++ * made a generic CreateVector that can handle different offsets and vector types * Support for 32-vector with 64-addressing * Vector64 basic builder + tests working * basic support for json vector64 support * renamed fields in test_64bit.fbs to better reflect their use * working C++ vector64 builder * Apply --annotate-sparse-vector to 64-bit tests * Enable Vector64 for --annotate-sparse-vectors * Merged from upstream * Add `near_string` field for testing 32-bit offsets alongside * keep track of where the 32-bit and 64-bit regions are for flatbufferbuilder * move template<> outside class body for GCC * update run.sh to build and run tests * basic assertion for adding 64-bit offset at the wrong time * started to separate `FlatBufferBuilder` into two classes, 1 64-bit aware, the other not * add test for nested flatbuffer vector64, fix bug in alignment of big vectors * fixed CreateDirect method by iterating by Offset64 first * internal refactoring of flatbufferbuilder * block not supported languages in the parser from using 64-bit * evolution tests for adding a vector64 field * conformity tests for adding/removing offset64 attributes * ensure test is for a big buffer * add parser error tests for `offset64` and `vector64` attributes * add missing static that GCC only complains about * remove stdint-uintn.h header that gets automatically added * move 64-bit CalculateOffset internal * fixed return size of EndVector * various fixes on windows * add SizeT to vector_downward * minimze range of size changes in vector and builder * reworked how tracking if 64-offsets are added * Add ReturnT to EndVector * small cleanups * remove need for second Array definition * combine IndirectHelpers into one definition * started support for vector of struct * Support for 32/64-vectors of structs + Offset64 * small cleanups * add verification for vector64 * add sized prefix for 64-bit buffers * add fuzzer for 64-bit * add example of adding many vectors using a wrapper table * run the new -bfbs-gen-embed logic on the 64-bit tests * remove run.sh and fix cmakelist issue * fixed bazel rules * fixed some PR comments * add 64-bit tests to cmakelist
151 lines
5.2 KiB
C++
151 lines
5.2 KiB
C++
#include "test_builder.h"
|
|
|
|
#include "flatbuffers/flatbuffer_builder.h"
|
|
#include "flatbuffers/stl_emulation.h"
|
|
#include "monster_test_generated.h"
|
|
|
|
using namespace MyGame::Example;
|
|
using namespace flatbuffers;
|
|
|
|
struct OwnedAllocator : public DefaultAllocator {};
|
|
|
|
class TestHeapBuilder : public FlatBufferBuilder {
|
|
private:
|
|
TestHeapBuilder(const TestHeapBuilder &);
|
|
TestHeapBuilder &operator=(const TestHeapBuilder &);
|
|
|
|
public:
|
|
TestHeapBuilder()
|
|
: FlatBufferBuilder(2048, new OwnedAllocator(), true) {}
|
|
|
|
TestHeapBuilder(TestHeapBuilder &&other)
|
|
: FlatBufferBuilder(std::move(other)) {}
|
|
|
|
TestHeapBuilder &operator=(TestHeapBuilder &&other) {
|
|
FlatBufferBuilder::operator=(std::move(other));
|
|
return *this;
|
|
}
|
|
};
|
|
|
|
// This class simulates flatbuffers::grpc::detail::SliceAllocatorMember
|
|
struct AllocatorMember {
|
|
flatbuffers::DefaultAllocator member_allocator_;
|
|
};
|
|
|
|
struct GrpcLikeMessageBuilder : private AllocatorMember,
|
|
public FlatBufferBuilder {
|
|
private:
|
|
GrpcLikeMessageBuilder(const GrpcLikeMessageBuilder &);
|
|
GrpcLikeMessageBuilder &operator=(const GrpcLikeMessageBuilder &);
|
|
|
|
public:
|
|
GrpcLikeMessageBuilder()
|
|
: FlatBufferBuilder(1024, &member_allocator_, false) {}
|
|
|
|
GrpcLikeMessageBuilder(GrpcLikeMessageBuilder &&other)
|
|
: FlatBufferBuilder(1024, &member_allocator_, false) {
|
|
// Default construct and swap idiom.
|
|
Swap(other);
|
|
}
|
|
|
|
GrpcLikeMessageBuilder &operator=(GrpcLikeMessageBuilder &&other) {
|
|
// Construct temporary and swap idiom
|
|
GrpcLikeMessageBuilder temp(std::move(other));
|
|
Swap(temp);
|
|
return *this;
|
|
}
|
|
|
|
void Swap(GrpcLikeMessageBuilder &other) {
|
|
// No need to swap member_allocator_ because it's stateless.
|
|
FlatBufferBuilder::Swap(other);
|
|
// After swapping the FlatBufferBuilder, we swap back the allocator, which
|
|
// restores the original allocator back in place. This is necessary because
|
|
// MessageBuilder's allocator is its own member (SliceAllocatorMember). The
|
|
// allocator passed to FlatBufferBuilder::vector_downward must point to this
|
|
// member.
|
|
buf_.swap_allocator(other.buf_);
|
|
}
|
|
};
|
|
|
|
flatbuffers::Offset<Monster> populate1(
|
|
flatbuffers::FlatBufferBuilder &builder) {
|
|
auto name_offset = builder.CreateString(m1_name());
|
|
return CreateMonster(builder, nullptr, 0, 0, name_offset, 0, m1_color());
|
|
}
|
|
|
|
flatbuffers::Offset<Monster> populate2(
|
|
flatbuffers::FlatBufferBuilder &builder) {
|
|
auto name_offset = builder.CreateString(m2_name());
|
|
return CreateMonster(builder, nullptr, 0, 0, name_offset, 0, m2_color());
|
|
}
|
|
|
|
uint8_t *release_raw_base(flatbuffers::FlatBufferBuilder &fbb, size_t &size,
|
|
size_t &offset) {
|
|
return fbb.ReleaseRaw(size, offset);
|
|
}
|
|
|
|
void free_raw(flatbuffers::grpc::MessageBuilder &, uint8_t *) {
|
|
// release_raw_base calls FlatBufferBuilder::ReleaseRaw on the argument
|
|
// MessageBuilder. It's semantically wrong as MessageBuilder has its own
|
|
// ReleaseRaw member function that takes three arguments. In such cases
|
|
// though, ~MessageBuilder() invokes ~SliceAllocator() that takes care of
|
|
// deleting memory as it calls grpc_slice_unref. Obviously, this behavior is
|
|
// very surprising as the pointer returned by FlatBufferBuilder::ReleaseRaw is
|
|
// not valid as soon as MessageBuilder goes out of scope. This problem does
|
|
// not occur with FlatBufferBuilder.
|
|
}
|
|
|
|
void free_raw(flatbuffers::FlatBufferBuilder &, uint8_t *buf) {
|
|
flatbuffers::DefaultAllocator().deallocate(buf, 0);
|
|
}
|
|
|
|
bool verify(const flatbuffers::DetachedBuffer &buf,
|
|
const std::string &expected_name, Color color) {
|
|
const Monster *monster = flatbuffers::GetRoot<Monster>(buf.data());
|
|
return (monster->name()->str() == expected_name) &&
|
|
(monster->color() == color);
|
|
}
|
|
|
|
bool verify(const uint8_t *buf, size_t offset, const std::string &expected_name,
|
|
Color color) {
|
|
const Monster *monster = flatbuffers::GetRoot<Monster>(buf + offset);
|
|
return (monster->name()->str() == expected_name) &&
|
|
(monster->color() == color);
|
|
}
|
|
|
|
bool release_n_verify(flatbuffers::FlatBufferBuilder &fbb,
|
|
const std::string &expected_name, Color color) {
|
|
flatbuffers::DetachedBuffer buf = fbb.Release();
|
|
return verify(buf, expected_name, color);
|
|
}
|
|
|
|
// forward-declared in test.cpp
|
|
void FlatBufferBuilderTest();
|
|
|
|
void FlatBufferBuilderTest() {
|
|
using flatbuffers::FlatBufferBuilder;
|
|
|
|
BuilderTests<FlatBufferBuilder>::all_tests();
|
|
BuilderTests<TestHeapBuilder>::all_tests();
|
|
BuilderTests<GrpcLikeMessageBuilder>::all_tests();
|
|
|
|
BuilderReuseTestSelector tests[4] = {
|
|
REUSABLE_AFTER_RELEASE, REUSABLE_AFTER_RELEASE_RAW,
|
|
REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN,
|
|
REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN
|
|
};
|
|
|
|
BuilderReuseTests<FlatBufferBuilder, FlatBufferBuilder>::run_tests(
|
|
TestSelector(tests, tests + 4));
|
|
BuilderReuseTests<TestHeapBuilder, TestHeapBuilder>::run_tests(
|
|
TestSelector(tests, tests + 4));
|
|
BuilderReuseTests<GrpcLikeMessageBuilder, GrpcLikeMessageBuilder>::run_tests(
|
|
TestSelector(tests, tests + 4));
|
|
}
|
|
|
|
// forward-declared in test_builder.h
|
|
void CheckTestGeneratedIsValid(const MyGame::Example::Color&);
|
|
|
|
// Link-time check using pointer type.
|
|
void CheckTestGeneratedIsValid(const MyGame::Example::Color &) {}
|