Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] ProtobufMessageDatabase: Fix out-of-order Add() rebuild (#5845)

Browse Source
This commit is contained in:
Peter Johnson
2023-10-29 16:50:01 -07:00
committed by GitHub
parent 35472f5fc9
commit 1713386869
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wpiutil/src/main/native/cpp/protobuf/ProtobufMessageDatabase.cpp
View File

@@ -15,6 +15,7 @@ using google::protobuf::Message;
bool ProtobufMessageDatabase::Add(std::string_view filename,
std::span<const uint8_t> data) {
auto& file = m_files[filename];
bool needsRebuild = false;
if (file.complete) {
file.complete = false;
@@ -27,14 +28,8 @@ bool ProtobufMessageDatabase::Add(std::string_view filename,
for (auto&& p : m_files) {
p.second.inPool = false;
}
for (auto&& p : m_files) {
if (p.second.complete && !p.second.inPool) {
Rebuild(p.second);
}
}
// clear messages and reset factory; Find() will recreate as needed
m_factory = std::make_unique<google::protobuf::DynamicMessageFactory>();
needsRebuild = true;
}
if (!file.proto) {
@@ -54,6 +49,19 @@ bool ProtobufMessageDatabase::Add(std::string_view filename,
return false;
}
// rebuild if necessary; we do this after the parse due to dependencies
if (needsRebuild) {
for (auto&& p : m_files) {
if (p.second.complete && !p.second.inPool) {
Rebuild(p.second);
}
}
// clear messages and reset factory; Find() will recreate as needed
m_factory = std::make_unique<google::protobuf::DynamicMessageFactory>();
}
// build this one
Build(filename, file);
return true;
}
@@ -118,5 +126,6 @@ bool ProtobufMessageDatabase::Rebuild(ProtoFile& file) {
return false;
}
file.inPool = true;
file.complete = true;
return true;
}