nio4r 2.0.0.pre-java → 2.1.0-java

data/ext/nio4r/org/nio4r/Monitor.java

@@ -0,0 +1,164 @@
+package org.nio4r;
+
+import java.nio.channels.Channel;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SelectionKey;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyIO;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+public class Monitor extends RubyObject {
+    private SelectionKey key;
+    private RubyIO io;
+    private IRubyObject interests, selector, value, closed;
+
+    public Monitor(final Ruby ruby, RubyClass rubyClass) {
+        super(ruby, rubyClass);
+    }
+
+    @JRubyMethod
+    public IRubyObject initialize(ThreadContext context, IRubyObject selectable, IRubyObject interests, IRubyObject selector) {
+        this.io        = RubyIO.convertToIO(context, selectable);
+        this.interests = interests;
+        this.selector  = selector;
+
+        this.value  = context.nil;
+        this.closed = context.getRuntime().getFalse();
+
+        return context.nil;
+    }
+
+    public void setSelectionKey(SelectionKey key) {
+        this.key = key;
+        key.attach(this);
+    }
+
+    @JRubyMethod
+    public IRubyObject io(ThreadContext context) {
+        return io;
+    }
+
+    @JRubyMethod
+    public IRubyObject selector(ThreadContext context) {
+        return selector;
+    }
+
+    @JRubyMethod(name = "interests")
+    public IRubyObject getInterests(ThreadContext context) {
+        return interests;
+    }
+
+    @JRubyMethod(name = "interests=")
+    public IRubyObject setInterests(ThreadContext context, IRubyObject interests) {
+        if(this.closed == context.getRuntime().getTrue()) {
+            throw context.getRuntime().newEOFError("monitor is closed");
+        }
+
+        Ruby ruby = context.getRuntime();
+        SelectableChannel channel = (SelectableChannel)io.getChannel();
+
+        key.interestOps(Nio4r.symbolToInterestOps(ruby, channel, interests));
+        this.interests = interests;
+
+        return this.interests;
+    }
+
+    @JRubyMethod(name = "add_interest")
+    public IRubyObject addInterest(ThreadContext context, IRubyObject interest) {
+        if(this.closed == context.getRuntime().getTrue()) {
+            throw context.getRuntime().newEOFError("monitor is closed");
+        }
+
+        Ruby ruby = context.getRuntime();
+        SelectableChannel channel = (SelectableChannel)io.getChannel();
+        int newInterestOps = key.interestOps() | Nio4r.symbolToInterestOps(ruby, channel, interest);
+
+        key.interestOps(newInterestOps);
+        this.interests = Nio4r.interestOpsToSymbol(ruby, newInterestOps);
+
+        return this.interests;
+    }
+
+    @JRubyMethod(name = "remove_interest")
+    public IRubyObject removeInterest(ThreadContext context, IRubyObject interest) {
+        if(this.closed == context.getRuntime().getTrue()) {
+            throw context.getRuntime().newEOFError("monitor is closed");
+        }
+
+        Ruby ruby = context.getRuntime();
+        SelectableChannel channel = (SelectableChannel)io.getChannel();
+        int newInterestOps = key.interestOps() & ~Nio4r.symbolToInterestOps(ruby, channel, interest);
+
+        key.interestOps(newInterestOps);
+        this.interests = Nio4r.interestOpsToSymbol(ruby, newInterestOps);
+
+        return this.interests;
+    }
+
+    @JRubyMethod
+    public IRubyObject readiness(ThreadContext context) {
+        return Nio4r.interestOpsToSymbol(context.getRuntime(), key.readyOps());
+    }
+
+    @JRubyMethod(name = "readable?")
+    public IRubyObject isReadable(ThreadContext context) {
+        Ruby runtime  = context.getRuntime();
+        int  readyOps = this.key.readyOps();
+
+        if((readyOps & SelectionKey.OP_READ) != 0 || (readyOps & SelectionKey.OP_ACCEPT) != 0) {
+            return runtime.getTrue();
+        } else {
+            return runtime.getFalse();
+        }
+    }
+
+    @JRubyMethod(name = {"writable?", "writeable?"})
+    public IRubyObject writable(ThreadContext context) {
+        Ruby runtime  = context.getRuntime();
+        int  readyOps = this.key.readyOps();
+
+        if((readyOps & SelectionKey.OP_WRITE) != 0 || (readyOps & SelectionKey.OP_CONNECT) != 0) {
+            return runtime.getTrue();
+        } else {
+            return runtime.getFalse();
+        }
+    }
+
+    @JRubyMethod(name = "value")
+    public IRubyObject getValue(ThreadContext context) {
+        return this.value;
+    }
+
+    @JRubyMethod(name = "value=")
+    public IRubyObject setValue(ThreadContext context, IRubyObject obj) {
+        this.value = obj;
+        return context.nil;
+    }
+
+    @JRubyMethod
+    public IRubyObject close(ThreadContext context) {
+        return close(context, context.getRuntime().getTrue());
+    }
+
+    @JRubyMethod
+    public IRubyObject close(ThreadContext context, IRubyObject deregister) {
+        Ruby runtime = context.getRuntime();
+        this.closed = runtime.getTrue();
+
+        if(deregister == runtime.getTrue()) {
+            selector.callMethod(context, "deregister", io);
+        }
+
+        return context.nil;
+    }
+
+    @JRubyMethod(name = "closed?")
+    public IRubyObject isClosed(ThreadContext context) {
+        return this.closed;
+    }
+}

data/ext/nio4r/org/nio4r/Nio4r.java

@@ -1,27 +1,19 @@
 package org.nio4r;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
-import java.nio.channels.Channel;
-import java.nio.channels.SocketChannel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
+import java.nio.channels.SocketChannel;
+
 import org.jruby.Ruby;
-import org.jruby.RubyModule;
 import org.jruby.RubyClass;
-import org.jruby.RubyObject;
-import org.jruby.RubyIO;
-import org.jruby.RubyNumeric;
-import org.jruby.RubyArray;
-import org.jruby.anno.JRubyMethod;
+import org.jruby.RubyModule;
 import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.load.Library;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.Block;
+
 import org.nio4r.ByteBuffer;
+import org.nio4r.Monitor;
+import org.nio4r.Selector;
 
 public class Nio4r implements Library {
     private Ruby ruby;
@@ -54,6 +46,11 @@ public class Nio4r implements Library {
         }, nio);
 
         byteBuffer.defineAnnotatedMethods(ByteBuffer.class);
+        byteBuffer.includeModule(ruby.getEnumerable());
+
+        ruby.defineClassUnder("OverflowError",  ruby.getIOError(), ruby.getIOError().getAllocator(), byteBuffer);
+        ruby.defineClassUnder("UnderflowError", ruby.getIOError(), ruby.getIOError().getAllocator(), byteBuffer);
+        ruby.defineClassUnder("MarkUnsetError", ruby.getIOError(), ruby.getIOError().getAllocator(), byteBuffer);
     }
 
     public static int symbolToInterestOps(Ruby ruby, SelectableChannel channel, IRubyObject interest) {
@@ -98,385 +95,10 @@ public class Nio4r implements Library {
             case SelectionKey.OP_READ | SelectionKey.OP_CONNECT:
             case SelectionKey.OP_READ | SelectionKey.OP_WRITE:
                 return ruby.newSymbol("rw");
+            case 0:
+                return ruby.getNil();
             default:
                 throw ruby.newArgumentError("unknown interest op combination");
         }
     }
-
-    public class Selector extends RubyObject {
-        private java.nio.channels.Selector selector;
-        private HashMap<SelectableChannel,SelectionKey> cancelledKeys;
-
-        public Selector(final Ruby ruby, RubyClass rubyClass) {
-            super(ruby, rubyClass);
-        }
-
-        @JRubyMethod
-        public IRubyObject initialize(ThreadContext context) {
-            this.cancelledKeys = new HashMap<SelectableChannel,SelectionKey>();
-            try {
-                this.selector = java.nio.channels.Selector.open();
-            } catch(IOException ie) {
-                throw context.runtime.newIOError(ie.getLocalizedMessage());
-            }
-
-            return context.nil;
-        }
-
-        @JRubyMethod
-        public IRubyObject close(ThreadContext context) {
-            try {
-                this.selector.close();
-            } catch(IOException ie) {
-                throw context.runtime.newIOError(ie.getLocalizedMessage());
-            }
-
-            return context.nil;
-        }
-
-        @JRubyMethod(name = "closed?")
-        public IRubyObject isClosed(ThreadContext context) {
-            Ruby runtime = context.getRuntime();
-            return this.selector.isOpen() ? runtime.getFalse() : runtime.getTrue();
-        }
-
-        @JRubyMethod(name = "empty?")
-        public IRubyObject isEmpty(ThreadContext context) {
-            Ruby runtime = context.getRuntime();
-            return this.selector.keys().isEmpty() ? runtime.getTrue() : runtime.getFalse();
-        }
-
-        @JRubyMethod
-        public IRubyObject register(ThreadContext context, IRubyObject io, IRubyObject interests) {
-            Ruby runtime = context.getRuntime();
-            Channel rawChannel = RubyIO.convertToIO(context, io).getChannel();
-
-            if(!this.selector.isOpen()) {
-                throw context.getRuntime().newIOError("selector is closed");
-            }
-
-            if(!(rawChannel instanceof SelectableChannel)) {
-                throw runtime.newArgumentError("not a selectable IO object");
-            }
-
-            SelectableChannel channel = (SelectableChannel)rawChannel;
-
-            try {
-                channel.configureBlocking(false);
-            } catch(IOException ie) {
-                throw runtime.newIOError(ie.getLocalizedMessage());
-            }
-
-            int interestOps = Nio4r.symbolToInterestOps(runtime, channel, interests);
-            SelectionKey key;
-
-            key = this.cancelledKeys.remove(channel);
-
-            if(key != null) {
-                key.interestOps(interestOps);
-            } else {
-                try {
-                    key = channel.register(this.selector, interestOps);
-                } catch(java.lang.IllegalArgumentException ia) {
-                    throw runtime.newArgumentError("mode not supported for this object: " + interests);
-                } catch(java.nio.channels.ClosedChannelException cce) {
-                    throw context.runtime.newIOError(cce.getLocalizedMessage());
-                }
-            }
-
-            RubyClass monitorClass = runtime.getModule("NIO").getClass("Monitor");
-            Monitor monitor = (Monitor)monitorClass.newInstance(context, io, interests, this, null);
-            monitor.setSelectionKey(key);
-
-            return monitor;
-        }
-
-        @JRubyMethod
-        public IRubyObject deregister(ThreadContext context, IRubyObject io) {
-            Ruby runtime = context.getRuntime();
-            Channel rawChannel = RubyIO.convertToIO(context, io).getChannel();
-
-            if(!(rawChannel instanceof SelectableChannel)) {
-                throw runtime.newArgumentError("not a selectable IO object");
-            }
-
-            SelectableChannel channel = (SelectableChannel)rawChannel;
-            SelectionKey key = channel.keyFor(this.selector);
-
-            if(key == null)
-                return context.nil;
-
-            Monitor monitor = (Monitor)key.attachment();
-            monitor.close(context, runtime.getFalse());
-            cancelledKeys.put(channel, key);
-
-            return monitor;
-        }
-
-        @JRubyMethod(name = "registered?")
-        public IRubyObject isRegistered(ThreadContext context, IRubyObject io) {
-            Ruby runtime = context.getRuntime();
-            Channel rawChannel = RubyIO.convertToIO(context, io).getChannel();
-
-            if(!(rawChannel instanceof SelectableChannel)) {
-                throw runtime.newArgumentError("not a selectable IO object");
-            }
-
-            SelectableChannel channel = (SelectableChannel)rawChannel;
-            SelectionKey key = channel.keyFor(this.selector);
-
-            if(key == null)
-                return context.nil;
-
-
-            if(((Monitor)key.attachment()).isClosed(context) == runtime.getTrue()) {
-                return runtime.getFalse();
-            } else {
-                return runtime.getTrue();
-            }
-        }
-
-        @JRubyMethod
-        public synchronized IRubyObject select(ThreadContext context, Block block) {
-            return select(context, context.nil, block);
-        }
-
-        @JRubyMethod
-        public synchronized IRubyObject select(ThreadContext context, IRubyObject timeout, Block block) {
-            Ruby runtime = context.getRuntime();
-
-            if(!this.selector.isOpen()) {
-                throw context.getRuntime().newIOError("selector is closed");
-            }
-
-            int ready = doSelect(runtime, context, timeout);
-
-            /* Timeout or wakeup */
-            if(ready <= 0)
-                return context.nil;
-
-            RubyArray array = null;
-            if(!block.isGiven()) {
-                array = runtime.newArray(this.selector.selectedKeys().size());
-            }
-
-            Iterator selectedKeys = this.selector.selectedKeys().iterator();
-            while(selectedKeys.hasNext()) {
-                SelectionKey key = (SelectionKey)selectedKeys.next();
-                processKey(key);
-                selectedKeys.remove();
-
-                if(block.isGiven()) {
-                    block.call(context, (IRubyObject)key.attachment());
-                } else {
-                    array.add(key.attachment());
-                }
-            }
-
-            if(block.isGiven()) {
-                return RubyNumeric.int2fix(runtime, ready);
-            } else {
-                return array;
-            }
-        }
-
-        /* Run the selector */
-        private int doSelect(Ruby runtime, ThreadContext context, IRubyObject timeout) {
-            int result;
-
-            cancelKeys();
-            try {
-                context.getThread().beforeBlockingCall();
-                if(timeout.isNil()) {
-                    result = this.selector.select();
-                } else {
-                    double t = RubyNumeric.num2dbl(timeout);
-                    if(t == 0) {
-                        result = this.selector.selectNow();
-                    } else if(t < 0) {
-                        throw runtime.newArgumentError("time interval must be positive");
-                    } else {
-                        long timeoutMilliSeconds = (long)(t * 1000);
-                        if(timeoutMilliSeconds == 0) {
-                          result = this.selector.selectNow();
-                        } else {
-                          result = this.selector.select(timeoutMilliSeconds);
-                        }
-                    }
-                }
-                context.getThread().afterBlockingCall();
-                return result;
-            } catch(IOException ie) {
-                throw runtime.newIOError(ie.getLocalizedMessage());
-            }
-        }
-
-        /* Flush our internal buffer of cancelled keys */
-        private void cancelKeys() {
-            Iterator cancelledKeys = this.cancelledKeys.entrySet().iterator();
-            while(cancelledKeys.hasNext()) {
-                Map.Entry entry = (Map.Entry)cancelledKeys.next();
-                SelectionKey key = (SelectionKey)entry.getValue();
-                key.cancel();
-                cancelledKeys.remove();
-            }
-        }
-
-        // Remove connect interest from connected sockets
-        // See: http://stackoverflow.com/questions/204186/java-nio-select-returns-without-selected-keys-why
-        private void processKey(SelectionKey key) {
-            if((key.readyOps() & SelectionKey.OP_CONNECT) != 0) {
-                int interestOps = key.interestOps();
-
-                interestOps &= ~SelectionKey.OP_CONNECT;
-                interestOps |=  SelectionKey.OP_WRITE;
-
-                key.interestOps(interestOps);
-            }
-        }
-
-        @JRubyMethod
-        public IRubyObject wakeup(ThreadContext context) {
-            if(!this.selector.isOpen()) {
-                throw context.getRuntime().newIOError("selector is closed");
-            }
-
-            this.selector.wakeup();
-            return context.nil;
-        }
-    }
-
-    public class Monitor extends RubyObject {
-        private SelectionKey key;
-        private RubyIO io;
-        private IRubyObject interests, selector, value, closed;
-
-        public Monitor(final Ruby ruby, RubyClass rubyClass) {
-            super(ruby, rubyClass);
-        }
-
-        @JRubyMethod
-        public IRubyObject initialize(ThreadContext context, IRubyObject selectable, IRubyObject interests, IRubyObject selector) {
-            this.io        = RubyIO.convertToIO(context, selectable);
-            this.interests = interests;
-            this.selector  = selector;
-
-            this.value  = context.nil;
-            this.closed = context.getRuntime().getFalse();
-
-            return context.nil;
-        }
-
-        public void setSelectionKey(SelectionKey key) {
-            this.key = key;
-            key.attach(this);
-        }
-
-        @JRubyMethod(name = "interests=")
-        public IRubyObject setInterests(ThreadContext context, IRubyObject interests) {
-            if(this.closed == context.getRuntime().getTrue()) {
-                throw context.getRuntime().newTypeError("monitor is already closed");
-            }
-
-            int interestOps = 0;
-            Ruby runtime = context.getRuntime();
-            Channel rawChannel = io.getChannel();
-            SelectableChannel channel = (SelectableChannel)rawChannel;
-
-            this.interests = interests;
-
-            if(interests == ruby.newSymbol("r")) {
-                interestOps = SelectionKey.OP_READ;
-            } else if(interests == ruby.newSymbol("w")) {
-                interestOps = SelectionKey.OP_WRITE;
-            } else if(interests == ruby.newSymbol("rw")) {
-                interestOps = SelectionKey.OP_READ|SelectionKey.OP_WRITE;
-            }
-
-            if((interestOps & ~(channel.validOps())) == 0) {
-                key.interestOps(interestOps);
-            } else {
-                throw context.getRuntime().newArgumentError("given interests not supported for this IO object");
-            }
-
-            return this.interests;
-        }
-
-        @JRubyMethod
-        public IRubyObject io(ThreadContext context) {
-            return io;
-        }
-
-        @JRubyMethod
-        public IRubyObject selector(ThreadContext context) {
-            return selector;
-        }
-
-        @JRubyMethod
-        public IRubyObject interests(ThreadContext context) {
-            return interests;
-        }
-
-        @JRubyMethod
-        public IRubyObject readiness(ThreadContext context) {
-            return Nio4r.interestOpsToSymbol(context.getRuntime(), key.readyOps());
-        }
-
-        @JRubyMethod(name = "readable?")
-        public IRubyObject isReadable(ThreadContext context) {
-            Ruby runtime  = context.getRuntime();
-            int  readyOps = this.key.readyOps();
-
-            if((readyOps & SelectionKey.OP_READ) != 0 || (readyOps & SelectionKey.OP_ACCEPT) != 0) {
-                return runtime.getTrue();
-            } else {
-                return runtime.getFalse();
-            }
-        }
-
-        @JRubyMethod(name = {"writable?", "writeable?"})
-        public IRubyObject writable(ThreadContext context) {
-            Ruby runtime  = context.getRuntime();
-            int  readyOps = this.key.readyOps();
-
-            if((readyOps & SelectionKey.OP_WRITE) != 0 || (readyOps & SelectionKey.OP_CONNECT) != 0) {
-                return runtime.getTrue();
-            } else {
-                return runtime.getFalse();
-            }
-        }
-
-        @JRubyMethod(name = "value")
-        public IRubyObject getValue(ThreadContext context) {
-            return this.value;
-        }
-
-        @JRubyMethod(name = "value=")
-        public IRubyObject setValue(ThreadContext context, IRubyObject obj) {
-            this.value = obj;
-            return context.nil;
-        }
-
-        @JRubyMethod
-        public IRubyObject close(ThreadContext context) {
-            return close(context, context.getRuntime().getTrue());
-        }
-
-        @JRubyMethod
-        public IRubyObject close(ThreadContext context, IRubyObject deregister) {
-            Ruby runtime = context.getRuntime();
-            this.closed = runtime.getTrue();
-
-            if(deregister == runtime.getTrue()) {
-                selector.callMethod(context, "deregister", io);
-            }
-
-            return context.nil;
-        }
-
-        @JRubyMethod(name = "closed?")
-        public IRubyObject isClosed(ThreadContext context) {
-            return this.closed;
-        }
-    }
 }