Before there was a single code generator that generated both .upb and .upbdefs, even though they are generated by different rules. This worked fine as long as the codegen steps were sandboxed, but if not it led to build errors. Fixes https://github.com/protocolbuffers/upb/issues/354.pull/13171/head
Joshua Haberman
4 years ago
parent
b10b02f66f
commit
7a54a5f3d6
8 changed files with 393 additions and 312 deletions
@ -0,0 +1,65 @@ |
||||
|
||||
#include "absl/strings/str_replace.h" |
||||
#include "upbc/common.h" |
||||
|
||||
namespace upbc { |
||||
namespace { |
||||
|
||||
namespace protobuf = ::google::protobuf; |
||||
|
||||
void AddMessages(const protobuf::Descriptor* message, |
||||
std::vector<const protobuf::Descriptor*>* messages) { |
||||
messages->push_back(message); |
||||
for (int i = 0; i < message->nested_type_count(); i++) { |
||||
AddMessages(message->nested_type(i), messages); |
||||
} |
||||
} |
||||
|
||||
} // namespace
|
||||
|
||||
std::string StripExtension(absl::string_view fname) { |
||||
size_t lastdot = fname.find_last_of("."); |
||||
if (lastdot == std::string::npos) { |
||||
return std::string(fname); |
||||
} |
||||
return std::string(fname.substr(0, lastdot)); |
||||
} |
||||
|
||||
std::string ToCIdent(absl::string_view str) { |
||||
return absl::StrReplaceAll(str, {{".", "_"}, {"/", "_"}}); |
||||
} |
||||
|
||||
std::string ToPreproc(absl::string_view str) { |
||||
return absl::AsciiStrToUpper(ToCIdent(str)); |
||||
} |
||||
|
||||
void EmitFileWarning(const protobuf::FileDescriptor* file, Output& output) { |
||||
output( |
||||
"/* This file was generated by upbc (the upb compiler) from the input\n" |
||||
" * file:\n" |
||||
" *\n" |
||||
" * $0\n" |
||||
" *\n" |
||||
" * Do not edit -- your changes will be discarded when the file is\n" |
||||
" * regenerated. */\n\n", |
||||
file->name()); |
||||
} |
||||
|
||||
std::vector<const protobuf::Descriptor*> SortedMessages( |
||||
const protobuf::FileDescriptor* file) { |
||||
std::vector<const protobuf::Descriptor*> messages; |
||||
for (int i = 0; i < file->message_type_count(); i++) { |
||||
AddMessages(file->message_type(i), &messages); |
||||
} |
||||
return messages; |
||||
} |
||||
|
||||
std::string MessageName(const protobuf::Descriptor* descriptor) { |
||||
return ToCIdent(descriptor->full_name()); |
||||
} |
||||
|
||||
std::string MessageInit(const protobuf::Descriptor* descriptor) { |
||||
return MessageName(descriptor) + "_msginit"; |
||||
} |
||||
|
||||
} // namespace upbc
|
||||
@ -0,0 +1,66 @@ |
||||
|
||||
#ifndef UPBC_COMMON_H |
||||
#define UPBC_COMMON_H |
||||
|
||||
#include <vector> |
||||
|
||||
#include "absl/strings/substitute.h" |
||||
#include "google/protobuf/descriptor.h" |
||||
#include "google/protobuf/io/zero_copy_stream.h" |
||||
|
||||
namespace upbc { |
||||
|
||||
class Output { |
||||
public: |
||||
Output(google::protobuf::io::ZeroCopyOutputStream* stream) |
||||
: stream_(stream) {} |
||||
~Output() { stream_->BackUp((int)size_); } |
||||
|
||||
template <class... Arg> |
||||
void operator()(absl::string_view format, const Arg&... arg) { |
||||
Write(absl::Substitute(format, arg...)); |
||||
} |
||||
|
||||
private: |
||||
void Write(absl::string_view data) { |
||||
while (!data.empty()) { |
||||
RefreshOutput(); |
||||
size_t to_write = std::min(data.size(), size_); |
||||
memcpy(ptr_, data.data(), to_write); |
||||
data.remove_prefix(to_write); |
||||
ptr_ += to_write; |
||||
size_ -= to_write; |
||||
} |
||||
} |
||||
|
||||
void RefreshOutput() { |
||||
while (size_ == 0) { |
||||
void *ptr; |
||||
int size; |
||||
if (!stream_->Next(&ptr, &size)) { |
||||
fprintf(stderr, "upbc: Failed to write to to output\n"); |
||||
abort(); |
||||
} |
||||
ptr_ = static_cast<char*>(ptr); |
||||
size_ = size; |
||||
} |
||||
} |
||||
|
||||
google::protobuf::io::ZeroCopyOutputStream* stream_; |
||||
char *ptr_ = nullptr; |
||||
size_t size_ = 0; |
||||
}; |
||||
|
||||
std::string StripExtension(absl::string_view fname); |
||||
std::string ToCIdent(absl::string_view str); |
||||
std::string ToPreproc(absl::string_view str); |
||||
void EmitFileWarning(const google::protobuf::FileDescriptor* file, |
||||
Output& output); |
||||
std::vector<const google::protobuf::Descriptor*> SortedMessages( |
||||
const google::protobuf::FileDescriptor* file); |
||||
std::string MessageInit(const google::protobuf::Descriptor* descriptor); |
||||
std::string MessageName(const google::protobuf::Descriptor* descriptor); |
||||
|
||||
} // namespace upbc
|
||||
|
||||
# endif // UPBC_COMMON_H
|
||||
@ -1,12 +0,0 @@ |
||||
|
||||
#ifndef UPBC_GENERATOR_H_ |
||||
#define UPBC_GENERATOR_H_ |
||||
|
||||
#include <memory> |
||||
#include <google/protobuf/compiler/code_generator.h> |
||||
|
||||
namespace upbc { |
||||
std::unique_ptr<google::protobuf::compiler::CodeGenerator> GetGenerator(); |
||||
} |
||||
|
||||
#endif // UPBC_GENERATOR_H_
|
||||
@ -1,9 +0,0 @@ |
||||
|
||||
#include "google/protobuf/compiler/plugin.h" |
||||
|
||||
#include "upbc/generator.h" |
||||
|
||||
int main(int argc, char** argv) { |
||||
return google::protobuf::compiler::PluginMain(argc, argv, |
||||
upbc::GetGenerator().get()); |
||||
} |
||||
@ -0,0 +1,183 @@ |
||||
|
||||
#include <memory> |
||||
|
||||
#include "google/protobuf/compiler/code_generator.h" |
||||
#include "google/protobuf/compiler/plugin.h" |
||||
#include "google/protobuf/descriptor.h" |
||||
#include "google/protobuf/descriptor.pb.h" |
||||
#include "upbc/common.h" |
||||
|
||||
namespace upbc { |
||||
namespace { |
||||
|
||||
namespace protoc = ::google::protobuf::compiler; |
||||
namespace protobuf = ::google::protobuf; |
||||
|
||||
std::string DefInitSymbol(const protobuf::FileDescriptor *file) { |
||||
return ToCIdent(file->name()) + "_upbdefinit"; |
||||
} |
||||
|
||||
static std::string DefHeaderFilename(std::string proto_filename) { |
||||
return StripExtension(proto_filename) + ".upbdefs.h"; |
||||
} |
||||
|
||||
static std::string DefSourceFilename(std::string proto_filename) { |
||||
return StripExtension(proto_filename) + ".upbdefs.c"; |
||||
} |
||||
|
||||
void GenerateMessageDefAccessor(const protobuf::Descriptor* d, Output& output) { |
||||
output("UPB_INLINE const upb_msgdef *$0_getmsgdef(upb_symtab *s) {\n", |
||||
ToCIdent(d->full_name())); |
||||
output(" _upb_symtab_loaddefinit(s, &$0);\n", DefInitSymbol(d->file())); |
||||
output(" return upb_symtab_lookupmsg(s, \"$0\");\n", d->full_name()); |
||||
output("}\n"); |
||||
output("\n"); |
||||
|
||||
for (int i = 0; i < d->nested_type_count(); i++) { |
||||
GenerateMessageDefAccessor(d->nested_type(i), output); |
||||
} |
||||
} |
||||
|
||||
void WriteDefHeader(const protobuf::FileDescriptor* file, Output& output) { |
||||
EmitFileWarning(file, output); |
||||
|
||||
output( |
||||
"#ifndef $0_UPBDEFS_H_\n" |
||||
"#define $0_UPBDEFS_H_\n\n" |
||||
"#include \"upb/def.h\"\n" |
||||
"#include \"upb/port_def.inc\"\n" |
||||
"#ifdef __cplusplus\n" |
||||
"extern \"C\" {\n" |
||||
"#endif\n\n", |
||||
ToPreproc(file->name())); |
||||
|
||||
output("#include \"upb/def.h\"\n"); |
||||
output("\n"); |
||||
output("#include \"upb/port_def.inc\"\n"); |
||||
output("\n"); |
||||
|
||||
output("extern upb_def_init $0;\n", DefInitSymbol(file)); |
||||
output("\n"); |
||||
|
||||
for (int i = 0; i < file->message_type_count(); i++) { |
||||
GenerateMessageDefAccessor(file->message_type(i), output); |
||||
} |
||||
|
||||
output( |
||||
"#ifdef __cplusplus\n" |
||||
"} /* extern \"C\" */\n" |
||||
"#endif\n" |
||||
"\n" |
||||
"#include \"upb/port_undef.inc\"\n" |
||||
"\n" |
||||
"#endif /* $0_UPBDEFS_H_ */\n", |
||||
ToPreproc(file->name())); |
||||
} |
||||
|
||||
|
||||
void WriteDefSource(const protobuf::FileDescriptor* file, Output& output) { |
||||
EmitFileWarning(file, output); |
||||
|
||||
output("#include \"upb/def.h\"\n"); |
||||
output("#include \"$0\"\n", DefHeaderFilename(file->name())); |
||||
output("\n"); |
||||
|
||||
for (int i = 0; i < file->dependency_count(); i++) { |
||||
output("extern upb_def_init $0;\n", DefInitSymbol(file->dependency(i))); |
||||
} |
||||
|
||||
std::vector<const protobuf::Descriptor*> file_messages = |
||||
SortedMessages(file); |
||||
|
||||
for (auto message : file_messages) { |
||||
output("extern const upb_msglayout $0;\n", MessageInit(message)); |
||||
} |
||||
output("\n"); |
||||
|
||||
if (!file_messages.empty()) { |
||||
output("static const upb_msglayout *layouts[$0] = {\n", file_messages.size()); |
||||
for (auto message : file_messages) { |
||||
output(" &$0,\n", MessageInit(message)); |
||||
} |
||||
output("};\n"); |
||||
output("\n"); |
||||
} |
||||
|
||||
protobuf::FileDescriptorProto file_proto; |
||||
file->CopyTo(&file_proto); |
||||
std::string file_data; |
||||
file_proto.SerializeToString(&file_data); |
||||
|
||||
output("static const char descriptor[$0] = {", file_data.size()); |
||||
|
||||
// C90 only guarantees that strings can be up to 509 characters, and some
|
||||
// implementations have limits here (for example, MSVC only allows 64k:
|
||||
// https://docs.microsoft.com/en-us/cpp/error-messages/compiler-errors-1/fatal-error-c1091.
|
||||
// So we always emit an array instead of a string.
|
||||
for (size_t i = 0; i < file_data.size();) { |
||||
for (size_t j = 0; j < 25 && i < file_data.size(); ++i, ++j) { |
||||
output("'$0', ", absl::CEscape(file_data.substr(i, 1))); |
||||
} |
||||
output("\n"); |
||||
} |
||||
output("};\n\n"); |
||||
|
||||
output("static upb_def_init *deps[$0] = {\n", file->dependency_count() + 1); |
||||
for (int i = 0; i < file->dependency_count(); i++) { |
||||
output(" &$0,\n", DefInitSymbol(file->dependency(i))); |
||||
} |
||||
output(" NULL\n"); |
||||
output("};\n"); |
||||
output("\n"); |
||||
|
||||
output("upb_def_init $0 = {\n", DefInitSymbol(file)); |
||||
output(" deps,\n"); |
||||
if (file_messages.empty()) { |
||||
output(" NULL,\n"); |
||||
} else { |
||||
output(" layouts,\n"); |
||||
} |
||||
output(" \"$0\",\n", file->name()); |
||||
output(" UPB_STRVIEW_INIT(descriptor, $0)\n", file_data.size()); |
||||
output("};\n"); |
||||
} |
||||
|
||||
class Generator : public protoc::CodeGenerator { |
||||
~Generator() override {} |
||||
bool Generate(const protobuf::FileDescriptor* file, |
||||
const std::string& parameter, protoc::GeneratorContext* context, |
||||
std::string* error) const override; |
||||
uint64_t GetSupportedFeatures() const override { |
||||
return FEATURE_PROTO3_OPTIONAL; |
||||
} |
||||
}; |
||||
|
||||
bool Generator::Generate(const protobuf::FileDescriptor* file, |
||||
const std::string& parameter, |
||||
protoc::GeneratorContext* context, |
||||
std::string* error) const { |
||||
std::vector<std::pair<std::string, std::string>> params; |
||||
google::protobuf::compiler::ParseGeneratorParameter(parameter, ¶ms); |
||||
|
||||
for (const auto& pair : params) { |
||||
*error = "Unknown parameter: " + pair.first; |
||||
return false; |
||||
} |
||||
|
||||
Output h_def_output(context->Open(DefHeaderFilename(file->name()))); |
||||
WriteDefHeader(file, h_def_output); |
||||
|
||||
Output c_def_output(context->Open(DefSourceFilename(file->name()))); |
||||
WriteDefSource(file, c_def_output); |
||||
|
||||
return true; |
||||
} |
||||
|
||||
} // namespace
|
||||
} // namespace upbc
|
||||
|
||||
int main(int argc, char** argv) { |
||||
std::unique_ptr<google::protobuf::compiler::CodeGenerator> generator( |
||||
new upbc::Generator()); |
||||
return google::protobuf::compiler::PluginMain(argc, argv, generator.get()); |
||||
} |
||||
Loading…
Reference in new issue