Merge branch 'master' into truffle-head

Conflicts: truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
jruby · Apr 14, 2015 · f845e75 · f845e75
2 parents b2b02cb + bb9dbb7
commit f845e75
Show file tree

Hide file tree

Showing 51 changed files with 2,671 additions and 1,126 deletions.
diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
diff --git a/core/src/main/java/org/jruby/embed/internal/AbstractLocalContextProvider.java b/core/src/main/java/org/jruby/embed/internal/AbstractLocalContextProvider.java
@@ -29,6 +29,7 @@
  */
 package org.jruby.embed.internal;
 
+import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.embed.LocalVariableBehavior;
 
@@ -37,19 +38,62 @@
  * @author Yoko Harada <yokolet@gmail.com>
  */
 public abstract class AbstractLocalContextProvider implements LocalContextProvider {
-    protected RubyInstanceConfig config = new RubyInstanceConfig();
-    protected LocalVariableBehavior behavior = LocalVariableBehavior.TRANSIENT;
+
+    protected final RubyInstanceConfig config;
+    protected final LocalVariableBehavior behavior;
     protected boolean lazy = true;
 
-    public RubyInstanceConfig getRubyInstanceConfig() {
-        return config;
+    protected AbstractLocalContextProvider() {
+        this( new RubyInstanceConfig() );
+    }
+
+    protected AbstractLocalContextProvider(RubyInstanceConfig config) {
+        this.config = config; this.behavior = LocalVariableBehavior.TRANSIENT;
+    }
+
+    protected AbstractLocalContextProvider(RubyInstanceConfig config, LocalVariableBehavior behavior) {
+        this.config = config; this.behavior = behavior;
+    }
+
+    protected AbstractLocalContextProvider(LocalVariableBehavior behavior) {
+        this.config = new RubyInstanceConfig(); this.behavior = behavior;
     }
 
     protected LocalContext getInstance() {
         return new LocalContext(config, behavior, lazy);
     }
-
+
+    @Override
+    public RubyInstanceConfig getRubyInstanceConfig() {
+        return config;
+    }
+
+    @Override
     public LocalVariableBehavior getLocalVariableBehavior() {
         return behavior;
     }
+
+    boolean isGlobalRuntimeReady() { return Ruby.isGlobalRuntimeReady(); }
+
+    Ruby getGlobalRuntime(AbstractLocalContextProvider provider) {
+        if ( isGlobalRuntimeReady() ) {
+            return Ruby.getGlobalRuntime();
+        }
+        return Ruby.newInstance(provider.config);
+    }
+
+    RubyInstanceConfig getGlobalRuntimeConfig(AbstractLocalContextProvider provider) {
+        // make sure we do not yet initialize the runtime here
+        if ( isGlobalRuntimeReady() ) {
+            return getGlobalRuntime(provider).getInstanceConfig();
+        }
+        return provider.config;
+    }
+
+    static RubyInstanceConfig getGlobalRuntimeConfigOrNew() {
+        return Ruby.isGlobalRuntimeReady() ?
+                Ruby.getGlobalRuntime().getInstanceConfig() :
+                    new RubyInstanceConfig();
+    }
+
 }