mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Don't hang when calling findAllProtoFields on recursive protos.
This commit is contained in:
dg
@@ -10,6 +10,7 @@ message RangeProto {
|
||||
|
||||
extend google.protobuf.FieldOptions {
|
||||
optional string help = 50000;
|
||||
optional bool recurse = 50001 [default = true];
|
||||
}
|
||||
|
||||
enum IndexMode {
|
||||
|
||||
@@ -44,6 +44,6 @@ message OptionProto {
|
||||
optional string name = 1 [(help) = "Option name" ];
|
||||
optional string comment = 2 [(help) = "Help text for option" ];
|
||||
optional string message = 3 [(help) = "Message to display when option is in use" ];
|
||||
optional ConfigProto config = 4 [(help) = "Option data" ];
|
||||
optional ConfigProto config = 4 [(help) = "Option data", (recurse) = false ];
|
||||
}
|
||||
|
||||
|
||||
342
lib/proto.cc
342
lib/proto.cc
@@ -4,229 +4,245 @@
|
||||
#include "fmt/format.h"
|
||||
#include <regex>
|
||||
|
||||
ConfigProto config = []() {
|
||||
ConfigProto config;
|
||||
config.mutable_drive()->set_drive(0);
|
||||
config.mutable_drive()->set_drive(0);
|
||||
return config;
|
||||
ConfigProto config = []()
|
||||
{
|
||||
ConfigProto config;
|
||||
config.mutable_drive()->set_drive(0);
|
||||
config.mutable_drive()->set_drive(0);
|
||||
return config;
|
||||
}();
|
||||
|
||||
static double toDouble(const std::string& value)
|
||||
{
|
||||
size_t idx;
|
||||
double d = std::stod(value, &idx);
|
||||
if (value[idx] != '\0')
|
||||
Error() << fmt::format("invalid number '{}'", value);
|
||||
return d;
|
||||
size_t idx;
|
||||
double d = std::stod(value, &idx);
|
||||
if (value[idx] != '\0')
|
||||
Error() << fmt::format("invalid number '{}'", value);
|
||||
return d;
|
||||
}
|
||||
|
||||
static int64_t toInt64(const std::string& value)
|
||||
{
|
||||
size_t idx;
|
||||
int64_t d = std::stoll(value, &idx);
|
||||
if (value[idx] != '\0')
|
||||
Error() << fmt::format("invalid number '{}'", value);
|
||||
return d;
|
||||
size_t idx;
|
||||
int64_t d = std::stoll(value, &idx);
|
||||
if (value[idx] != '\0')
|
||||
Error() << fmt::format("invalid number '{}'", value);
|
||||
return d;
|
||||
}
|
||||
|
||||
static uint64_t toUint64(const std::string& value)
|
||||
{
|
||||
size_t idx;
|
||||
uint64_t d = std::stoull(value, &idx);
|
||||
if (value[idx] != '\0')
|
||||
Error() << fmt::format("invalid number '{}'", value);
|
||||
return d;
|
||||
size_t idx;
|
||||
uint64_t d = std::stoull(value, &idx);
|
||||
if (value[idx] != '\0')
|
||||
Error() << fmt::format("invalid number '{}'", value);
|
||||
return d;
|
||||
}
|
||||
|
||||
void setRange(RangeProto* range, const std::string& data)
|
||||
{
|
||||
static const std::regex DATA_REGEX("([0-9]+)(?:(?:-([0-9]+))|(?:\\+([0-9]+)))?(?:x([0-9]+))?");
|
||||
static const std::regex DATA_REGEX(
|
||||
"([0-9]+)(?:(?:-([0-9]+))|(?:\\+([0-9]+)))?(?:x([0-9]+))?");
|
||||
|
||||
std::smatch dmatch;
|
||||
if (!std::regex_match(data, dmatch, DATA_REGEX))
|
||||
Error() << "invalid range '" << data << "'";
|
||||
|
||||
int start = std::stoi(dmatch[1]);
|
||||
range->set_start(start);
|
||||
range->set_end(start);
|
||||
range->clear_step();
|
||||
if (!dmatch[2].str().empty())
|
||||
range->set_end(std::stoi(dmatch[2]));
|
||||
if (!dmatch[3].str().empty())
|
||||
range->set_end(std::stoi(dmatch[3]) - range->start());
|
||||
if (!dmatch[4].str().empty())
|
||||
range->set_step(std::stoi(dmatch[4]));
|
||||
std::smatch dmatch;
|
||||
if (!std::regex_match(data, dmatch, DATA_REGEX))
|
||||
Error() << "invalid range '" << data << "'";
|
||||
|
||||
int start = std::stoi(dmatch[1]);
|
||||
range->set_start(start);
|
||||
range->set_end(start);
|
||||
range->clear_step();
|
||||
if (!dmatch[2].str().empty())
|
||||
range->set_end(std::stoi(dmatch[2]));
|
||||
if (!dmatch[3].str().empty())
|
||||
range->set_end(std::stoi(dmatch[3]) - range->start());
|
||||
if (!dmatch[4].str().empty())
|
||||
range->set_step(std::stoi(dmatch[4]));
|
||||
}
|
||||
|
||||
ProtoField resolveProtoPath(google::protobuf::Message* message, const std::string& path)
|
||||
ProtoField resolveProtoPath(
|
||||
google::protobuf::Message* message, const std::string& path)
|
||||
{
|
||||
std::string::size_type dot = path.rfind('.');
|
||||
std::string leading = (dot == std::string::npos) ? "" : path.substr(0, dot);
|
||||
std::string trailing = (dot == std::string::npos) ? path : path.substr(dot+1);
|
||||
std::string::size_type dot = path.rfind('.');
|
||||
std::string leading = (dot == std::string::npos) ? "" : path.substr(0, dot);
|
||||
std::string trailing =
|
||||
(dot == std::string::npos) ? path : path.substr(dot + 1);
|
||||
|
||||
const auto* descriptor = message->GetDescriptor();
|
||||
const auto* descriptor = message->GetDescriptor();
|
||||
|
||||
std::string item;
|
||||
std::string item;
|
||||
std::stringstream ss(leading);
|
||||
while (std::getline(ss, item, '.'))
|
||||
{
|
||||
const auto* field = descriptor->FindFieldByName(item);
|
||||
if (!field)
|
||||
Error() << fmt::format("no such config field '{}' in '{}'", item, path);
|
||||
if (field->type() != google::protobuf::FieldDescriptor::TYPE_MESSAGE)
|
||||
Error() << fmt::format("config field '{}' in '{}' is not a message", item, path);
|
||||
{
|
||||
const auto* field = descriptor->FindFieldByName(item);
|
||||
if (!field)
|
||||
Error() << fmt::format(
|
||||
"no such config field '{}' in '{}'", item, path);
|
||||
if (field->type() != google::protobuf::FieldDescriptor::TYPE_MESSAGE)
|
||||
Error() << fmt::format(
|
||||
"config field '{}' in '{}' is not a message", item, path);
|
||||
|
||||
const auto* reflection = message->GetReflection();
|
||||
switch (field->label())
|
||||
{
|
||||
case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
|
||||
message = reflection->MutableMessage(message, field);
|
||||
break;
|
||||
const auto* reflection = message->GetReflection();
|
||||
switch (field->label())
|
||||
{
|
||||
case google::protobuf::FieldDescriptor::LABEL_OPTIONAL:
|
||||
message = reflection->MutableMessage(message, field);
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::LABEL_REPEATED:
|
||||
if (reflection->FieldSize(*message, field) == 0)
|
||||
message = reflection->AddMessage(message, field);
|
||||
else
|
||||
message = reflection->MutableRepeatedMessage(message, field, 0);
|
||||
break;
|
||||
case google::protobuf::FieldDescriptor::LABEL_REPEATED:
|
||||
if (reflection->FieldSize(*message, field) == 0)
|
||||
message = reflection->AddMessage(message, field);
|
||||
else
|
||||
message =
|
||||
reflection->MutableRepeatedMessage(message, field, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
Error() << "bad proto label " << field->label();
|
||||
}
|
||||
default:
|
||||
Error() << "bad proto label " << field->label();
|
||||
}
|
||||
|
||||
descriptor = message->GetDescriptor();
|
||||
descriptor = message->GetDescriptor();
|
||||
}
|
||||
|
||||
const auto* field = descriptor->FindFieldByName(trailing);
|
||||
if (!field)
|
||||
Error() << fmt::format("no such config field '{}' in '{}'", trailing, path);
|
||||
const auto* field = descriptor->FindFieldByName(trailing);
|
||||
if (!field)
|
||||
Error() << fmt::format(
|
||||
"no such config field '{}' in '{}'", trailing, path);
|
||||
|
||||
return std::make_pair(message, field);
|
||||
return std::make_pair(message, field);
|
||||
}
|
||||
|
||||
void setProtoFieldFromString(ProtoField& protoField, const std::string& value)
|
||||
{
|
||||
google::protobuf::Message* message = protoField.first;
|
||||
const google::protobuf::FieldDescriptor* field = protoField.second;
|
||||
google::protobuf::Message* message = protoField.first;
|
||||
const google::protobuf::FieldDescriptor* field = protoField.second;
|
||||
|
||||
const auto* reflection = message->GetReflection();
|
||||
switch (field->type())
|
||||
{
|
||||
case google::protobuf::FieldDescriptor::TYPE_DOUBLE:
|
||||
reflection->SetDouble(message, field, toDouble(value));
|
||||
break;
|
||||
const auto* reflection = message->GetReflection();
|
||||
switch (field->type())
|
||||
{
|
||||
case google::protobuf::FieldDescriptor::TYPE_DOUBLE:
|
||||
reflection->SetDouble(message, field, toDouble(value));
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_INT32:
|
||||
reflection->SetInt32(message, field, toInt64(value));
|
||||
break;
|
||||
case google::protobuf::FieldDescriptor::TYPE_INT32:
|
||||
reflection->SetInt32(message, field, toInt64(value));
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_INT64:
|
||||
reflection->SetInt64(message, field, toInt64(value));
|
||||
break;
|
||||
case google::protobuf::FieldDescriptor::TYPE_INT64:
|
||||
reflection->SetInt64(message, field, toInt64(value));
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_UINT32:
|
||||
reflection->SetUInt32(message, field, toUint64(value));
|
||||
break;
|
||||
case google::protobuf::FieldDescriptor::TYPE_UINT32:
|
||||
reflection->SetUInt32(message, field, toUint64(value));
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_UINT64:
|
||||
reflection->SetUInt64(message, field, toUint64(value));
|
||||
break;
|
||||
case google::protobuf::FieldDescriptor::TYPE_UINT64:
|
||||
reflection->SetUInt64(message, field, toUint64(value));
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_STRING:
|
||||
reflection->SetString(message, field, value);
|
||||
break;
|
||||
case google::protobuf::FieldDescriptor::TYPE_STRING:
|
||||
reflection->SetString(message, field, value);
|
||||
break;
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_BOOL:
|
||||
{
|
||||
static const std::map<std::string, bool> boolvalues = {
|
||||
{ "false", false },
|
||||
{ "f", false },
|
||||
{ "no", false },
|
||||
{ "n", false },
|
||||
{ "0", false },
|
||||
{ "true", true },
|
||||
{ "t", true },
|
||||
{ "yes", true },
|
||||
{ "y", true },
|
||||
{ "1", true },
|
||||
};
|
||||
case google::protobuf::FieldDescriptor::TYPE_BOOL:
|
||||
{
|
||||
static const std::map<std::string, bool> boolvalues = {
|
||||
{"false", false},
|
||||
{"f", false},
|
||||
{"no", false},
|
||||
{"n", false},
|
||||
{"0", false},
|
||||
{"true", true },
|
||||
{"t", true },
|
||||
{"yes", true },
|
||||
{"y", true },
|
||||
{"1", true },
|
||||
};
|
||||
|
||||
const auto& it = boolvalues.find(value);
|
||||
if (it == boolvalues.end())
|
||||
Error() << "invalid boolean value";
|
||||
reflection->SetBool(message, field, it->second);
|
||||
break;
|
||||
}
|
||||
const auto& it = boolvalues.find(value);
|
||||
if (it == boolvalues.end())
|
||||
Error() << "invalid boolean value";
|
||||
reflection->SetBool(message, field, it->second);
|
||||
break;
|
||||
}
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_ENUM:
|
||||
{
|
||||
const auto* enumfield = field->enum_type();
|
||||
const auto* enumvalue = enumfield->FindValueByName(value);
|
||||
if (!enumvalue)
|
||||
Error() << fmt::format("unrecognised enum value '{}'", value);
|
||||
case google::protobuf::FieldDescriptor::TYPE_ENUM:
|
||||
{
|
||||
const auto* enumfield = field->enum_type();
|
||||
const auto* enumvalue = enumfield->FindValueByName(value);
|
||||
if (!enumvalue)
|
||||
Error() << fmt::format("unrecognised enum value '{}'", value);
|
||||
|
||||
reflection->SetEnum(message, field, enumvalue);
|
||||
break;
|
||||
}
|
||||
reflection->SetEnum(message, field, enumvalue);
|
||||
break;
|
||||
}
|
||||
|
||||
case google::protobuf::FieldDescriptor::TYPE_MESSAGE:
|
||||
if (field->message_type() == RangeProto::descriptor())
|
||||
{
|
||||
setRange((RangeProto*)reflection->MutableMessage(message, field), value);
|
||||
break;
|
||||
}
|
||||
if (field->containing_oneof() && value.empty())
|
||||
{
|
||||
reflection->MutableMessage(message, field);
|
||||
break;
|
||||
}
|
||||
/* fall through */
|
||||
default:
|
||||
Error() << "can't set this config value type";
|
||||
}
|
||||
case google::protobuf::FieldDescriptor::TYPE_MESSAGE:
|
||||
if (field->message_type() == RangeProto::descriptor())
|
||||
{
|
||||
setRange(
|
||||
(RangeProto*)reflection->MutableMessage(message, field),
|
||||
value);
|
||||
break;
|
||||
}
|
||||
if (field->containing_oneof() && value.empty())
|
||||
{
|
||||
reflection->MutableMessage(message, field);
|
||||
break;
|
||||
}
|
||||
/* fall through */
|
||||
default:
|
||||
Error() << "can't set this config value type";
|
||||
}
|
||||
}
|
||||
|
||||
void setProtoByString(google::protobuf::Message* message, const std::string& path, const std::string& value)
|
||||
void setProtoByString(google::protobuf::Message* message,
|
||||
const std::string& path,
|
||||
const std::string& value)
|
||||
{
|
||||
ProtoField protoField = resolveProtoPath(message, path);
|
||||
setProtoFieldFromString(protoField, value);
|
||||
ProtoField protoField = resolveProtoPath(message, path);
|
||||
setProtoFieldFromString(protoField, value);
|
||||
}
|
||||
|
||||
std::set<unsigned> iterate(const RangeProto& range)
|
||||
{
|
||||
std::set<unsigned> set;
|
||||
int end = range.has_end()? range.end() : range.start();
|
||||
for (unsigned i=range.start(); i<=end; i+=range.step())
|
||||
set.insert(i);
|
||||
return set;
|
||||
std::set<unsigned> set;
|
||||
int end = range.has_end() ? range.end() : range.start();
|
||||
for (unsigned i = range.start(); i <= end; i += range.step())
|
||||
set.insert(i);
|
||||
return set;
|
||||
}
|
||||
|
||||
std::set<unsigned> iterate(unsigned start, unsigned count)
|
||||
{
|
||||
std::set<unsigned> set;
|
||||
for (unsigned i=0; i<count; i++)
|
||||
set.insert(start + i);
|
||||
return set;
|
||||
std::set<unsigned> set;
|
||||
for (unsigned i = 0; i < count; i++)
|
||||
set.insert(start + i);
|
||||
return set;
|
||||
}
|
||||
|
||||
std::map<std::string, const google::protobuf::FieldDescriptor*> findAllProtoFields(google::protobuf::Message* message)
|
||||
std::map<std::string, const google::protobuf::FieldDescriptor*>
|
||||
findAllProtoFields(google::protobuf::Message* message)
|
||||
{
|
||||
std::map<std::string, const google::protobuf::FieldDescriptor*> fields;
|
||||
const auto* descriptor = message->GetDescriptor();
|
||||
std::map<std::string, const google::protobuf::FieldDescriptor*> fields;
|
||||
const auto* descriptor = message->GetDescriptor();
|
||||
|
||||
std::function<void(const google::protobuf::Descriptor*, const std::string&)> recurse =
|
||||
[&](auto* d, const auto& s) {
|
||||
for (int i=0; i<d->field_count(); i++)
|
||||
{
|
||||
const google::protobuf::FieldDescriptor* f = d->field(i);
|
||||
std::string n = s + f->name();
|
||||
if (f->type() == google::protobuf::FieldDescriptor::TYPE_MESSAGE)
|
||||
recurse(f->message_type(), n + ".");
|
||||
fields[n] = f;
|
||||
}
|
||||
};
|
||||
std::function<void(const google::protobuf::Descriptor*, const std::string&)>
|
||||
recurse = [&](auto* d, const auto& s)
|
||||
{
|
||||
for (int i = 0; i < d->field_count(); i++)
|
||||
{
|
||||
const google::protobuf::FieldDescriptor* f = d->field(i);
|
||||
std::string n = s + f->name();
|
||||
|
||||
recurse(descriptor, "");
|
||||
return fields;
|
||||
if (f->options().GetExtension(::recurse) &&
|
||||
(f->type() == google::protobuf::FieldDescriptor::TYPE_MESSAGE))
|
||||
recurse(f->message_type(), n + ".");
|
||||
|
||||
fields[n] = f;
|
||||
}
|
||||
};
|
||||
|
||||
recurse(descriptor, "");
|
||||
return fields;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user