Revert "Remove some vestiges of the old C extension support that don'…

…t do anything." This reverts commit ecce6eb.
jruby · Nov 19, 2014 · dc702bd · dc702bd
1 parent d157042
commit dc702bd
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,9 @@ os:
   - osx
 
 env:
+  # disable cext
   global:
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djruby.cext.enabled=false"
   matrix:
     - PHASE='-Ptest'
     - PHASE='-Pjruby_complete_jar_jruby'

diff --git a/core/src/main/java/org/jruby/runtime/load/CExtension.java b/core/src/main/java/org/jruby/runtime/load/CExtension.java
@@ -0,0 +1,114 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2010, Tim Felgentreff
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.runtime.load;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+
+import org.jruby.Ruby;
+import org.jruby.RubyInstanceConfig;
+
+/**
+ * This class wraps the ModuleLoader for loading c-extensions
+ * in JRuby. Resources in the native file-system are loaded directly,
+ * extensions included in a Jar are extracted to java.io.tmpdir to allow
+ * the System to load them into the process space.
+ */
+public class CExtension implements Library {
+    private LoadServiceResource resource;
+
+    public CExtension(LoadServiceResource resource) {
+        this.resource = resource;
+    }
+
+    /**
+     * Try loading the found c-extension. If the extension is contained in a Jar file,
+     * it will be extracted to the java.io.tmpdir
+     */
+    public void load(Ruby runtime, boolean wrap) throws IOException {
+        String file;
+        if (!resource.getURL().getProtocol().equals("jar")) {
+            file = resource.getAbsolutePath();
+        } else {
+            // The cext was wrapped in a jar
+            InputStream is = resource.getInputStream();
+            FileOutputStream os = null;
+            File dstFile = new File(System.getProperty("java.io.tmpdir") + File.pathSeparator + 
+                    resource.getName());
+            if (!dstFile.exists()) { // File doesn't exist yet. Extract it.
+                try {
+                    dstFile.deleteOnExit();
+                    os = new FileOutputStream(dstFile);
+                    ReadableByteChannel srcChannel = Channels.newChannel(is);
+
+                    for (long pos = 0; is.available() > 0; ) {
+                        pos += os.getChannel().transferFrom(srcChannel, pos, Math.max(4096, is.available()));
+                    }
+                } catch (IOException ex) {
+                    throw runtime.newLoadError("Error loading file -- " + resource.getName());
+                } finally {
+                    try {
+                        if (os != null)  {
+                            os.close();
+                        }
+                        is.close();
+                    } catch (IOException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                }
+            }
+            file = dstFile.getAbsolutePath();
+        }
+
+        // reflectively load extension
+        try {
+            Class moduleLoader = Class.forName("org.jruby.cext.ModuleLoader", true, runtime.getJRubyClassLoader());
+            Method load = moduleLoader.getMethod("load", Ruby.class, String.class);
+            load.invoke(null, runtime, file);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        }
+
+        // set a "global" property to indicate we have loaded a C extension
+        RubyInstanceConfig.setLoadedNativeExtensions(true);
+    }
+
+}
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -253,6 +253,8 @@ public static String dump() {
 
     // After PROPERTIES so it doesn't show up in --properties
     @Deprecated
+    public static final Option<Boolean> CEXT_ENABLED = bool(NATIVE, "cext.enabled", false, "Enable or disable C extension support.");
+    @Deprecated
     public static final Option<Boolean> JIT_CACHE = bool(JIT, "jit.cache", !COMPILE_INVOKEDYNAMIC.load(), "(DEPRECATED) Cache jitted method in-memory bodies across runtimes and loads.");
 
     private static Option<String> string(Category category, String name, String[] options, String defval, String description) {