google-protobuf 4.26.0.rc.2-arm64-darwin → 4.26.0.rc.3-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a5a207bb1151224b945a02843300b51460e1b4d1abd5836cc8a4f9fcf78f5be
-  data.tar.gz: adb0a0ecf305278c4bb9d2ec624e9983b370351f110877c60a119a23f6a2d353
+  metadata.gz: 5c404b7c45455b9187002c36936f56ccc02ef7f2e25ce6633446787448e55948
+  data.tar.gz: d61a4f8d65057138d433abeb86103ab0a1881ec1e4248ed8ea43d505a93902bb
 SHA512:
-  metadata.gz: a72e31a6796e0c11e0a38c001ac430cb11c8ec5543bed8df010f1e87ce6ed8a07859ac5e5992e722b8b34586ccdc5d93c0d07d93fca3414b6dcd76467d7b6d17
-  data.tar.gz: 6abdc57f94b6c8c0dc02dae876e479ebf3bb4be7f74f4a960a9bfe73037cb43163bf6ead9febc0b1c38366c361b4b583dcecebeab5bf49cf94a9404f60c2bd34
+  metadata.gz: f70f62f429457a4d4b881c8817203bb43c7cc2cb64566ac34c58fdb10786afefc80824da93d23ba4023aeedc1f41050addedb9ee652502884ce2262af57895f8
+  data.tar.gz: 84662ef86e0cf5191490667c72defbd034a016aec32b9dbc6615273f69dd4f25ba1dbe0145f1f87eefc2e0ffddf0e8c1a268276e0dc809d140f48ea603c9b6b4

data/ext/google/protobuf_c/map.c

@@ -38,9 +38,11 @@ static void Map_mark(void* _self) {
   rb_gc_mark(self->arena);
 }
 
+static size_t Map_memsize(const void* _self) { return sizeof(Map); }
+
 const rb_data_type_t Map_type = {
     "Google::Protobuf::Map",
-    {Map_mark, RUBY_DEFAULT_FREE, NULL},
+    {Map_mark, RUBY_DEFAULT_FREE, Map_memsize},
     .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 

data/ext/google/protobuf_c/message.c

@@ -44,9 +44,11 @@ static void Message_mark(void* _self) {
   rb_gc_mark(self->arena);
 }
 
+static size_t Message_memsize(const void* _self) { return sizeof(Message); }
+
 static rb_data_type_t Message_type = {
     "Google::Protobuf::Message",
-    {Message_mark, RUBY_DEFAULT_FREE, NULL},
+    {Message_mark, RUBY_DEFAULT_FREE, Message_memsize},
     .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
 

data/ext/google/protobuf_c/protobuf.c

@@ -164,11 +164,23 @@ static void Arena_free(void *data) {
   xfree(arena);
 }
 
+static size_t Arena_memsize(const void *data) {
+  const Arena *arena = data;
+  size_t fused_count;
+  size_t memsize = upb_Arena_SpaceAllocated(arena->arena, &fused_count);
+  if (fused_count > 1) {
+    // If other arena were fused we attribute an equal
+    // share of memory usage to each one.
+    memsize /= fused_count;
+  }
+  return memsize + sizeof(Arena);
+}
+
 static VALUE cArena;
 
 const rb_data_type_t Arena_type = {
     "Google::Protobuf::Internal::Arena",
-    {Arena_mark, Arena_free, NULL},
+    {Arena_mark, Arena_free, Arena_memsize},
     .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
 
@@ -241,16 +253,17 @@ static void ObjectCache_Init(VALUE protobuf) {
   item_try_add = rb_intern("try_add");
 
   rb_gc_register_address(&weak_obj_cache);
+  VALUE internal = rb_const_get(protobuf, rb_intern("Internal"));
 #if SIZEOF_LONG >= SIZEOF_VALUE
-  VALUE cache_class = rb_const_get(protobuf, rb_intern("ObjectCache"));
+  VALUE cache_class = rb_const_get(internal, rb_intern("ObjectCache"));
 #else
-  VALUE cache_class = rb_const_get(protobuf, rb_intern("LegacyObjectCache"));
+  VALUE cache_class = rb_const_get(internal, rb_intern("LegacyObjectCache"));
 #endif
 
   weak_obj_cache = rb_class_new_instance(0, NULL, cache_class);
-  rb_const_set(protobuf, rb_intern("OBJECT_CACHE"), weak_obj_cache);
-  rb_const_set(protobuf, rb_intern("SIZEOF_LONG"), INT2NUM(SIZEOF_LONG));
-  rb_const_set(protobuf, rb_intern("SIZEOF_VALUE"), INT2NUM(SIZEOF_VALUE));
+  rb_const_set(internal, rb_intern("OBJECT_CACHE"), weak_obj_cache);
+  rb_const_set(internal, rb_intern("SIZEOF_LONG"), INT2NUM(SIZEOF_LONG));
+  rb_const_set(internal, rb_intern("SIZEOF_VALUE"), INT2NUM(SIZEOF_VALUE));
 }
 
 static VALUE ObjectCache_GetKey(const void *key) {

data/ext/google/protobuf_c/ruby-upb.c

@@ -4085,9 +4085,10 @@ static upb_ArenaRoot _upb_Arena_FindRoot(upb_Arena* a) {
   return (upb_ArenaRoot){.root = ai, .tagged_count = poc};
 }
 
-size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {
+size_t upb_Arena_SpaceAllocated(upb_Arena* arena, size_t* fused_count) {
   upb_ArenaInternal* ai = _upb_Arena_FindRoot(arena).root;
   size_t memsize = 0;
+  size_t local_fused_count = 0;
 
   while (ai != NULL) {
     upb_MemBlock* block = upb_Atomic_Load(&ai->blocks, memory_order_relaxed);
@@ -4096,8 +4097,10 @@ size_t upb_Arena_SpaceAllocated(upb_Arena* arena) {
       block = upb_Atomic_Load(&block->next, memory_order_relaxed);
     }
     ai = upb_Atomic_Load(&ai->next, memory_order_relaxed);
+    local_fused_count++;
   }
 
+  if (fused_count) *fused_count = local_fused_count;
   return memsize;
 }
 

data/ext/google/protobuf_c/ruby-upb.h

@@ -349,7 +349,7 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
 
 // Must be last.
 
-#define _kUpb_Status_MaxMessage 127
+#define _kUpb_Status_MaxMessage 511
 
 typedef struct {
   bool ok;
@@ -780,7 +780,7 @@ UPB_API bool upb_Arena_Fuse(upb_Arena* a, upb_Arena* b);
 bool upb_Arena_IncRefFor(upb_Arena* a, const void* owner);
 void upb_Arena_DecRefFor(upb_Arena* a, const void* owner);
 
-size_t upb_Arena_SpaceAllocated(upb_Arena* a);
+size_t upb_Arena_SpaceAllocated(upb_Arena* a, size_t* fused_count);
 uint32_t upb_Arena_DebugRefCount(upb_Arena* a);
 
 UPB_API_INLINE upb_Arena* upb_Arena_New(void) {

data/lib/google/protobuf/ffi/object_cache.rb

@@ -18,13 +18,13 @@ module Google
 
     def self.cache_implementation
       if interpreter_supports_non_finalized_keys_in_weak_map? and SIZEOF_LONG >= SIZEOF_VALUE
-        Google::Protobuf::ObjectCache
+        Google::Protobuf::Internal::ObjectCache
       else
-        Google::Protobuf::LegacyObjectCache
+        Google::Protobuf::Internal::LegacyObjectCache
       end
     end
 
     public
     OBJECT_CACHE = cache_implementation.new
   end
-end
+end

data/lib/google/protobuf/internal/object_cache.rb

@@ -0,0 +1,99 @@
+# Protocol Buffers - Google's data interchange format
+# Copyright 2023 Google Inc.  All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+module Google
+  module Protobuf
+    module Internal
+      # A pointer -> Ruby Object cache that keeps references to Ruby wrapper
+      # objects.  This allows us to look up any Ruby wrapper object by the address
+      # of the object it is wrapping. That way we can avoid ever creating two
+      # different wrapper objects for the same C object, which saves memory and
+      # preserves object identity.
+      #
+      # We use WeakMap for the cache. If sizeof(long) > sizeof(VALUE), we also
+      # need a secondary Hash to store WeakMap keys, because our pointer keys may
+      # need to be stored as Bignum instead of Fixnum.  Since WeakMap is weak for
+      # both keys and values, a Bignum key will cause the WeakMap entry to be
+      # collected immediately unless there is another reference to the Bignum.
+      # This happens on 64-bit Windows, on which pointers are 64 bits but longs
+      # are 32 bits. In this case, we enable the secondary Hash to hold the keys
+      # and prevent them from being collected.
+      class ObjectCache
+        def initialize
+          @map = ObjectSpace::WeakMap.new
+          @mutex = Mutex.new
+        end
+
+        def get(key)
+          @map[key]
+        end
+
+        def try_add(key, value)
+          @map[key] || @mutex.synchronize do
+            @map[key] ||= value
+          end
+        end
+      end
+
+      class LegacyObjectCache
+        def initialize
+          @secondary_map = {}
+          @map = ObjectSpace::WeakMap.new
+          @mutex = Mutex.new
+        end
+
+        def get(key)
+          value = if secondary_key = @secondary_map[key]
+            @map[secondary_key]
+          else
+            @mutex.synchronize do
+              @map[(@secondary_map[key] ||= Object.new)]
+            end
+          end
+
+          # GC if we could remove at least 2000 entries or 20% of the table size
+          # (whichever is greater).  Since the cost of the GC pass is O(N), we
+          # want to make sure that we condition this on overall table size, to
+          # avoid O(N^2) CPU costs.
+          cutoff = (@secondary_map.size * 0.2).ceil
+          cutoff = 2_000 if cutoff < 2_000
+          if (@secondary_map.size - @map.size) > cutoff
+            purge
+          end
+
+          value
+        end
+
+        def try_add(key, value)
+          if secondary_key = @secondary_map[key]
+            if old_value = @map[secondary_key]
+              return old_value
+            end
+          end
+
+          @mutex.synchronize do
+            secondary_key ||= (@secondary_map[key] ||= Object.new)
+            @map[secondary_key] ||= value
+          end
+        end
+
+        private
+
+        def purge
+          @mutex.synchronize do
+            @secondary_map.each do |key, secondary_key|
+              unless @map.key?(secondary_key)
+                @secondary_map.delete(key)
+              end
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/google/protobuf.rb

@@ -7,7 +7,7 @@
 
 # require mixins before we hook them into the java & c code
 require 'google/protobuf/message_exts'
-require 'google/protobuf/object_cache'
+require 'google/protobuf/internal/object_cache'
 
 # We define these before requiring the platform-specific modules.
 # That way the module init can grab references to these.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 4.26.0.rc.2
+  version: 4.26.0.rc.3
 platform: arm64-darwin
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -158,8 +158,8 @@ files:
 - lib/google/protobuf/ffi/oneof_descriptor.rb
 - lib/google/protobuf/ffi/repeated_field.rb
 - lib/google/protobuf/field_mask_pb.rb
+- lib/google/protobuf/internal/object_cache.rb
 - lib/google/protobuf/message_exts.rb
-- lib/google/protobuf/object_cache.rb
 - lib/google/protobuf/plugin_pb.rb
 - lib/google/protobuf/repeated_field.rb
 - lib/google/protobuf/source_context_pb.rb
@@ -175,7 +175,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.26.0-rc2/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v4.26.0-rc3/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/google/protobuf/object_cache.rb

@@ -1,97 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2023 Google Inc.  All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
-
-module Google
-  module Protobuf
-    # A pointer -> Ruby Object cache that keeps references to Ruby wrapper
-    # objects.  This allows us to look up any Ruby wrapper object by the address
-    # of the object it is wrapping. That way we can avoid ever creating two
-    # different wrapper objects for the same C object, which saves memory and
-    # preserves object identity.
-    #
-    # We use WeakMap for the cache. If sizeof(long) > sizeof(VALUE), we also
-    # need a secondary Hash to store WeakMap keys, because our pointer keys may
-    # need to be stored as Bignum instead of Fixnum.  Since WeakMap is weak for
-    # both keys and values, a Bignum key will cause the WeakMap entry to be
-    # collected immediately unless there is another reference to the Bignum.
-    # This happens on 64-bit Windows, on which pointers are 64 bits but longs
-    # are 32 bits. In this case, we enable the secondary Hash to hold the keys
-    # and prevent them from being collected.
-    class ObjectCache
-      def initialize
-        @map = ObjectSpace::WeakMap.new
-        @mutex = Mutex.new
-      end
-
-      def get(key)
-        @map[key]
-      end
-
-      def try_add(key, value)
-        @map[key] || @mutex.synchronize do
-          @map[key] ||= value
-        end
-      end
-    end
-
-    class LegacyObjectCache
-      def initialize
-        @secondary_map = {}
-        @map = ObjectSpace::WeakMap.new
-        @mutex = Mutex.new
-      end
-
-      def get(key)
-        value = if secondary_key = @secondary_map[key]
-          @map[secondary_key]
-        else
-          @mutex.synchronize do
-            @map[(@secondary_map[key] ||= Object.new)]
-          end
-        end
-
-        # GC if we could remove at least 2000 entries or 20% of the table size
-        # (whichever is greater).  Since the cost of the GC pass is O(N), we
-        # want to make sure that we condition this on overall table size, to
-        # avoid O(N^2) CPU costs.
-        cutoff = (@secondary_map.size * 0.2).ceil
-        cutoff = 2_000 if cutoff < 2_000
-        if (@secondary_map.size - @map.size) > cutoff
-          purge
-        end
-
-        value
-      end
-
-      def try_add(key, value)
-        if secondary_key = @secondary_map[key]
-          if old_value = @map[secondary_key]
-            return old_value
-          end
-        end
-
-        @mutex.synchronize do
-          secondary_key ||= (@secondary_map[key] ||= Object.new)
-          @map[secondary_key] ||= value
-        end
-      end
-
-      private
-
-      def purge
-        @mutex.synchronize do
-          @secondary_map.each do |key, secondary_key|
-            unless @map.key?(secondary_key)
-              @secondary_map.delete(key)
-            end
-          end
-        end
-        nil
-      end
-    end
-  end
-end