Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed upb dependencies on absl/log.

Browse Source 
absl/log is not yet released in any ABSL LTS.

PiperOrigin-RevId: 503575398
pull/13171/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent a780ffae65
commit a1abf835d2
7 changed files with 46 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      protos_generator/BUILD
  2. 26
      protos_generator/gen_utils.cc
  3. 4
      protos_generator/output.h
  4. 5
      upbc/BUILD
  5. 17
      upbc/plugin.h
  6. 8
      upbc/protoc-gen-upb.cc
  7. 39
      upbc/subprocess.cc

3
protos_generator/BUILD
Unescape View File

@ -70,9 +70,10 @@ cc_library(
"//upbc:keywords", "//upbc:keywords",
"//upbc:names", "//upbc:names",
"//upbc:plugin", "//upbc:plugin",
"@com_google_absl//absl/base:log_severity",
"@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/log:absl_log",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
"@com_google_protobuf//:protobuf", "@com_google_protobuf//:protobuf",
"@com_google_protobuf//src/google/protobuf/compiler:code_generator", "@com_google_protobuf//src/google/protobuf/compiler:code_generator",

26
protos_generator/gen_utils.cc
Unescape View File

@ -29,32 +29,18 @@
#include <string> #include <string>
#include "absl/log/absl_check.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
// begin:google_only // begin:google_only
// #include "absl/strings/str_replace.h" // #include "absl/strings/str_replace.h"
// end:google_only // end:google_only
#include "absl/strings/str_split.h" #include "absl/strings/str_split.h"
#include "upbc/keywords.h" #include "upbc/keywords.h"
#include "upbc/plugin.h"
namespace protos_generator { namespace protos_generator {
namespace protobuf = ::google::protobuf; namespace protobuf = ::google::protobuf;
// begin:github_only
#ifndef DCHECK
#ifndef NDEBUG
#define DCHECK(condition) \
if (!(condition)) { \
upbc::LogFatal("Failed DCHECK: ", #condition, "File: ", __FILE__, \
", Line: ", __LINE__); \
}
#else
#define DCHECK(condition) if(!(true || condition)) ;
#endif
#endif
// end:github_only
std::string DotsToColons(const std::string& name) { std::string DotsToColons(const std::string& name) {
return absl::StrReplaceAll(name, {{".", "::"}}); return absl::StrReplaceAll(name, {{".", "::"}});
} }
@ -166,7 +152,7 @@ std::string CppTypeInternal(const protobuf::FieldDescriptor* field,
case protobuf::FieldDescriptor::CPPTYPE_STRING: case protobuf::FieldDescriptor::CPPTYPE_STRING:
return "absl::string_view"; return "absl::string_view";
default: default:
upbc::LogFatal("Unexpected type: ", field->cpp_type()); ABSL_LOG(FATAL) << "Unexpected type: " << field->cpp_type();
} }
} }
@ -182,14 +168,14 @@ std::string CppTypeParameterName(const protobuf::FieldDescriptor* field) {
std::string MessageBaseType(const protobuf::FieldDescriptor* field, std::string MessageBaseType(const protobuf::FieldDescriptor* field,
bool is_const) { bool is_const) {
DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE); ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
std::string maybe_const = is_const ? "const " : ""; std::string maybe_const = is_const ? "const " : "";
return maybe_const + QualifiedClassName(field->message_type()); return maybe_const + QualifiedClassName(field->message_type());
} }
std::string MessagePtrConstType(const protobuf::FieldDescriptor* field, std::string MessagePtrConstType(const protobuf::FieldDescriptor* field,
bool is_const) { bool is_const) {
DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE); ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
std::string maybe_const = is_const ? "const " : ""; std::string maybe_const = is_const ? "const " : "";
return "::protos::Ptr<" + maybe_const + return "::protos::Ptr<" + maybe_const +
QualifiedClassName(field->message_type()) + ">"; QualifiedClassName(field->message_type()) + ">";
@ -197,7 +183,7 @@ std::string MessagePtrConstType(const protobuf::FieldDescriptor* field,
std::string MessageCProxyType(const protobuf::FieldDescriptor* field, std::string MessageCProxyType(const protobuf::FieldDescriptor* field,
bool is_const) { bool is_const) {
DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE); ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
std::string maybe_const = is_const ? "const " : ""; std::string maybe_const = is_const ? "const " : "";
return maybe_const + QualifiedInternalClassName(field->message_type()) + return maybe_const + QualifiedInternalClassName(field->message_type()) +
"CProxy"; "CProxy";
@ -205,7 +191,7 @@ std::string MessageCProxyType(const protobuf::FieldDescriptor* field,
std::string MessageProxyType(const protobuf::FieldDescriptor* field, std::string MessageProxyType(const protobuf::FieldDescriptor* field,
bool is_const) { bool is_const) {
DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE); ABSL_DCHECK(field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE);
std::string maybe_const = is_const ? "const " : ""; std::string maybe_const = is_const ? "const " : "";
return maybe_const + QualifiedInternalClassName(field->message_type()) + return maybe_const + QualifiedInternalClassName(field->message_type()) +
"Proxy"; "Proxy";

4
protos_generator/output.h
Unescape View File

@ -30,11 +30,11 @@
#include <vector> #include <vector>
#include "absl/log/absl_log.h"
#include "absl/strings/str_replace.h" #include "absl/strings/str_replace.h"
#include "absl/strings/substitute.h" #include "absl/strings/substitute.h"
#include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.h"
#include "google/protobuf/io/zero_copy_stream.h" #include "google/protobuf/io/zero_copy_stream.h"
#include "upbc/plugin.h"
namespace protos_generator { namespace protos_generator {
@ -57,7 +57,7 @@ class Output {
void Outdent() { Outdent(kIndentationSize); } void Outdent() { Outdent(kIndentationSize); }
void Outdent(size_t size) { void Outdent(size_t size) {
if (indent_ < size) { if (indent_ < size) {
upbc::LogFatal("mismatched Output indent/unindent calls"); ABSL_LOG(FATAL) << "mismatched Output indent/unindent calls";
} }
indent_ -= size; indent_ -= size;
} }

5
upbc/BUILD
Unescape View File

@ -178,6 +178,8 @@ bootstrap_cc_library(
deps = [ deps = [
"//:port", "//:port",
"@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/log:absl_log",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
], ],
) )
@ -250,6 +252,8 @@ bootstrap_cc_binary(
"//:wire_types", "//:wire_types",
"@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/log:absl_log",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
], ],
) )
@ -293,6 +297,7 @@ cc_binary(
":plugin_upb_proto", ":plugin_upb_proto",
":upbdev", ":upbdev",
"//:port", "//:port",
"@com_google_absl//absl/log:absl_log",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",
], ],
) )

17
upbc/plugin.h
Unescape View File

@ -45,6 +45,7 @@
// end:github_only // end:github_only
#include "absl/container/flat_hash_set.h" #include "absl/container/flat_hash_set.h"
#include "absl/log/absl_log.h"
#include "absl/strings/str_split.h" #include "absl/strings/str_split.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "upb/reflection/def.hpp" #include "upb/reflection/def.hpp"
@ -71,12 +72,6 @@ inline std::vector<std::pair<std::string, std::string>> ParseGeneratorParameter(
return ret; return ret;
} }
template <class... Arg>
void LogFatal(const Arg&... arg) {
fprintf(stderr, "FATAL ERROR: %s\n", absl::StrCat(arg...).c_str());
exit(1);
}
class Plugin { class Plugin {
public: public:
Plugin() { ReadRequest(); } Plugin() { ReadRequest(); }
@ -118,8 +113,8 @@ class Plugin {
if (!file) { if (!file) {
absl::string_view name = absl::string_view name =
ToStringView(UPB_DESC(FileDescriptorProto_name)(file_proto)); ToStringView(UPB_DESC(FileDescriptorProto_name)(file_proto));
LogFatal("Couldn't add file ", name, ABSL_LOG(FATAL) << "Couldn't add file " << name
" to DefPool: ", status.error_message()); << " to DefPool: " << status.error_message();
} }
if (generate) func(file); if (generate) func(file);
}); });
@ -174,7 +169,7 @@ class Plugin {
request_ = UPB_DESC(compiler_CodeGeneratorRequest_parse)( request_ = UPB_DESC(compiler_CodeGeneratorRequest_parse)(
data.data(), data.size(), arena_.ptr()); data.data(), data.size(), arena_.ptr());
if (!request_) { if (!request_) {
LogFatal("Failed to parse CodeGeneratorRequest"); ABSL_LOG(FATAL) << "Failed to parse CodeGeneratorRequest";
} }
response_ = UPB_DESC(compiler_CodeGeneratorResponse_new)(arena_.ptr()); response_ = UPB_DESC(compiler_CodeGeneratorResponse_new)(arena_.ptr());
UPB_DESC(compiler_CodeGeneratorResponse_set_supported_features) UPB_DESC(compiler_CodeGeneratorResponse_set_supported_features)
@ -187,11 +182,11 @@ class Plugin {
char* serialized = UPB_DESC(compiler_CodeGeneratorResponse_serialize)( char* serialized = UPB_DESC(compiler_CodeGeneratorResponse_serialize)(
response_, arena_.ptr(), &size); response_, arena_.ptr(), &size);
if (!serialized) { if (!serialized) {
LogFatal("Failed to serialize CodeGeneratorResponse"); ABSL_LOG(FATAL) << "Failed to serialize CodeGeneratorResponse";
} }
if (fwrite(serialized, 1, size, stdout) != size) { if (fwrite(serialized, 1, size, stdout) != size) {
LogFatal("Failed to write response to stdout"); ABSL_LOG(FATAL) << "Failed to write response to stdout";
} }
} }
}; };

8
upbc/protoc-gen-upb.cc
Unescape View File

@ -43,6 +43,8 @@
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/container/flat_hash_set.h" #include "absl/container/flat_hash_set.h"
#include "absl/log/absl_check.h"
#include "absl/log/absl_log.h"
#include "absl/strings/escaping.h" #include "absl/strings/escaping.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/strings/substitute.h" #include "absl/strings/substitute.h"
@ -1259,7 +1261,7 @@ std::string FieldInitializer(upb::FieldDefPtr field,
const upb_MiniTableField* field32, const upb_MiniTableField* field32,
const Options& options) { const Options& options) {
if (options.bootstrap) { if (options.bootstrap) {
if (field.is_extension()) LogFatal("Should not be an extension"); ABSL_CHECK(!field.is_extension());
return absl::Substitute( return absl::Substitute(
"*upb_MiniTable_FindFieldByNumber($0, $1)", "*upb_MiniTable_FindFieldByNumber($0, $1)",
MessageMiniTableRef(field.containing_type(), options), field.number()); MessageMiniTableRef(field.containing_type(), options), field.number());
@ -1679,8 +1681,8 @@ int main(int argc, char** argv) {
if (!file) { if (!file) {
absl::string_view name = absl::string_view name =
upbc::ToStringView(UPB_DESC(FileDescriptorProto_name)(file_proto)); upbc::ToStringView(UPB_DESC(FileDescriptorProto_name)(file_proto));
upbc::LogFatal("Couldn't add file ", name, ABSL_LOG(FATAL) << "Couldn't add file " << name
" to DefPool: ", status.error_message()); << " to DefPool: " << status.error_message();
} }
if (generate) GenerateFile(pools, file, options, &plugin); if (generate) GenerateFile(pools, file, options, &plugin);
}); });

39
upbc/subprocess.cc
Unescape View File

@ -41,6 +41,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#include "absl/log/absl_log.h"
#include "absl/strings/substitute.h" #include "absl/strings/substitute.h"
// Must be last. // Must be last.
@ -62,8 +63,8 @@ char* portable_strdup(const char* s) {
static void CloseHandleOrDie(HANDLE handle) { static void CloseHandleOrDie(HANDLE handle) {
if (!CloseHandle(handle)) { if (!CloseHandle(handle)) {
GOOGLE_LOG(FATAL) << "CloseHandle: " ABSL_LOG(FATAL) << "CloseHandle: "
<< Subprocess::Win32ErrorMessage(GetLastError()); << Subprocess::Win32ErrorMessage(GetLastError());
} }
} }
@ -90,22 +91,22 @@ void Subprocess::Start(const std::string& program, SearchMode search_mode) {
HANDLE stdout_pipe_write; HANDLE stdout_pipe_write;
if (!CreatePipe(&stdin_pipe_read, &stdin_pipe_write, nullptr, 0)) { if (!CreatePipe(&stdin_pipe_read, &stdin_pipe_write, nullptr, 0)) {
GOOGLE_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError()); ABSL_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError());
} }
if (!CreatePipe(&stdout_pipe_read, &stdout_pipe_write, nullptr, 0)) { if (!CreatePipe(&stdout_pipe_read, &stdout_pipe_write, nullptr, 0)) {
GOOGLE_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError()); ABSL_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError());
} }
// Make child side of the pipes inheritable. // Make child side of the pipes inheritable.
if (!SetHandleInformation(stdin_pipe_read, HANDLE_FLAG_INHERIT, if (!SetHandleInformation(stdin_pipe_read, HANDLE_FLAG_INHERIT,
HANDLE_FLAG_INHERIT)) { HANDLE_FLAG_INHERIT)) {
GOOGLE_LOG(FATAL) << "SetHandleInformation: " ABSL_LOG(FATAL) << "SetHandleInformation: "
<< Win32ErrorMessage(GetLastError()); << Win32ErrorMessage(GetLastError());
} }
if (!SetHandleInformation(stdout_pipe_write, HANDLE_FLAG_INHERIT, if (!SetHandleInformation(stdout_pipe_write, HANDLE_FLAG_INHERIT,
HANDLE_FLAG_INHERIT)) { HANDLE_FLAG_INHERIT)) {
GOOGLE_LOG(FATAL) << "SetHandleInformation: " ABSL_LOG(FATAL) << "SetHandleInformation: "
<< Win32ErrorMessage(GetLastError()); << Win32ErrorMessage(GetLastError());
} }
// Setup STARTUPINFO to redirect handles. // Setup STARTUPINFO to redirect handles.
@ -118,7 +119,7 @@ void Subprocess::Start(const std::string& program, SearchMode search_mode) {
startup_info.hStdError = GetStdHandle(STD_ERROR_HANDLE); startup_info.hStdError = GetStdHandle(STD_ERROR_HANDLE);
if (startup_info.hStdError == INVALID_HANDLE_VALUE) { if (startup_info.hStdError == INVALID_HANDLE_VALUE) {
GOOGLE_LOG(FATAL) << "GetStdHandle: " << Win32ErrorMessage(GetLastError()); ABSL_LOG(FATAL) << "GetStdHandle: " << Win32ErrorMessage(GetLastError());
} }
// Invoking cmd.exe allows for '.bat' files from the path as well as '.exe'. // Invoking cmd.exe allows for '.bat' files from the path as well as '.exe'.
@ -184,11 +185,11 @@ bool Subprocess::Communicate(const std::string& input_data,
wait_result < WAIT_OBJECT_0 + handle_count) { wait_result < WAIT_OBJECT_0 + handle_count) {
signaled_handle = handles[wait_result - WAIT_OBJECT_0]; signaled_handle = handles[wait_result - WAIT_OBJECT_0];
} else if (wait_result == WAIT_FAILED) { } else if (wait_result == WAIT_FAILED) {
GOOGLE_LOG(FATAL) << "WaitForMultipleObjects: " ABSL_LOG(FATAL) << "WaitForMultipleObjects: "
<< Win32ErrorMessage(GetLastError()); << Win32ErrorMessage(GetLastError());
} else { } else {
GOOGLE_LOG(FATAL) << "WaitForMultipleObjects: Unexpected return code: " ABSL_LOG(FATAL) << "WaitForMultipleObjects: Unexpected return code: "
<< wait_result; << wait_result;
} }
if (signaled_handle == child_stdin_) { if (signaled_handle == child_stdin_) {
@ -231,17 +232,17 @@ bool Subprocess::Communicate(const std::string& input_data,
DWORD wait_result = WaitForSingleObject(child_handle_, INFINITE); DWORD wait_result = WaitForSingleObject(child_handle_, INFINITE);
if (wait_result == WAIT_FAILED) { if (wait_result == WAIT_FAILED) {
GOOGLE_LOG(FATAL) << "WaitForSingleObject: " ABSL_LOG(FATAL) << "WaitForSingleObject: "
<< Win32ErrorMessage(GetLastError()); << Win32ErrorMessage(GetLastError());
} else if (wait_result != WAIT_OBJECT_0) { } else if (wait_result != WAIT_OBJECT_0) {
GOOGLE_LOG(FATAL) << "WaitForSingleObject: Unexpected return code: " ABSL_LOG(FATAL) << "WaitForSingleObject: Unexpected return code: "
<< wait_result; << wait_result;
} }
DWORD exit_code; DWORD exit_code;
if (!GetExitCodeProcess(child_handle_, &exit_code)) { if (!GetExitCodeProcess(child_handle_, &exit_code)) {
GOOGLE_LOG(FATAL) << "GetExitCodeProcess: " ABSL_LOG(FATAL) << "GetExitCodeProcess: "
<< Win32ErrorMessage(GetLastError()); << Win32ErrorMessage(GetLastError());
} }
CloseHandleOrDie(child_handle_); CloseHandleOrDie(child_handle_);

Write Preview
Loading…
Cancel
Save