9abf6e2ab0
* WIP. * WIP. * WIP. * WIP. * WIP. * WIP. * Added some missing files. * WIP. * WIP. * Updated upb. * Extension loads, but crashes immediately. * Gets through the test suite without SEGV! Still a lot of bugs to fix, but it is a major step! 214 tests, 378 assertions, 37 failures, 147 errors, 0 pendings, 0 omissions, 0 notifications 14.0187% passed * Test and build for Ruby 3.0 * Fixed a few more bugs, efficient #inspect is almost done. 214 tests, 134243 assertions, 30 failures, 144 errors, 0 pendings, 0 omissions, 0 notifications 18.6916% passed * Fixed message hash initialization and encode depth checking. 214 tests, 124651 assertions, 53 failures, 70 errors, 0 pendings, 0 omissions, 0 notifications 42.5234% passed * A bunch of fixes to failing tests, now 70% passing. 214 tests, 202091 assertions, 41 failures, 23 errors, 0 pendings, 0 omissions, 0 notifications 70.0935% passed * More than 80% of tests are passing now. 214 tests, 322331 assertions, 30 failures, 9 errors, 0 pendings, 0 omissions, 0 notifications 81.7757% passed Unfortunately there is also a sporadic bug/segfault hanging around that appears to be GC-related. * Add linux/ruby30 and macos/ruby30 * Use rvm master for 3.0.0-preview2 * Over 90% of tests are passing! 214 tests, 349898 assertions, 15 failures, 1 errors, 0 pendings, 0 omissions, 0 notifications 92.5234% passed * Passes all tests! 214 tests, 369388 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications 100% passed * A bunch of cleanup. 1. Removed a bunch of internal-only symbols from headers. 2. Required a frozen check to get a non-const pointer to a map or array. 3. De-duplicated the code to get a type argument for Map/RepeatedField. * Removed a bunch more stuff from protobuf.h. There is an intermittent assert failure. Intermittent failure: ruby: ../../../../ext/google/protobuf_c/protobuf.c:263: ObjectCache_Add: Assertion `rb_funcall(obj_cache2, (__builtin_constant_p("[]") ? __extension__ ({ static ID rb_intern_id_cache; if (!rb_intern_id_cache) rb_intern_id_cache = rb_intern2((("[]") ), (long)strlen(("[]"))); (ID) rb_intern_id_cache; }) : rb_intern("[]")), 1, key_rb) == val' failed * Removed a few more things from protobuf.h. * Ruby 3.0.0-preview2 to 3.0.0 * Require rake-compiler-dock >= 1.1.0 * More progress, fighting with the object cache. * Passes on all Ruby versions! * Updated and clarified comment regarding WeakMap. * Fixed the wyhash compile. * Fixed conformance tests for Ruby. Conformance results now look like: RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended --failure_list failure_list_ruby.txt --text_format_failure_list text_format_failure_list_ruby.txt ./conformance_ruby.rb CONFORMANCE TEST BEGIN ==================================== CONFORMANCE SUITE PASSED: 1955 successes, 0 skipped, 58 expected failures, 0 unexpected failures. CONFORMANCE TEST BEGIN ==================================== CONFORMANCE SUITE PASSED: 0 successes, 111 skipped, 8 expected failures, 0 unexpected failures. Fixes include: - Changed Ruby compiler to no longer reject proto2 maps. - Changed Ruby compiler to emit a warning when proto2 extensions are present instead of rejecting the .proto file completely. - Fixed conformance tests to allow proto2 and look up message by name instead of hardcoding a specific list of messages. - Fixed conformance test to support the "ignore unknown" option for JSON. - Fixed conformance test to properly report serialization errors. * Removed debug printf and fixed #inspect for floats. * Fixed compatibility test to have proper semantics for #to_json. * Updated Makefile.am with new file list. * Don't try to copy wyhash when inside Docker. * Fixed bug where we would forget that a sub-object is frozen in Ruby >=2.7. * Avoid exporting unneeded symbols and refactored a bit of code. * Some more refactoring. * Simplified and added more comments. * Some more comments and simplification. Added a missing license block. Co-authored-by: Masaki Hara <hara@wantedly.com>
108 lines
4.1 KiB
C
108 lines
4.1 KiB
C
// Protocol Buffers - Google's data interchange format
|
|
// Copyright 2008 Google Inc. All rights reserved.
|
|
// https://developers.google.com/protocol-buffers/
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are
|
|
// met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following disclaimer
|
|
// in the documentation and/or other materials provided with the
|
|
// distribution.
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
// contributors may be used to endorse or promote products derived from
|
|
// this software without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#ifndef RUBY_PROTOBUF_DEFS_H_
|
|
#define RUBY_PROTOBUF_DEFS_H_
|
|
|
|
#include <ruby/ruby.h>
|
|
|
|
#include "protobuf.h"
|
|
#include "ruby-upb.h"
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// TypeInfo
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// This bundles a upb_fieldtype_t and msgdef/enumdef when appropriate. This is
|
|
// convenient for functions that need type information but cannot necessarily
|
|
// assume a upb_fielddef will be available.
|
|
//
|
|
// For example, Google::Protobuf::Map and Google::Protobuf::RepeatedField can
|
|
// be constructed with type information alone:
|
|
//
|
|
// # RepeatedField will internally store the type information in a TypeInfo.
|
|
// Google::Protobuf::RepeatedField.new(:message, FooMessage)
|
|
|
|
typedef struct {
|
|
upb_fieldtype_t type;
|
|
union {
|
|
const upb_msgdef* msgdef; // When type == UPB_TYPE_MESSAGE
|
|
const upb_enumdef* enumdef; // When type == UPB_TYPE_ENUM
|
|
} def;
|
|
} TypeInfo;
|
|
|
|
static inline TypeInfo TypeInfo_get(const upb_fielddef *f) {
|
|
TypeInfo ret = {upb_fielddef_type(f), {NULL}};
|
|
switch (ret.type) {
|
|
case UPB_TYPE_MESSAGE:
|
|
ret.def.msgdef = upb_fielddef_msgsubdef(f);
|
|
break;
|
|
case UPB_TYPE_ENUM:
|
|
ret.def.enumdef = upb_fielddef_enumsubdef(f);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
TypeInfo TypeInfo_FromClass(int argc, VALUE* argv, int skip_arg,
|
|
VALUE* type_class, VALUE* init_arg);
|
|
|
|
static inline TypeInfo TypeInfo_from_type(upb_fieldtype_t type) {
|
|
TypeInfo ret = {type};
|
|
assert(type != UPB_TYPE_MESSAGE && type != UPB_TYPE_ENUM);
|
|
return ret;
|
|
}
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Other utilities
|
|
// -----------------------------------------------------------------------------
|
|
|
|
VALUE Descriptor_DefToClass(const upb_msgdef *m);
|
|
|
|
// Returns the underlying msgdef, enumdef, or symtab (respectively) for the
|
|
// given Descriptor, EnumDescriptor, or DescriptorPool Ruby object.
|
|
const upb_enumdef *EnumDescriptor_GetEnumDef(VALUE enum_desc_rb);
|
|
const upb_symtab *DescriptorPool_GetSymtab(VALUE desc_pool_rb);
|
|
const upb_msgdef *Descriptor_GetMsgDef(VALUE desc_rb);
|
|
|
|
// Returns a upb field type for the given Ruby symbol
|
|
// (eg. :float => UPB_TYPE_FLOAT).
|
|
upb_fieldtype_t ruby_to_fieldtype(VALUE type);
|
|
|
|
// The singleton generated pool (a DescriptorPool object).
|
|
extern VALUE generated_pool;
|
|
|
|
// Call at startup to register all types in this module.
|
|
void Defs_register(VALUE module);
|
|
|
|
#endif // RUBY_PROTOBUF_DEFS_H_
|