green 0.1 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    green (0.1)
+    green (0.1.1)
       kgio (= 2.7.4)
 
 GEM
@@ -23,15 +23,15 @@ GEM
     ansi (1.4.2)
     arel (3.0.2)
     builder (3.0.0)
-    columnize (0.3.5)
+    columnize (0.3.6)
     cookiejar (0.3.0)
-    debugger (1.1.3)
+    debugger (1.2.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.2)
-    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (~> 1.1.5)
+    debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.2)
+    debugger-ruby_core_source (1.1.5)
     em-http-request (1.0.2)
       addressable (>= 2.2.3)
       cookiejar

data/green.gemspec

@@ -4,8 +4,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'green'
-  s.version           = '0.1'
-  s.date              = '2012-12-13'
+
+  s.version           = '0.1.1'
+  s.date              = '2013-01-28'
+
   s.rubyforge_project = 'green'
 
   s.summary     = "Cooperative multitasking fo Ruby"
@@ -30,7 +32,9 @@ Gem::Specification.new do |s|
     app.ru
     green.gemspec
     lib/active_record/connection_adapters/green_mysql2_adapter.rb
+    lib/green-em.rb
     lib/green-em/em-http.rb
+    lib/green-em/tarantool.rb
     lib/green.rb
     lib/green/activerecord.rb
     lib/green/connection_pool.rb
@@ -64,4 +68,4 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
-end
+end

data/lib/green-em.rb

@@ -0,0 +1,24 @@
+require 'green'
+class Green
+  module EM
+    extend self
+    def sync(deferrable, params = {})
+      g = Green.current
+      deferrable.callback { |*args| g.switch(*get_args(args, params[:errback_args])) }
+      deferrable.errback { |*args| g.throw(get_args(args, params[:errback_args]).first) }
+      Green.hub.wait { deferrable.green_cancel }
+    end
+
+    def get_args(args, proc_args)
+      case proc_args
+      when Proc
+        proc.call(*args)
+      when nil
+        args
+      else
+        proc_args
+      end
+    end
+
+  end
+end

data/lib/green-em/em-http.rb

@@ -3,6 +3,7 @@ begin
 rescue LoadError => error
   raise "Missing EM-Synchrony dependency: gem install em-http-request"
 end
+require 'green-em'
 
 module EventMachine
   class HTTPException < RuntimeError; end
@@ -11,6 +12,7 @@ module EventMachine
        class_eval %[
          alias :a#{type} :#{type}
          def #{type}(options = {}, &blk)
+<<<<<<< HEAD
            g = Green.current
            conn = setup_request(:#{type}, options, &blk)
            if conn.error.nil?
@@ -18,6 +20,11 @@ module EventMachine
              conn.errback  { g.throw(HTTPException.new) }
              
              Green.hub.wait { conn.green_cancel }
+=======
+           conn = setup_request(:"#{type}", options, &blk)
+           if conn.error.nil?
+             Green::EM.sync conn, callback_args: [conn], errback_args: [HTTPException.new(conn)]
+>>>>>>> - Green::EM.sync
            else
              raise HTTPException.new
            end
@@ -25,4 +32,4 @@ module EventMachine
       ]
     end
   end
-end
+end

data/lib/green.rb

@@ -3,7 +3,8 @@ require 'pp'
 require 'thread'
 
 class Green
-  VERSION = "0.1"
+  VERSION = "0.1.1"
+
 
   module GreenMethods
     def switch(*args)
@@ -33,6 +34,12 @@ class Green
     def []=(name, val)
       locals[name] = val
     end
+
+    def schedule(*args)
+      Green.hub.callback { self.switch(*args) }
+    end
+
+    alias call schedule
   end
 
   class Proxy
@@ -112,6 +119,10 @@ class Green
     def list
       list_hash.values
     end
+
+    def init
+      hub
+    end
   end
 
   class GreenError < StandardError; end
@@ -136,11 +147,9 @@ class Green
       begin
         res = yield
       rescue GreenKill => e
-      rescue => e
-        Green.main.throw e
       end
       @alive = false
-      @callbacks.each { |c| 
+      @callbacks.each { |c|
         c.call(res)
       }
       Green.list_hash.delete self

data/lib/green/connection_pool.rb

@@ -1,72 +1,74 @@
 class Green
   class ConnectionPool
-    undef :send
+    class Proxy < BasicObject
+      def initialize(pool)
+        @pool = pool
+      end
+
+      def method_missing(method, *args, &blk)
+        @pool.execute do |conn|
+          conn.__send__(method, *args, &blk)
+        end
+      end
+    end
 
-    def initialize(opts, &block)
-      @reserved  = {}   # map of in-progress connections
+    attr_accessor :available, :pending, :disconnect_class, :new_block
+
+    def initialize(opts = {}, &block)
       @available = []   # pool of free connections
       @pending   = []   # pending reservations (FIFO)
 
+      @disconnect_class = opts[:disconnect_class]
+      @new_block = block
       opts[:size].times do
-        @available.push(block.call) if block_given?
+        @available.push(@new_block.call)
       end
     end
 
-    # Choose first available connection and pass it to the supplied
-    # block. This will block indefinitely until there is an available
-    # connection to service the request.
     def execute
-      g = Green.current
       begin
-        conn = acquire(g)
+        conn = acquire
         yield conn
+      rescue => e
+        if @disconnect_class && e.is_a?(@disconnect_class)
+          disconnected = true
+          @available << @new_block.call
+        else
+          raise
+        end
       ensure
-        release(g)
-      end
-    end
-
-    private
-
-      # Acquire a lock on a connection and assign it to executing fiber
-      # - if connection is available, pass it back to the calling block
-      # - if pool is full, yield the current fiber until connection is available
-      def acquire(green)
-        if conn = @available.pop
-          @reserved[green.object_id] = conn
-          conn
+        if disconnected
+          try_next
         else
-          @pending.push green
-          Green.hub.wait { @pending.delete green }
-          acquire(green)
+          release conn
+          try_next
         end
       end
+    end
 
-      # Release connection assigned to the supplied fiber and
-      # resume any other pending connections (which will
-      # immediately try to run acquire on the pool)
-      def release(green)
-        conn = @reserved.delete(green.object_id)
-        @available.push(conn)
+    def proxy
+      @proxy ||= Proxy.new(self)
+    end
 
-        if pending = @pending.shift
-          Green.hub.callback { pending.switch }
-        end
+    def acquire
+      g = Green.current
+      if conn = @available.pop
+        conn
+      else
+        @pending.push g
+        Green.hub.wait { @pending.delete g }
+        acquire
       end
+    end
 
-      # Allow the pool to behave as the underlying connection
-      #
-      # If the requesting method begins with "a" prefix, then
-      # hijack the callbacks and errbacks to fire a connection
-      # pool release whenever the request is complete. Otherwise
-      # yield the connection within execute method and release
-      # once it is complete (assumption: fiber will yield until
-      # data is available, or request is complete)
-      #
-      def method_missing(method, *args, &blk)
-        execute do |conn|
-          conn.__send__(method, *args, &blk)
-        end
+    def release(conn)
+      @available.push conn
+    end
+
+    def try_next
+      if pending = @pending.shift
+        Green.hub.callback { pending.switch }
       end
+    end
   end
-
-end
+end

data/lib/green/hub.rb

@@ -2,14 +2,25 @@ class Green
   class Hub
     attr_reader :g
     def initialize
+
+      start_hub
+    end
+
+    def start_hub
       c = Green.current
-      callback { c.switch }      
+      callback { c.switch }
       @g = Green.new do
-        run
+        begin
+          run
+        rescue => e
+          start_hub
+          raise
+        end
       end
       g.switch
     end
 
+
     def switch
       g.switch
     end
@@ -48,4 +59,4 @@ class Green
       raise "override"
     end
   end
-end
+end

data/lib/green/hub/em.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'eventmachine'
 
 class ::EM::Timer
@@ -20,7 +21,7 @@ class Green
       class SocketWaiter < Green::SocketWaiter
         class Handler < ::EM::Connection
           attr_accessor :green
-          def notify_readable        
+          def notify_readable
             green.switch
           end
 
@@ -55,7 +56,7 @@ class Green
       end
       # если мы запускаем приложение внутри thin или rainbows с EM, то значит мы уже внутри EM-реактора, а hub должен переключиться в main тред.
       def run
-        if ::EM.reactor_running?          
+        if ::EM.reactor_running?
           loop do
             Green.main.switch
           end
@@ -81,4 +82,4 @@ class Green
       end
     end
   end
-end
+end

data/lib/green/hub/nio4r.rb

@@ -1,6 +1,3 @@
-require 'nio'
-require 'algorithms'
-
 class Green
   class Hub
     class Nio4r < Hub
@@ -56,12 +53,15 @@ class Green
 
       attr_reader :callbacks, :timers, :cancel_timers
       def initialize(*args)
+        require 'nio'
+        require 'algorithms'
+
         @callbacks = []
         @timers = Containers::MinHeap.new
         @cancel_timers = {}
         super
       end
-      
+
       def reactor_running?
         @reactor_running
       end
@@ -105,7 +105,7 @@ class Green
             i += 1
           end
         ensure
-          @callbacks[0...0] = jobs[i..-1]  if i < jobs.size
+          @callbacks[0...0] = jobs[(i + 1)..-1]  if i < jobs.size
         end
       end
 

data/lib/green/semaphore.rb

@@ -47,7 +47,7 @@ class Green
         return counter
       else
         g = Green.current
-        clb = proc do 
+        clb = proc do          
           if counter >= v && @links.size == 0
             wait_links.delete clb
             Green.hub.callback { g.switch }            

data/spec/green/activerecord_spec.rb

@@ -1,100 +1,100 @@
-# DO NOT WORK
-
-require "spec_helper"
-require "green/activerecord"
-require 'green/group'
-
-
-# create database widgets;
-# use widgets;
-# create table widgets (
-# id INT NOT NULL AUTO_INCREMENT,
-# title varchar(255),
-# PRIMARY KEY (`id`)
-# );
-
-class Widget < ActiveRecord::Base; end;
-
-describe Green::ActiveRecord do
-  DELAY = 0.25
-  QUERY = "SELECT sleep(#{DELAY})"
-
-  def establish_connection
-    # ActiveRecord::Base.logger = Logger.new STDOUT
-    ActiveRecord::Base.establish_connection(
-      :adapter => 'green_mysql2',
-      :database => 'widgets',
-      :username => 'root',
-      :pool => 50
-    )
-    Widget.delete_all
-  end
-
-  before do
-    establish_connection
-  end
-
-  after do
-    ActiveRecord::Base.connection_pool.disconnect!
-  end
-
-  it "should establish AR connection" do
-    result = Widget.find_by_sql(QUERY)
-    result.size.must_equal 1
-  end
-
-  it "should fire sequential, synchronous requests within single green" do
-    start = Time.now.to_f
-    res = []
-
-    res.push Widget.find_by_sql(QUERY)
-    res.push Widget.find_by_sql(QUERY)
-
-    (Time.now.to_f - start.to_f).must_be_within_delta DELAY * res.size, DELAY * res.size * 0.15
-    res.size.must_equal 2
-  end
-
-  # it "should fire 100 requests" do
-  #   pool = Green::Pool.new size: 40, klass: Green::ActiveRecord
+# # DO NOT WORK
+
+# require "spec_helper"
+# require "green/activerecord"
+# require 'green/group'
+
+
+# # create database widgets;
+# # use widgets;
+# # create table widgets (
+# # id INT NOT NULL AUTO_INCREMENT,
+# # title varchar(255),
+# # PRIMARY KEY (`id`)
+# # );
+
+# class Widget < ActiveRecord::Base; end;
+
+# describe Green::ActiveRecord do
+#   DELAY = 0.25
+#   QUERY = "SELECT sleep(#{DELAY})"
+
+#   def establish_connection
+#     # ActiveRecord::Base.logger = Logger.new STDOUT
+#     ActiveRecord::Base.establish_connection(
+#       :adapter => 'green_mysql2',
+#       :database => 'widgets',
+#       :username => 'root',
+#       :pool => 50
+#     )
+#     Widget.delete_all
+#   end
+
+#   before do
+#     establish_connection
+#   end
+
+#   after do
+#     ActiveRecord::Base.connection_pool.disconnect!
+#   end
+
+#   it "should establish AR connection" do
+#     result = Widget.find_by_sql(QUERY)
+#     result.size.must_equal 1
+#   end
+
+#   it "should fire sequential, synchronous requests within single green" do
+#     start = Time.now.to_f
+#     res = []
+
+#     res.push Widget.find_by_sql(QUERY)
+#     res.push Widget.find_by_sql(QUERY)
+
+#     (Time.now.to_f - start.to_f).must_be_within_delta DELAY * res.size, DELAY * res.size * 0.15
+#     res.size.must_equal 2
+#   end
+
+#   # it "should fire 100 requests" do
+#   #   pool = Green::Pool.new size: 40, klass: Green::ActiveRecord
     
-  #   100.times do
-  #     pool.spawn do
-  #       widget = Widget.create title: 'hi'
-  #       widget.update_attributes title: 'hello'
-  #     end
-  #   end
-  #   pool.join
-  # end
-
-  it "should create widget" do
-    Widget.create
-    Widget.create
-    Widget.count.must_equal 2
-  end
-
-  it "should update widget" do
-    widget = Widget.create title: 'hi'
-    widget.update_attributes title: 'hello'
-    Widget.find(widget.id).title.must_equal 'hello'
-  end
-
-  # describe "transactions" do
-  #   it "should work properly" do
-  #     pool = Green::Pool.new size: 40, klass: Green::ActiveRecord
-  #     50.times do |i|
-  #       pool.spawn do
-  #         widget = Widget.create title: "hello"
-  #         ActiveRecord::Base.transaction do
-  #           widget.update_attributes title: "hi#{i}"
-  #           raise ActiveRecord::Rollback
-  #         end
-  #       end
-  #     end
-  #     pool.join
-  #     Widget.all.each do |widget|
-  #       widget.title.must_equal 'hello'
-  #     end
-  #   end
-  # end
-
-end
+#   #   100.times do
+#   #     pool.spawn do
+#   #       widget = Widget.create title: 'hi'
+#   #       widget.update_attributes title: 'hello'
+#   #     end
+#   #   end
+#   #   pool.join
+#   # end
+
+#   it "should create widget" do
+#     Widget.create
+#     Widget.create
+#     Widget.count.must_equal 2
+#   end
+
+#   it "should update widget" do
+#     widget = Widget.create title: 'hi'
+#     widget.update_attributes title: 'hello'
+#     Widget.find(widget.id).title.must_equal 'hello'
+#   end
+
+#   # describe "transactions" do
+#   #   it "should work properly" do
+#   #     pool = Green::Pool.new size: 40, klass: Green::ActiveRecord
+#   #     50.times do |i|
+#   #       pool.spawn do
+#   #         widget = Widget.create title: "hello"
+#   #         ActiveRecord::Base.transaction do
+#   #           widget.update_attributes title: "hi#{i}"
+#   #           raise ActiveRecord::Rollback
+#   #         end
+#   #       end
+#   #     end
+#   #     pool.join
+#   #     Widget.all.each do |widget|
+#   #       widget.title.must_equal 'hello'
+#   #     end
+#   #   end
+#   # end
+
+# end

data/spec/green/connection_pool_spec.rb

@@ -8,8 +8,7 @@ QUERY = "select sleep(#{DELAY})"
 
 describe Green::ConnectionPool do
 
-  
-  let(:pool) { Green::ConnectionPool.new(size: size) { Green::Mysql2::Client.new } }
+  let(:pool) { Green::ConnectionPool.new(size: size) { Green::Mysql2::Client.new }.proxy }
 
   describe "pool size is exceeded" do
     let(:size) { 1 }
@@ -17,7 +16,7 @@ describe Green::ConnectionPool do
       start = Time.now.to_f
 
       g = Green::Group.new
-      res = [] 
+      res = []
       g.spawn { res << pool.query(QUERY) }
       g.spawn { res << pool.query(QUERY) }
       g.join
@@ -42,4 +41,4 @@ describe Green::ConnectionPool do
       res.size.must_equal 2
     end
   end
-end
+end

data/spec/green/group_spec.rb

@@ -39,7 +39,8 @@ end
 describe Green::Pool do
   let(:e1) { Green::Event.new }
   let(:e2) { Green::Event.new }
-  let(:p) { Green::Pool.new size: 1}
+  let(:size) { 1 }
+  let(:p) { Green::Pool.new size: size }
 
   it "should wait each task" do
     result = ""
@@ -49,6 +50,27 @@ describe Green::Pool do
     result.must_equal "fizbaz"
   end
 
+  describe "spawn attack" do
+    let(:size) { 10 }
+    it "should work correctly" do     
+      i = 0
+      100.times { p.spawn { i += 1 } }
+      p.join
+      i.must_equal 100
+    end
+
+    describe "with random timer" do
+      it "should work correctly" do     
+        i = 0
+        100.times { p.spawn { Green.sleep(rand); i += 1 } }
+        p.join
+        i.must_equal 100
+      end
+    end
+  end
+
+
+
   # ugly test :(
   it "should block after limit" do
     i = 0

data/spec/green/mysql2_spec.rb

@@ -30,7 +30,7 @@ describe Green::Mysql2 do
   it "should fire simultaneous requests via pool" do
     db = Green::ConnectionPool.new(size: 2) do
       Green::Mysql2::Client.new
-    end
+    end.proxy
 
     start = Time.now.to_f
     res = []
@@ -49,4 +49,4 @@ describe Green::Mysql2 do
       db.query("SELECT * FROM i_hope_this_table_does_not_exist;")
     }.must_raise(Mysql2::Error)
   end
-end
+end

data/spec/green_spec.rb

@@ -34,4 +34,11 @@ describe Green do
       (Time.now - t).must_be :<, 0.1
     end
   end
-end
+
+  describe "exceptions" do
+    it "should raise exception from reactor to main fiber" do
+      Green.hub.callback { raise "ololo" }
+      proc { Green.sleep(0.1) }.must_raise RuntimeError
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: green
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -41,7 +41,9 @@ files:
 - app.ru
 - green.gemspec
 - lib/active_record/connection_adapters/green_mysql2_adapter.rb
+- lib/green-em.rb
 - lib/green-em/em-http.rb
+- lib/green-em/tarantool.rb
 - lib/green.rb
 - lib/green/activerecord.rb
 - lib/green/connection_pool.rb
@@ -84,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1130764657698221389
+      hash: 4284378326440113504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: