eventmachine-le 1.1.0 → 1.1.1

data/.gitignore

@@ -15,6 +15,7 @@ Makefile
 java/src/.project
 *.rbc
 Gemfile.lock
+*.gem
 
 .yardoc/*
 doc/*

data/README.md

@@ -1,6 +1,9 @@
-# About EventMachine-LE #
+# EventMachine-LE #
+
+EventMachine-LE (Live Edition) is a branch of [EventMachine](http://github.com/eventmachine/eventmachine) with fixes and more features.
+
+* Home page: http://ibc.github.com/EventMachine-LE/
 
-EventMachine-LE (Live Edition) is a branch of [EventMachine](http://github.com/eventmachine/eventmachine).
 
 ## What do you mean by "branch"? ##
 
@@ -34,9 +37,12 @@ EventMachine-LE draws from a number of dormant pull requests on the
 mainline version of EventMachine.  New proposals will also directly
 come to EventMachine-LE and will be included once they are tested.
 
-This is not a "development branch" — we do intend to use
-EventMachine-LE in production, just beyond the focus of mainline
-EventMachine.
+This is not a "development branch" — we do use EventMachine-LE in production,
+just beyond the focus of mainline EventMachine.
+
+The intention is that EventMachine-LE is always a drop-in replacement
+for EventMachine, just with additional (and fixed) functionality.
+
 
 ## Features and changes ##
 
@@ -50,13 +56,14 @@ the following features/fixes have been applied in EventMachine-LE:
 * `EM::get_max_timers` and `EM::set_max_timers` are removed (they still exist but do nothing). This solves the annoying "RuntimeError: max timers exceeded" exception.
 * Support for Enumerable in `EM::Iterator` ([fl00r](https://github.com/eventmachine/eventmachine/pull/300)).
 * Improvements to `EM::Protocols::LineProtocol` and have it autoload ([gaffneyc](https://github.com/eventmachine/eventmachine/pull/151)).
-* `EM::Protocols::SmtpServer`: support multiple messages per one connection ([bogdan](https://github.com/eventmachine/eventmachine/pull/288)).
+* `EM::Protocols::SmtpServer`: support multiple messages per one connection and login auth type ([bogdan](https://github.com/eventmachine/eventmachine/pull/288)).
+* Reimplement `EM::Queue` to avoid shift/push performance problem ([grddev](https://github.com/eventmachine/eventmachine/pull/311)).
 * Many code cleanups.
 
 
 ## Installation ##
 
-Install the Ruby Gem:
+The Current stable version is eventmachine-le-1.1.0 (published as Ruby Gem), installable via:
 <pre>
 gem install eventmachine-le
 </pre>
@@ -69,11 +76,16 @@ gem install eventmachine-le --pre
 
 ## Usage ##
 
-In order to use this branch in your project, make sure you load it as follows:
+Using EventMachine-LE within your project just requires loading it as follows:
 <pre>
 # First load EventMachine-LE.
 require "eventmachine-le"
-# Later load any other Ruby Gem depending on EventMachine so they will use EventMachine-LE.
+
+# NOTE: It does not hurt to call "require 'eventmachine'" later
+# (it has no effect at all).
+
+# Then load any other Ruby Gem depending on EventMachine so it
+# will use EventMachine-LE.
 require "em-udns"
 </pre>
 

data/ext/rubymain.cpp

@@ -516,7 +516,7 @@ static VALUE t_connect_server (VALUE self, VALUE server, VALUE port)
 			rb_raise (EM_eConnectionError, "no connection");
 		return ULONG2NUM (f);
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -537,7 +537,7 @@ static VALUE t_bind_connect_server (VALUE self, VALUE bind_addr, VALUE bind_port
 			rb_raise (EM_eConnectionError, "no connection");
 		return ULONG2NUM (f);
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -859,7 +859,7 @@ static VALUE t_watch_filename (VALUE self, VALUE fname)
 	try {
 		return ULONG2NUM(evma_watch_filename(StringValuePtr(fname)));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eUnsupported, e.what());
+		rb_raise (EM_eUnsupported, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -885,7 +885,7 @@ static VALUE t_watch_pid (VALUE self, VALUE pid)
 	try {
 		return ULONG2NUM(evma_watch_pid(NUM2INT(pid)));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eUnsupported, e.what());
+		rb_raise (EM_eUnsupported, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -1085,7 +1085,7 @@ static VALUE t_start_proxy (VALUE self, VALUE from, VALUE to, VALUE bufsize, VAL
 	try {
 		evma_start_proxy(NUM2ULONG (from), NUM2ULONG (to), NUM2ULONG(bufsize), NUM2ULONG(length));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -1100,7 +1100,7 @@ static VALUE t_stop_proxy (VALUE self, VALUE from)
 	try{
 		evma_stop_proxy(NUM2ULONG (from));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -1114,7 +1114,7 @@ static VALUE t_proxied_bytes (VALUE self, VALUE from)
 	try{
 		return ULONG2NUM(evma_proxied_bytes(NUM2ULONG (from)));
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, e.what(), "%s");
 	}
 	return Qnil;
 }
@@ -1139,7 +1139,7 @@ static VALUE t_get_idle_time (VALUE self, VALUE from)
 			return Qnil;
 		}
 	} catch (std::runtime_error e) {
-		rb_raise (EM_eConnectionError, e.what());
+		rb_raise (EM_eConnectionError, e.what(), "%s");
 	}
 	return Qnil;
 }

data/lib/em/iterator.rb

@@ -1,7 +1,29 @@
 module EventMachine
+
+  # EventMachine::Queue support
+  #
+  #   queue = EM::Queue.new
+  #   queue.push "glasses", "apples"
+  #   result = []
+  #   EM::Iterator.new(queue).each do |item, iter|
+  #     result << "I have got #{item}"
+  #     iter.next
+  #   end
+  #   queue.push "cars", "elephants"
+  #   p result
+  #   #=> ["I have got glasses", "I have got apples", "I have got cars", "I have got elephants"]
+  #
+  class QueueIsEmpty < RuntimeError; end
+  module IteratorWithQueue
+    def next_from_queue?
+      raise(QueueIsEmpty) if @queue.empty?
+      @queue.pop{ |q| @next_item = q}
+      true
+    end
+  end
+
   # Support for Enumerable in Ruby 1.9+
   module IteratorWithEnumerable
-    attr_reader :next_item
 
     # In case of Enumerable object we can use lazyness of Enumerator
     def setup_list(list)
@@ -25,7 +47,6 @@ module EventMachine
 
   # Ruby 1.8 uses continuations in Enumerable, so we should use Arrays
   module IteratorWithArray
-    attr_reader :next_item
 
     def setup_list(list)
       raise ArgumentError, 'argument must be an array' unless list.respond_to?(:to_a)
@@ -82,8 +103,11 @@ module EventMachine
   #
 
   class Iterator
+    attr_reader :next_item
+
     include IteratorWithEnumerable if defined? Fiber
     include IteratorWithArray unless defined? Fiber
+    include IteratorWithQueue
 
     # Create a new parallel async iterator with specified concurrency.
     #
@@ -93,7 +117,12 @@ module EventMachine
     # is started via #each, #map or #inject
     #
     def initialize(list, concurrency = 1)
-      @list = setup_list(list)
+      if list.class == EventMachine::Queue
+        @queue = list
+        alias :next? :next_from_queue?
+      else
+        @list = setup_list(list)
+      end
       @concurrency = concurrency
 
       @started = false
@@ -140,32 +169,36 @@ module EventMachine
       @process_next = proc{
         # p [:process_next, :pending=, @pending, :workers=, @workers, :ended=, @ended, :concurrency=, @concurrency, :list=, @list]
         unless @ended or @workers > @concurrency
-          if next?
-            item = next_item
-            @pending += 1
-
-            is_done = false
-            on_done = proc{
-              raise RuntimeError, 'already completed this iteration' if is_done
-              is_done = true
-
-              @pending -= 1
-
-              if @ended
-                all_done.call
-              else
-                EM.next_tick(@process_next)
+          begin
+            if next?
+              item = next_item
+              @pending += 1
+
+              is_done = false
+              on_done = proc{
+                raise RuntimeError, 'already completed this iteration' if is_done
+                is_done = true
+
+                @pending -= 1
+
+                if @ended
+                  all_done.call
+                else
+                  EM.next_tick(@process_next)
+                end
+              }
+              class << on_done
+                alias :next :call
               end
-            }
-            class << on_done
-              alias :next :call
-            end
 
-            foreach.call(item, on_done)
-          else
-            @ended = true
-            @workers -= 1
-            all_done.call
+              foreach.call(item, on_done)
+            else
+              @ended = true
+              @workers -= 1
+              all_done.call
+            end
+          rescue EventMachine::QueueIsEmpty
+            EM.next_tick(@process_next)
           end
         else
           @workers -= 1

data/lib/em/queue.rb

@@ -17,7 +17,8 @@ module EventMachine
   #
   class Queue
     def initialize
-      @items = []
+      @sink  = []
+      @drain = []
       @popq  = []
     end
 
@@ -29,10 +30,14 @@ module EventMachine
     def pop(*a, &b)
       cb = EM::Callback(*a, &b)
       EM.schedule do
-        if @items.empty?
+        if @drain.empty?
+          @drain = @sink
+          @sink = []
+        end
+        if @drain.empty?
           @popq << cb
         else
-          cb.call @items.shift
+          cb.call @drain.shift
         end
       end
       nil # Always returns nil
@@ -43,8 +48,12 @@ module EventMachine
     # next reactor tick.
     def push(*items)
       EM.schedule do
-        @items.push(*items)
-        @popq.shift.call @items.shift until @items.empty? || @popq.empty?
+        @sink.push(*items)
+        unless @popq.empty?
+          @drain = @sink
+          @sink = []
+          @popq.shift.call @drain.shift until @drain.empty? || @popq.empty?
+        end
       end
     end
     alias :<< :push
@@ -52,13 +61,13 @@ module EventMachine
     # @return [Boolean]
     # @note This is a peek, it's not thread safe, and may only tend toward accuracy.
     def empty?
-      @items.empty?
+      @drain.empty? && @sink.empty?
     end
 
     # @return [Integer] Queue size
     # @note This is a peek, it's not thread safe, and may only tend toward accuracy.
     def size
-      @items.size
+      @drain.size + @sink.size
     end
 
     # @return [Integer] Waiting size

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/tests/test_queue.rb

@@ -47,4 +47,18 @@ class TestEMQueue < Test::Unit::TestCase
     EM.run { EM.next_tick { EM.stop } }
     assert_equal many, q.num_waiting
   end
+
+  def test_big_queue
+    EM.run do
+      q = EM::Queue.new
+      2000.times do |i|
+        q.push(*0..1000)
+        q.pop { |v| assert_equal v, i % 1001 }
+      end
+      q.pop do
+        assert_equal 1_999_999, q.size
+        EM.stop
+      end
+    end
+  end
 end

metadata

@@ -1,91 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: eventmachine-le
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Francis Cianfrocca
 - Aman Gupta
 - hacked by Carsten Bormann and Inaki Baz Castillo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-13 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &21749960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.9
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *21749960
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &21749500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *21749500
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &21748940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: |
-  EventMachine-LE (Live Edition) is a branch of EventMachine (https://github.com/eventmachine/eventmachine).
-  
-  This branch incorporates interesting pull requests that are not yet included in the mainline EventMachine repository. The maintainers of that version prefer to minimize change in order to keep the stability with already existing EventMachine deployments, which provides an impressive multi-platform base for IPv4 TCP servers (e.g., Web servers) that don't need good UDP or IPv6 support.
-  
-  This dedication to stability is helpful for production use, but can also lead to ossification. The present "Live Edition" or "Leading Edge" branch has its focus on supporting a somewhat wider use, including new Web servers or protocols beyond the HTTP Web.
-  
-  To provide even more focus, this branch is currently applying its energy towards Linux and Unix/BSD/OSX environments. Java reactor and pure Ruby reactor are for now removed in this branch, and Windows/Cygwin support is untested. This may very well change later, once interesting pull requests come in.
-  
-  EventMachine-LE draws from a number of dormant pull requests on the mainline version of EventMachine. New proposals will also directly come to EventMachine-LE and will be included once they are tested.
-  
-  This is not a "development branch", EventMachine-LE is ready for production, just beyond the focus of mainline EventMachine.
+  prerelease: false
+  version_requirements: *21748940
+description: ! 'EventMachine-LE (Live Edition) is a branch of EventMachine (https://github.com/eventmachine/eventmachine).
+
+
+  This branch incorporates interesting pull requests that are not yet included in
+  the mainline EventMachine repository. The maintainers of that version prefer to
+  minimize change in order to keep the stability with already existing EventMachine
+  deployments, which provides an impressive multi-platform base for IPv4 TCP servers
+  (e.g., Web servers) that don''t need good UDP or IPv6 support.
+
 
-email: 
+  This dedication to stability is helpful for production use, but can also lead to
+  ossification. The present "Live Edition" or "Leading Edge" branch has its focus
+  on supporting a somewhat wider use, including new Web servers or protocols beyond
+  the HTTP Web.
+
+
+  To provide even more focus, this branch is currently applying its energy towards
+  Linux and Unix/BSD/OSX environments. Java reactor and pure Ruby reactor are for
+  now removed in this branch, and Windows/Cygwin support is untested. This may very
+  well change later, once interesting pull requests come in.
+
+
+  EventMachine-LE draws from a number of dormant pull requests on the mainline version
+  of EventMachine. New proposals will also directly come to EventMachine-LE and will
+  be included once they are tested.
+
+
+  This is not a "development branch", EventMachine-LE is ready for production, just
+  beyond the focus of mainline EventMachine.
+
+'
+email:
 - garbagecat10@gmail.com
 - aman@tmm1.net
 - cabo@tzi.org
 - ibc@aliax.net
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 - ext/fastfilereader/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - .gitignore
 - .yardopts
@@ -215,7 +216,7 @@ extra_rdoc_files:
 - tests/test_ud.rb
 - tests/test_udp46.rb
 - tests/test_unbind_reason.rb
-files: 
+files:
 - .gitignore
 - .yardopts
 - GNU
@@ -345,44 +346,35 @@ files:
 - tests/test_ud.rb
 - tests/test_udp46.rb
 - tests/test_unbind_reason.rb
-has_rdoc: true
 homepage: https://github.com/ibc/EventMachine-LE/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - EventMachine-LE
 - --main
 - README.md
 - -x
 - lib/em/version
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: EventMachine LE (Live Edition)
 test_files: []
-
+has_rdoc: