[GR-16164] Fix sharing with the benchmark harness, RubyLauncher and IO buffers.

PullRequest: truffleruby/881

Author: eregon

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 20.0.0 beta 2
+
+Bug fixes:
+
+* Sharing for thread-safety of objects is now triggered later as intended, e.g., when a second `Thread` is started.
+
 # 20.0.0 beta 1
 
 Bug fixes:

bench/benchmark-interface/lib/benchmark-interface/backends/bips.rb

@@ -13,7 +13,7 @@ module Bips
       LONG_ITERATION_THRESHOLD = 0.1 # seconds
 
       def self.run(benchmark_set, names, options)
-        BeckhmarkInterface.require_rubygems
+        BenchmarkInterface.require_rubygems
         benchmark_interface_original_require 'benchmark/ips'
 
         unless options['--no-scale']

bench/benchmark-interface/lib/benchmark-interface/backends/deep.rb

@@ -14,8 +14,8 @@ def self.run(benchmark_set, names, options)
         unless names.size == 1
           abort 'The deep backend only works when you run just one benchmark at a time - specify the name on the command line'
         end
-        
-        BeckhmarkInterface.require_rubygems
+
+        BenchmarkInterface.require_rubygems
         benchmark_interface_original_require 'deep-bench/backend'
 
         benchmark = benchmark_set.benchmark(names.first)

bench/benchmark-interface/lib/benchmark-interface/benchmark-set.rb

@@ -14,25 +14,22 @@ class BenchmarkSet
     def initialize
       @benchmarks = []
       @counter = 0
-      @@current = self
+      Thread.current[:benchmark_interface_benchmark_set] = self
       @iterations = 1
     end
 
     def load_benchmarks(path)
       @path = path
-      @@current = self
       load(path)
     end
 
     def load_inlined_benchmark(code)
       @path = '-e'
-      @@current = self
       TOPLEVEL_BINDING.eval(code)
     end
 
     def load_mri_benchmarks(path, options)
       @path = path
-      @@current = self
       Frontends::MRI.load_mri path, options
     end
 
@@ -84,10 +81,8 @@ def benchmark(name)
       benchmarks([name]).first
     end
 
-    @@current = nil
-
     def self.current
-      @@current
+      Thread.current[:benchmark_interface_benchmark_set]
     end
 
   end

bench/benchmark-interface/lib/benchmark-interface/frontends/benchmark.rb

@@ -34,10 +34,6 @@ def self.realtime(name=nil, &block)
   def self.benchmark(caption='', label_width=nil, format=nil, *labels)
     yield BenchmarkInterface::BenchmarkContext.new
   end
-
-  def self.realtime(name=nil, &block)
-    BenchmarkInterface.benchmark name, &block
-  end
 
   def self.bm(label_width=0, *labels)
     yield BenchmarkInterface::BenchmarkContext.new

bench/benchmark-interface/lib/benchmark-interface/require.rb

@@ -6,7 +6,7 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-module BeckhmarkInterface
+module BenchmarkInterface
 
   def self.require_rubygems
     begin

spec/tags/truffle/thread_safe_objects_tags.txt

@@ -0,0 +1,2 @@
+slow:Sharing is correctly propagated for classes and constants and they are not shared until sharing is started
+slow:Sharing is correctly propagated for thread-local IO buffers which should not trigger sharing

spec/truffle/thread_safe_objects_spec.rb

@@ -255,4 +255,34 @@ def wb; @wb; end
     shared?(new_hash).should == true
   end
 
+  it "Fiber local variables which do not share the value" do
+    thread = Thread.current
+    shared?(thread).should == true
+
+    obj = Object.new
+    thread[:sharing_spec] = obj
+    begin
+      shared?(obj).should == false
+    ensure
+      thread[:sharing_spec] = nil
+    end
+  end
+
+  it "Thread local variables which share the value (probably they should not)" do
+    thread = Thread.current
+    shared?(thread).should == true
+
+    obj = Object.new
+    thread.thread_variable_set(:sharing_spec, obj)
+    shared?(obj).should == true # TODO (eregon, 5 Jun 2019): this is the current non-ideal behavior
+  end
+
+  it "classes and constants and they are not shared until sharing is started" do
+    ruby_exe("p Truffle::Debug.shared?(Object)").should == "false\n"
+  end
+
+  it "thread-local IO buffers which should not trigger sharing" do
+    ruby_exe("File.read(#{__FILE__.inspect}); p Truffle::Debug.shared?(Object)").should == "false\n"
+  end
+
 end

src/main/java/org/truffleruby/RubyContext.java

@@ -262,7 +262,7 @@ public void initialize() {
 
         // Share once everything is loaded
         if (options.SHARED_OBJECTS_ENABLED && options.SHARED_OBJECTS_FORCE) {
-            sharedObjects.startSharing();
+            sharedObjects.startSharing(OptionsCatalog.SHARED_OBJECTS_FORCE.getName() + " being true");
         }
 
         if (isPreInitializing()) {

src/main/java/org/truffleruby/core/FinalizationService.java

@@ -111,7 +111,7 @@ public synchronized FinalizerReference addFinalizer(Object object, FinalizerRefe
 
         finalizerReference.addFinalizer(owner, action, root);
 
-        referenceProcessor.processReferenceQueue();
+        referenceProcessor.processReferenceQueue(owner);
         return finalizerReference;
     }