sqreen 1.15.7-java → 1.15.8.beta1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0f7f327746411e048e85c39d5a85eb0e5160de4561d9dd996b689313db356e
-  data.tar.gz: a6b48b211b1694a109e57e394ceec8c678b31585a3313211d028ab0798467b2d
+  metadata.gz: 66bf85c79c2d173c45c518aafb126e5726c2374b7bfa8f6ae6213fd8f6550540
+  data.tar.gz: 321e2231f412736d72db851b5b942a8a7ecbddae9a7d6b9764ab138945522726
 SHA512:
-  metadata.gz: 3e951226c019ee021a9203609971bef97b9bc738f43a624c41e4eedae17803009f3d6232f336422522b6f9b0453b631423674327c5f3ebb78db1e7a7f0506905
-  data.tar.gz: 19297ce483987c4c714a76b76409ca7139ebda5ec01f4da7ca79ce5d80a6faa1b37d732df9548037c00319ac1b82e40f906c384e29dfb9a869c088fc0010cd89
+  metadata.gz: 4b11fc87bdd5af37267ebcdcf2097c0472bcf94157bfb5c70fa83368498f88e1ffcd26f88e66a998023261b171bcc91ba500dad814148620f5e1a593afda5a37
+  data.tar.gz: 1bc18bee61f9d3a9ec916ef45a89b4f1bdafbd7deb5adcf54d847a007a4137c738d2743ead289aac3190499497e15502c3cffa19ec52a707cdcd92dedd699ce3

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -59,8 +59,25 @@ module Sqreen
         end
       end
 
-      def give_back_context(isolate)
-        @mutex.synchronize { @contexts.push(isolate); }
+      def give_back_context(context)
+        context.possibly_gc
+
+        if context.gc_load > 30
+          if context.gc_threshold_in_bytes == DEFAULT_GC_THRESHOLD
+            context.gc_threshold_in_bytes *= 2
+            Sqreen.log.warn('Context %s had too many close garbage collections; ' \
+                            'doubling the threshold to %d bytes',
+                            context, context.gc_threshold_in_bytes)
+            context.gc_load = 0
+          else
+            Sqreen.log.warn('Context %s had too many close garbage ' \
+                            'collections; discarding it', context)
+            context.dispose
+            return
+          end
+        end
+
+        @mutex.synchronize { @contexts.push(context); }
       end
     end
 
@@ -194,10 +211,15 @@ module Sqreen
       private
 
       class << self
+        DEFAULT_GC_THRESHOLD = 15000000  # 15 MB
+
         def define_sqreen_context(modoole)
           # Context specialized for Sqreen usage
           Sqreen::Js.const_set 'SqreenContext', Class.new(modoole.const_get('Context'))
           SqreenContext.class_eval do
+            attr_accessor :gc_threshold_in_bytes
+            attr_accessor :gc_load
+
             def has_code?(code_id)
               return false unless @code_ids
               @code_ids.include?(code_id)
@@ -233,6 +255,22 @@ module Sqreen
               end
             end
 
+            def possibly_gc
+              Sqreen.log.warn("Heap usage: #{heap_stats[:total_heap_size]} for #{object_id}")
+
+              @gc_threshold_in_bytes = DEFAULT_GC_THRESHOLD
+              @gc_load ||= 0
+
+              # garbage collections max 1 in every 4 calls (avg)
+              if heap_stats[:total_heap_size] > @gc_threshold_in_bytes
+                Sqreen.log.warn("Doing low memory notification for context")
+                low_memory_notification
+                @gc_load += 4
+              else
+                @gc_load = [0, @gc_load - 1].max
+              end
+            end
+
             private
 
             def transf_global_funcs(code_id)

data/lib/sqreen/log.rb

@@ -2,6 +2,7 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
 require 'logger'
+require 'singleton'
 
 require 'sqreen/performance_notifications/log'
 require 'sqreen/performance_notifications/log_performance'

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.15.7'.freeze
+  VERSION = '1.15.8.beta1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.7
+  version: 1.15.8.beta1
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -148,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.7