- kgio based sockets

- specs for sockets
- ConnectionPool, Mutex, ConditionVariable, Mysql2, ZMQ
- Many fixes & improvements
- ActiveRecord doesn't work yet :(

Author: prepor

Gemfile

@@ -2,12 +2,16 @@ source "http://rubygems.org"
 
 gem "eventmachine", "= 1.0.0.beta.4"
 gem "em-http-request"
+gem "ffi-rzmq"
+gem "mysql2"
 gem "unicorn"
+gem "activerecord"
 
 group :test do
   gem "rr"
   gem "minitest"
   gem "debugger"
+  gem "minitest-reporters"
 end
 
 gemspec

Gemfile.lock

@@ -2,11 +2,26 @@ PATH
   remote: .
   specs:
     green (0.0.1)
+      kgio (= 2.7.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     addressable (2.2.8)
+    ansi (1.4.2)
+    arel (3.0.2)
+    builder (3.0.0)
     columnize (0.3.5)
     cookiejar (0.3.0)
     debugger (1.1.3)
@@ -25,12 +40,25 @@ GEM
     em-socksify (0.2.0)
       eventmachine (>= 1.0.0.beta.4)
     eventmachine (1.0.0.beta.4)
+    ffi (1.0.11)
+    ffi-rzmq (0.9.3)
+      ffi
     http_parser.rb (0.5.3)
+    i18n (0.6.0)
     kgio (2.7.4)
     minitest (3.0.0)
+    minitest-reporters (0.7.1)
+      ansi
+      builder
+      minitest (>= 2.0, < 4.0)
+      ruby-progressbar
+    multi_json (1.3.6)
+    mysql2 (0.3.11)
     rack (1.4.1)
     raindrops (0.8.0)
     rr (1.0.4)
+    ruby-progressbar (0.0.10)
+    tzinfo (0.3.33)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack
@@ -40,10 +68,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
   debugger
   em-http-request
   eventmachine (= 1.0.0.beta.4)
+  ffi-rzmq
   green!
   minitest
+  minitest-reporters
+  mysql2
   rr
   unicorn

green.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md]
 
-
+  s.add_runtime_dependency("kgio", "2.7.4")
   # = MANIFEST =
   s.files = %w[
     Gemfile

lib/active_record/connection_adapters/green_mysql2_adapter.rb

@@ -0,0 +1,92 @@
+# AR adapter for using a green mysql2 connection
+# Just update your database.yml's adapter to be 'green_mysql2'
+
+require 'green/mysql2'
+require 'green/activerecord'
+require 'active_record/connection_adapters/mysql2_adapter'
+
+# module ActiveRecord
+#   class Base
+#     def self.green_mysql2_connection(config)
+#       client = Green::ActiveRecord::ConnectionPool.new(size: config[:pool]) do
+#         conn = ActiveRecord::ConnectionAdapters::GreenMysql2Adapter::Client.new(config.symbolize_keys)
+#         # From Mysql2Adapter#configure_connection
+#         conn.query_options.merge!(:as => :array)
+
+#         # By default, MySQL 'where id is null' selects the last inserted id.
+#         # Turn this off. http://dev.rubyonrails.org/ticket/6778
+#         variable_assignments = ['SQL_AUTO_IS_NULL=0']
+#         encoding = config[:encoding]
+#         variable_assignments << "NAMES '#{encoding}'" if encoding
+
+#         wait_timeout = config[:wait_timeout]
+#         wait_timeout = 2592000 unless wait_timeout.is_a?(Fixnum)
+#         variable_assignments << "@@wait_timeout = #{wait_timeout}"
+
+#         conn.query("SET #{variable_assignments.join(', ')}")
+#         conn
+#       end 
+#       options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+#       ActiveRecord::ConnectionAdapters::GreenMysql2Adapter.new(client, logger, options, config)
+#     end
+#   end
+
+#   module ConnectionAdapters
+#     class GreenMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+
+#       class Column < AbstractMysqlAdapter::Column # :nodoc:
+#         def adapter
+#           GreenMysql2Adapter
+#         end
+#       end
+
+#       ADAPTER_NAME = 'GreenMysql2'
+
+#       class Client < Green::Mysql2::Client
+#         include Green::ActiveRecord::Client
+#       end
+
+#       include Green::ActiveRecord::Adapter
+
+#       def connect
+        
+#       end
+#     end
+#   end
+# end
+
+
+
+module ActiveRecord
+  class Base
+    def self.green_mysql2_connection(config)
+      config[:username] = 'root' if config[:username].nil?
+
+      if Mysql2::Client.const_defined? :FOUND_ROWS
+        config[:flags] = Mysql2::Client::FOUND_ROWS
+      end
+
+      client = Green::Mysql2::Client.new(config.symbolize_keys)
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      ConnectionAdapters::GreenMysql2Adapter.new(client, logger, options, config)
+    end
+  end
+
+  module ConnectionAdapters
+    class GreenMysql2Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+
+      class Column < AbstractMysqlAdapter::Column # :nodoc:
+        def adapter
+          GreenMysql2Adapter
+        end
+      end
+
+      ADAPTER_NAME = 'GreenMysql2'
+
+      def connect
+        @connection = Green::Mysql2::Client.new(@config)
+        configure_connection
+      end
+    end
+  end
+end

lib/green.rb

@@ -4,7 +4,39 @@
 
 class Green
   VERSION = "0.0.1"
+
+  module GreenMethods
+    def switch(*args)
+      f.transfer(*args).tap do |*res|
+        if res.size == 1 && res.first.is_a?(ThrowException)
+          raise(res.first.exc)
+        end
+      end
+    end
+    
+    def throw(exc = RuntimeException.new)
+      Green.hub.callback { switch(ThrowException.new exc) }
+    end
+
+    def kill
+      self.throw(GreenKill.new)
+    end
+
+    def locals
+      f.local_fiber_variables
+    end
+
+    def [](name)
+      locals[name]
+    end
+
+    def []=(name, val)
+      locals[name] = val
+    end
+  end
+
   class Proxy
+    include GreenMethods
     attr_reader :f
     def initialize
       @f = Fiber.current
@@ -13,6 +45,10 @@ def initialize
     def switch(*args)
       f.transfer(*args)
     end
+
+    def alive?
+      f.alive?
+    end
   end
 
   class SocketWaiter
@@ -89,42 +125,51 @@ def timeout(n, &blk)
     end
   end
 
-  # class GreenError < StandardError; end
-  # class GreenKill < GreenError; end
+  class GreenError < StandardError; end
+  class GreenKill < GreenError; end
+
+  class ThrowException < Struct.new(:exc); end
 
   require 'green/ext'
   require 'green/hub'
 
   require 'green/hub/em'
 
+  include GreenMethods
+
   attr_reader :f, :callbacks
-  def initialize()
+  def initialize
     @callbacks = []
+    @alive = true
     @f = Fiber.new do
-      res = yield
-      @callbacks.each { |c| c.call(*res) }
+      begin
+        *res = yield
+      rescue GreenKill => e
+      end
+      @alive = false
+      @callbacks.each { |c| 
+        c.call(*res)
+      }
       Green.hub.switch
     end
     @f[:green] = self
   end
 
-
-  def switch(*args)
-    f.transfer(*args).tap do |*res|
-      res.size == 1 && res.first.is_a?(Exception) && raise(res.first)
-    end
-  end
-
-  def throw(exc = RuntimeException.new)
-    switch(exc)
+  def alive?
+    @alive
   end
 
   def start
     Green.hub.callback { self.switch }
   end
 
-  def callback(&blk)
-    callbacks << blk
+  def callback(cb=nil, &blk)
+    cb ||= blk
+    if alive?
+      callbacks << cb
+    else
+      Green.hub.callback(cb)
+    end
   end
 
   def join
@@ -133,9 +178,5 @@ def join
     Green.hub.switch
   end
 
-  # def kill
-  #   self.throw(GreenKill.new)
-  # end
-
   MAIN = Fiber.current[:green] = Proxy.new
 end