google-protobuf 3.15.6-universal-darwin → 3.15.7-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of google-protobuf might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ee885a1fbd5c4c8e311d5a82044df0c6a881b4966f79b5d1e2304e9916c7be95
4
- data.tar.gz: c8d288a8da9dd1670989a541da4078cc4afc9a3e5ef671b206d30cdbb851fa6b
3
+ metadata.gz: f50bee471113e94946442f3e1409d31992f565635aac0c9c3dbee0a5998efe66
4
+ data.tar.gz: 24437f453b0cefcaf902190b02783a6bd7d42a0f01ffa2ac2cfcb5f60576ff1f
5
5
  SHA512:
6
- metadata.gz: 852e5a15f16615819176e4650440f7b959ed7e370366267b8af4589549c9eeecf47ecbdea94591ca18ec5d690efb076dc8d4c346571a90d68097f8630336b573
7
- data.tar.gz: 71b21cd635287ccf424aa34ea32907eee2ba721ef5d9a52b3cc7ab9b19f0d302b3bec7240a65b14f65806ee393bdca5d4c24d4e5c7da057250732bd7c9c29214
6
+ metadata.gz: 06315ca4fadf7550b891d433835d8cc4d3f547dc244215627147378b3e3850670b294ab52419c0fce157bb4f7655d3ad9e03bdf3575fbb1e14b975b34f0f828e
7
+ data.tar.gz: 779eff91ae9afd1ae6a4dd88be07317fca1b3904f7f16f4af7522dab0214b42bb84db0b2620b45bcf54ed61ba7472eac4ef18a2b232b8ac13051ee65182ee74a
@@ -697,16 +697,13 @@ bool Message_Equal(const upb_msg *m1, const upb_msg *m2, const upb_msgdef *m) {
697
697
  * field is of a primitive type).
698
698
  */
699
699
  static VALUE Message_eq(VALUE _self, VALUE _other) {
700
- if (TYPE(_self) != TYPE(_other)) {
701
- return Qfalse;
702
- }
700
+ if (CLASS_OF(_self) != CLASS_OF(_other)) return Qfalse;
703
701
 
704
702
  Message* self = ruby_to_Message(_self);
705
703
  Message* other = ruby_to_Message(_other);
704
+ assert(self->msgdef == other->msgdef);
706
705
 
707
- return Message_Equal(self->msg, other->msg, self->msgdef)
708
- ? Qtrue
709
- : Qfalse;
706
+ return Message_Equal(self->msg, other->msg, self->msgdef) ? Qtrue : Qfalse;
710
707
  }
711
708
 
712
709
  uint64_t Message_Hash(const upb_msg* msg, const upb_msgdef* m, uint64_t seed) {
@@ -251,14 +251,80 @@ void Arena_register(VALUE module) {
251
251
  // The object is used only for its identity; it does not contain any data.
252
252
  VALUE secondary_map = Qnil;
253
253
 
254
+ // Mutations to the map are under a mutex, because SeconaryMap_MaybeGC()
255
+ // iterates over the map which cannot happen in parallel with insertions, or
256
+ // Ruby will throw:
257
+ // can't add a new key into hash during iteration (RuntimeError)
258
+ VALUE secondary_map_mutex = Qnil;
259
+
260
+ // Lambda that will GC entries from the secondary map that are no longer present
261
+ // in the primary map.
262
+ VALUE gc_secondary_map_lambda = Qnil;
263
+ ID length;
264
+
265
+ extern VALUE weak_obj_cache;
266
+
254
267
  static void SecondaryMap_Init() {
255
268
  rb_gc_register_address(&secondary_map);
269
+ rb_gc_register_address(&gc_secondary_map_lambda);
270
+ rb_gc_register_address(&secondary_map_mutex);
256
271
  secondary_map = rb_hash_new();
272
+ gc_secondary_map_lambda = rb_eval_string(
273
+ "->(secondary, weak) {\n"
274
+ " secondary.delete_if { |k, v| !weak.key?(v) }\n"
275
+ "}\n");
276
+ secondary_map_mutex = rb_mutex_new();
277
+ length = rb_intern("length");
257
278
  }
258
279
 
259
- static VALUE SecondaryMap_Get(VALUE key) {
280
+ // The secondary map is a regular Hash, and will never shrink on its own.
281
+ // The main object cache is a WeakMap that will automatically remove entries
282
+ // when the target object is no longer reachable, but unless we manually
283
+ // remove the corresponding entries from the secondary map, it will grow
284
+ // without bound.
285
+ //
286
+ // To avoid this unbounded growth we periodically remove entries from the
287
+ // secondary map that are no longer present in the WeakMap. The logic of
288
+ // how often to perform this GC is an artbirary tuning parameter that
289
+ // represents a straightforward CPU/memory tradeoff.
290
+ //
291
+ // Requires: secondary_map_mutex is held.
292
+ static void SecondaryMap_MaybeGC() {
293
+ PBRUBY_ASSERT(rb_mutex_locked_p(secondary_map_mutex) == Qtrue);
294
+ size_t weak_len = NUM2ULL(rb_funcall(weak_obj_cache, length, 0));
295
+ size_t secondary_len = RHASH_SIZE(secondary_map);
296
+ if (secondary_len < weak_len) {
297
+ // Logically this case should not be possible: a valid entry cannot exist in
298
+ // the weak table unless there is a corresponding entry in the secondary
299
+ // table. It should *always* be the case that secondary_len >= weak_len.
300
+ //
301
+ // However ObjectSpace::WeakMap#length (and therefore weak_len) is
302
+ // unreliable: it overreports its true length by including non-live objects.
303
+ // However these non-live objects are not yielded in iteration, so we may
304
+ // have previously deleted them from the secondary map in a previous
305
+ // invocation of SecondaryMap_MaybeGC().
306
+ //
307
+ // In this case, we can't measure any waste, so we just return.
308
+ return;
309
+ }
310
+ size_t waste = secondary_len - weak_len;
311
+ // GC if we could remove at least 2000 entries or 20% of the table size
312
+ // (whichever is greater). Since the cost of the GC pass is O(N), we
313
+ // want to make sure that we condition this on overall table size, to
314
+ // avoid O(N^2) CPU costs.
315
+ size_t threshold = PBRUBY_MAX(secondary_len * 0.2, 2000);
316
+ if (waste > threshold) {
317
+ rb_funcall(gc_secondary_map_lambda, rb_intern("call"), 2,
318
+ secondary_map, weak_obj_cache);
319
+ }
320
+ }
321
+
322
+ // Requires: secondary_map_mutex is held by this thread iff create == true.
323
+ static VALUE SecondaryMap_Get(VALUE key, bool create) {
324
+ PBRUBY_ASSERT(!create || rb_mutex_locked_p(secondary_map_mutex) == Qtrue);
260
325
  VALUE ret = rb_hash_lookup(secondary_map, key);
261
- if (ret == Qnil) {
326
+ if (ret == Qnil && create) {
327
+ SecondaryMap_MaybeGC();
262
328
  ret = rb_eval_string("Object.new");
263
329
  rb_hash_aset(secondary_map, key, ret);
264
330
  }
@@ -267,14 +333,15 @@ static VALUE SecondaryMap_Get(VALUE key) {
267
333
 
268
334
  #endif
269
335
 
270
- static VALUE ObjectCache_GetKey(const void* key) {
336
+ // Requires: secondary_map_mutex is held by this thread iff create == true.
337
+ static VALUE ObjectCache_GetKey(const void* key, bool create) {
271
338
  char buf[sizeof(key)];
272
339
  memcpy(&buf, &key, sizeof(key));
273
340
  intptr_t key_int = (intptr_t)key;
274
341
  PBRUBY_ASSERT((key_int & 3) == 0);
275
342
  VALUE ret = LL2NUM(key_int >> 2);
276
343
  #if USE_SECONDARY_MAP
277
- ret = SecondaryMap_Get(ret);
344
+ ret = SecondaryMap_Get(ret, create);
278
345
  #endif
279
346
  return ret;
280
347
  }
@@ -298,14 +365,20 @@ static void ObjectCache_Init() {
298
365
 
299
366
  void ObjectCache_Add(const void* key, VALUE val) {
300
367
  PBRUBY_ASSERT(ObjectCache_Get(key) == Qnil);
301
- VALUE key_rb = ObjectCache_GetKey(key);
368
+ #if USE_SECONDARY_MAP
369
+ rb_mutex_lock(secondary_map_mutex);
370
+ #endif
371
+ VALUE key_rb = ObjectCache_GetKey(key, true);
302
372
  rb_funcall(weak_obj_cache, item_set, 2, key_rb, val);
373
+ #if USE_SECONDARY_MAP
374
+ rb_mutex_unlock(secondary_map_mutex);
375
+ #endif
303
376
  PBRUBY_ASSERT(ObjectCache_Get(key) == val);
304
377
  }
305
378
 
306
379
  // Returns the cached object for this key, if any. Otherwise returns Qnil.
307
380
  VALUE ObjectCache_Get(const void* key) {
308
- VALUE key_rb = ObjectCache_GetKey(key);
381
+ VALUE key_rb = ObjectCache_GetKey(key, false);
309
382
  return rb_funcall(weak_obj_cache, item_get, 1, key_rb);
310
383
  }
311
384
 
@@ -106,6 +106,8 @@ extern VALUE cTypeError;
106
106
  #define PBRUBY_ASSERT(expr) assert(expr)
107
107
  #endif
108
108
 
109
+ #define PBRUBY_MAX(x, y) (((x) > (y)) ? (x) : (y))
110
+
109
111
  #define UPB_UNUSED(var) (void)var
110
112
 
111
113
  #endif // __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: google-protobuf
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.15.6
4
+ version: 3.15.7
5
5
  platform: universal-darwin
6
6
  authors:
7
7
  - Protobuf Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-11 00:00:00.000000000 Z
11
+ date: 2021-04-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake-compiler-dock
@@ -128,7 +128,7 @@ homepage: https://developers.google.com/protocol-buffers
128
128
  licenses:
129
129
  - BSD-3-Clause
130
130
  metadata:
131
- source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.15.6/ruby
131
+ source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.15.7/ruby
132
132
  post_install_message:
133
133
  rdoc_options: []
134
134
  require_paths:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
147
147
  - !ruby/object:Gem::Version
148
148
  version: '0'
149
149
  requirements: []
150
- rubygems_version: 3.2.14
150
+ rubygems_version: 3.2.15
151
151
  signing_key:
152
152
  specification_version: 4
153
153
  summary: Protocol Buffers