Skip to content

Commit 2201765

Browse files
committed
Remove native bits of delegate lib.
We implemented portions of the delegate library as a JRuby ext, in order to improve performance and avoid the heavy method_missing logic that used to be in the pure-Ruby version. However, over the years, the delegate library has improved and no longer has the same performance characteristics as it did in 1.8 and earlier. In addition, there have been functionality changes to the pure-Ruby code that we would have to maintain in the extension. Therefore, we have opted to return to just the pure-Ruby delegate library. We will reexamine performance and work with ruby-core to improve the pure-Ruby version before we consider returning to the native version. Fixes #1370.
1 parent bb78f8b commit 2201765

3 files changed

Lines changed: 0 additions & 142 deletions

File tree

core/src/main/java/org/jruby/Ruby.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,6 @@ private void initBuiltins() {
17181718
addLazyBuiltin("io/wait.jar", "io/wait", "org.jruby.ext.io.wait.IOWaitLibrary");
17191719
addLazyBuiltin("etc.jar", "etc", "org.jruby.ext.etc.EtcLibrary");
17201720
addLazyBuiltin("weakref.rb", "weakref", "org.jruby.ext.weakref.WeakRefLibrary");
1721-
addLazyBuiltin("native_delegate.jar", "native_delegate", "org.jruby.ext.delegate.NativeDelegateLibrary");
17221721
addLazyBuiltin("timeout.rb", "timeout", "org.jruby.ext.timeout.Timeout");
17231722
addLazyBuiltin("socket.jar", "socket", "org.jruby.ext.socket.SocketLibrary");
17241723
addLazyBuiltin("rbconfig.rb", "rbconfig", "org.jruby.ext.rbconfig.RbConfigLibrary");

core/src/main/java/org/jruby/ext/delegate/NativeDelegateLibrary.java

Lines changed: 0 additions & 139 deletions
This file was deleted.

lib/ruby/stdlib/delegate.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,5 +415,3 @@ def __setobj__(obj) # :nodoc:
415415
end
416416
return klass
417417
end
418-
419-
require 'native_delegate.jar'

0 commit comments

Comments
 (0)