barlume 0.0.1.rc.1 → 0.0.1.rc.2

data/lib/barlume/lanterna/select.rb

@@ -24,59 +24,37 @@ class Select < Lanterna
 		true
 	end
 
-	def add (*)
-		super.tap {
-			@descriptors_with_breaker = nil
-		}
-	end
+	def available (timeout = nil, &block)
+		return enum_for :available, timeout unless block
 
-	def remove (*)
-		super.tap {
-			@descriptors_with_breaker = nil
-		}
-	end
+		readable, writable, error = IO.select([@breaker.to_io] + @readable.values, @writable.values, @descriptors.values, timeout)
 
-	def available (timeout = nil)
-		readable, writable, error = IO.select(descriptors_with_breaker, descriptors, descriptors, timeout)
+		unless readable
+			yield :timeout, timeout
 
-		if readable && readable.delete(@breaker.to_io)
-			@breaker.flush
+			return self
 		end
 
-		Available.new(readable || [], writable || [], error || [])
-	end
+		error.each {|io|
+			readable.delete(io)
+			writable.delete(io)
 
-	def readable (timeout = nil)
-		readable, writable, error = IO.select(descriptors_with_breaker, nil, descriptors, timeout)
-
-		if readable && readable.delete(@breaker.to_io)
-			@breaker.flush
-		end
-
-		if report_errors?
-			[readable || [], error || []]
-		else
-			readable || []
-		end
-	end
-
-	def writable (timeout = nil)
-		readable, writable, error = IO.select([@breaker], descriptors, descriptors, timeout)
+			yield :error, io
+		}
 
-		if readable && readable.delete(@breaker.to_io)
-			@breaker.flush
-		end
+		readable.each {|io|
+			if io == @breaker.to_io
+				yield :break, @breaker.reason
+			else
+				yield :readable, io
+			end
+		}
 
-		if report_errors?
-			[writable || [], error || []]
-		else
-			writable || []
-		end
-	end
+		writable.each {|io|
+			yield :writable, io
+		}
 
-private
-	def descriptors_with_breaker
-		@descriptors_with_breaker ||= [@breaker.to_io] + descriptors
+		self
 	end
 end
 

data/lib/barlume/lucciola.rb

@@ -18,6 +18,7 @@
 #++
 
 require 'fcntl'
+require 'socket'
 
 module Barlume
 
@@ -44,13 +45,7 @@ class Lucciola
 
 	def method_missing (id, *args, &block)
 		if @io.respond_to? id
-			begin
-				return @io.__send__ id, *args, &block
-			rescue EOFError
-				@closed = true
-
-				raise
-			end
+			return @io.__send__ id, *args, &block
 		end
 
 		super
@@ -74,8 +69,16 @@ class Lucciola
 		@closed or @io.respond_to?(:closed?) ? @io.closed? : false
 	end
 
+	def alive?
+		if @io.is_a?(Socket)
+			!!@io.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE).nonzero?
+		else
+			!@io.closed?
+		end
+	end
+
 	def nonblocking?
-		(@io.fcntl(Fcntl::F_GETFL, 0) & Fcntl::O_NONBLOCK).nonzero?
+		!(@io.fcntl(Fcntl::F_GETFL, 0) & Fcntl::O_NONBLOCK).zero?
 	end
 
 	alias asynchronous? nonblocking?
@@ -84,12 +87,220 @@ class Lucciola
 		!nonblocking?
 	end
 
+	alias synchronous? blocking?
+
 	def blocking!
-		@io.fcntl(Fcntl::F_SETFL, @io.fcntl(Fcntl::F_GETFL, 0) | Fcntl::O_NONBLOCK)
+		if block_given?
+			if was_nonblocking = nonblocking?
+				@io.fcntl(Fcntl::F_SETFL, @io.fcntl(Fcntl::F_GETFL, 0) & ~Fcntl::O_NONBLOCK)
+			end
+
+			begin
+				return yield
+			ensure
+				nonblocking! if was_nonblocking
+			end
+		else
+			@io.fcntl(Fcntl::F_SETFL, @io.fcntl(Fcntl::F_GETFL, 0) & ~Fcntl::O_NONBLOCK)
+		end
+
+		self
 	end
 
+	alias sychronous! blocking!
+
 	def nonblocking!
-		@io.fcntl(Fcntl::F_SETFL, @io.fcntl(Fcntl::F_GETFL, 0) & ~Fcntl::O_NONBLOCK)
+		if block_given?
+			if was_blocking = blocking?
+				@io.fcntl(Fcntl::F_SETFL, @io.fcntl(Fcntl::F_GETFL, 0) | Fcntl::O_NONBLOCK)
+			end
+
+			begin
+				return yield
+			ensure
+				blocking! if was_blocking
+			end
+		else
+			@io.fcntl(Fcntl::F_SETFL, @io.fcntl(Fcntl::F_GETFL, 0) | Fcntl::O_NONBLOCK)
+		end
+
+		self
+	end
+
+	alias asynchronous! nonblocking!
+
+	def no_delay?
+		raise 'no_delay is TCP only' unless @io.is_a? TCPSocket
+
+		@io.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY).nonzero?
+	end
+
+	def delay?
+		!no_delay?
+	end
+
+	def no_delay!
+		raise 'no_delay is TCP only' unless @io.is_a? TCPSocket
+
+		@io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+		self
+	end
+
+	def delay!
+		raise 'no_delay is TCP only' unless @io.is_a? TCPSocket
+
+		@io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 0)
+
+		self
+	end
+
+	def transaction
+		unless to_io.is_a?(TCPSocket) && Socket.const_defined?(:TCP_CORK)
+			raise 'transaction is not supported on this kind of IO'
+		end
+
+		begin
+			@io.setsockopt Socket::IPPROTO_TCP, Socket::TCP_CORK, 1
+
+			yield self
+		ensure
+			@io.setsockopt Socket::IPPROTO_TCP, Socket::TCP_CORK, 0
+		end
+
+		self
+	end
+
+	def trap_in (lanterna)
+		raise 'already trapped' if @lanterna
+
+		@lanterna = lanterna
+	end
+
+	def set_free
+		raise 'not trapped' unless @lanterna
+
+		if @lanterna.has?(self)
+			@lanterna.remove(self)
+		end
+
+		@lanterna = nil
+	end
+
+	def readable?
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.readable? self
+	end
+
+	def readable!
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.readable! self
+
+		self
+	end
+
+	def no_readable!
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.no_readable! self
+
+		self
+	end
+
+	def writable?
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.writable? self
+	end
+
+	def writable!
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.writable! self
+
+		self
+	end
+
+	def no_writable!
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.no_writable! self
+
+		self
+	end
+
+	def delete!
+		raise 'not trapped' unless @lanterna
+
+		@lanterna.remove self
+
+		self
+	end
+
+	def accept (*args)
+		if blocking?
+			@io.accept(*args)
+		else
+			@io.accept_nonblock(*args)
+		end
+	end
+
+	def accept_nonblock (*args)
+		nonblocking! {
+			accept(*args)
+		}
+	end
+
+	def accept_block (*args)
+		blocking! {
+			accept(*args)
+		}
+	end
+
+	def read (*args)
+		if (result = @io.sysread(*args)).nil?
+			@closed = true
+		end
+
+		result
+	rescue EOFError
+		@closed = true
+
+		raise
+	end
+
+	def read_nonblock (*args)
+		nonblocking! {
+			read(*args)
+		}
+	end
+
+	def read_block (*args)
+		blocking! {
+			read(*args)
+		}
+	end
+
+	def write (*args)
+		@io.syswrite(*args)
+	rescue EOFError
+		@closed = true
+
+		raise
+	end
+
+	def write_nonblock (*args)
+		nonblocking! {
+			write(*args)
+		}
+	end
+
+	def write_block (*args)
+		blocking! {
+			write(*args)
+		}
 	end
 
 	def to_io

data/lib/barlume/version.rb

@@ -19,6 +19,6 @@
 
 module Barlume
 	def self.version
-		'0.0.1.rc.1'
+		'0.0.1.rc.2'
 	end
 end

data/test/benchmark.client.rb

@@ -0,0 +1,17 @@
+#! /usr/bin/env ruby
+require 'socket'
+require 'thread'
+
+2.times.map {
+	Thread.new {
+		sockets = []
+
+		100.times {
+			sockets << TCPSocket.new('localhost', 43215)
+		}
+
+		sockets.each {|socket|
+			socket.puts 'a' * 4096
+		}
+	}
+}.each(&:join)

data/test/benchmark.server.rb

@@ -0,0 +1,35 @@
+#! /usr/bin/env ruby
+require 'barlume'
+
+lantern = Barlume::Lanterna.best
+server  = lantern.add(TCPServer.new(43215))
+bytes   = 0
+clients = 0
+
+puts "Using #{lantern.name}..."
+
+trap 'INT' do
+	puts "Received #{bytes} bytes from #{clients} clients"
+	exit!
+end
+
+loop do
+	lantern.readable.each {|lucciola|
+		if lucciola == server
+			while client = server.accept_nonblock rescue nil
+				clients += 1
+				lantern.add(client)
+			end
+		else
+			begin
+				while value = lucciola.read(2048)
+					bytes += value.bytesize
+				end
+			rescue EOFError, Errno::EAGAIN; end
+
+			if lucciola.closed?
+				lantern.remove(lucciola)
+			end
+		end
+	}
+end

data/test/flood.js

@@ -0,0 +1,28 @@
+var net   = require('net');
+
+var created  = 255,
+    answered = 0,
+    errored  = 0,
+    time     = +new Date;
+
+
+function createClient() {
+  var socket = net.createConnection(1337, '127.0.0.1');
+  socket.setEncoding('utf8');
+  socket
+    .on('connect', function() { socket.write('lol'); })
+    .on('data', function(c) {
+      errored += c !== 'lol' ? 1 : 0;
+      if(++answered === created) {
+        var t = +new Date - time;
+        console.log('Time (ms): ' + t);
+        console.log('Errored: ' + errored);
+        process.exit();
+      }
+    });
+}
+
+for(var i=0; i <= created; i++) {
+  createClient(); 
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barlume
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc.1
+  version: 0.0.1.rc.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: meh@paranoici.org
 executables: []
@@ -35,16 +51,22 @@ extra_rdoc_files: []
 files:
 - README.md
 - barlume.gemspec
-- examples/test.rb
+- examples/echo.rb
+- examples/slowpokes.rb
 - lib/barlume.rb
 - lib/barlume/lanterna.rb
+- lib/barlume/lanterna/dpoll.rb
 - lib/barlume/lanterna/epoll.rb
+- lib/barlume/lanterna/helpers.rb
 - lib/barlume/lanterna/kqueue.rb
 - lib/barlume/lanterna/poll.rb
+- lib/barlume/lanterna/port.rb
 - lib/barlume/lanterna/select.rb
-- lib/barlume/lanterna/utils.rb
 - lib/barlume/lucciola.rb
 - lib/barlume/version.rb
+- test/benchmark.client.rb
+- test/benchmark.server.rb
+- test/flood.js
 homepage: http://github.com/meh/barlume
 licenses: []
 post_install_message: 
@@ -69,4 +91,7 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A dim light over asynchronous I/O land.
-test_files: []
+test_files:
+- test/benchmark.client.rb
+- test/benchmark.server.rb
+- test/flood.js