hessian2 2.0.2 → 2.0.3

data/test/async/em_http_sleep.rb

@@ -1,25 +1,25 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'eventmachine'
-require 'em-synchrony/em-http'
-
-EM.run do
-  @number_of.times do |i|
-    puts i
-    http = EM::HttpRequest.new("http://127.0.0.1:8080/sleep").apost
-    http.callback do |r| 
-      puts 'callback' 
-      @results << r.response
-      EM.stop if @results.size >= @number_of
-    end
-
-    http.errback do |r|
-      puts "errback #{r.error}"
-      EM.stop
-    end
-  end
-
-  puts "results.size #{@results.size}"
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'eventmachine'
+require 'em-synchrony/em-http'
+
+EM.run do
+  @number_of.times do |i|
+    puts i
+    http = EM::HttpRequest.new("http://127.0.0.1:8080/sleep").apost
+    http.callback do |r| 
+      puts 'callback' 
+      @results << r.response
+      EM.stop if @results.size >= @number_of
+    end
+
+    http.errback do |r|
+      puts "errback #{r.error}"
+      EM.stop
+    end
+  end
+
+  puts "results.size #{@results.size}"
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/async/monkey.asleep.rb

@@ -1,27 +1,27 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'eventmachine'
-
-client = Hessian2::Client.new('http://127.0.0.1:8080/', async: true)
-
-EM.run do
-  @number_of.times do |i|
-    puts i
-    http = client.asleep
-    http.callback do |r|
-      puts 'callback'
-      @results << Hessian2.parse_rpc(r.response)
-      EM.stop if @results.size >= @number_of
-    end
-
-    http.errback do |r|
-      puts "errback #{r.error}"
-      @results << nil
-      EM.stop
-    end
-  end
-
-  puts "results.size #{@results.size}"
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'eventmachine'
+
+client = Hessian2::Client.new('http://127.0.0.1:8080/', async: true)
+
+EM.run do
+  @number_of.times do |i|
+    puts i
+    http = client.asleep
+    http.callback do |r|
+      puts 'callback'
+      @results << Hessian2.parse_rpc(r.response)
+      EM.stop if @results.size >= @number_of
+    end
+
+    http.errback do |r|
+      puts "errback #{r.error}"
+      @results << nil
+      EM.stop
+    end
+  end
+
+  puts "results.size #{@results.size}"
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/async/mysql2_aquery.rb

@@ -1,37 +1,37 @@
-require 'em-synchrony'
-require 'em-synchrony/mysql2'
-require 'em-synchrony/fiber_iterator'
-require 'yaml'
-
-options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
-puts options.inspect
-
-number_of = 10
-concurrency = 2
-connection_pool_size = 4
-results = []
-
-db = EM::Synchrony::ConnectionPool.new(size: connection_pool_size) do
-  Mysql2::EM::Client.new(options)
-end
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...number_of, concurrency).each do |i|
-    puts i
-    aquery = db.aquery('select sleep(1)')
-    aquery.callback do |r| 
-      puts 'callback' 
-      results << r.first
-      EM.stop if results.size >= number_of
-    end
-  end
-
-  puts "results.size #{results.size}"
-end
-
-puts results.inspect
-puts "results.size #{results.size}"
-
-# time ruby test/async/mysql2_aquery.rb
-# 并发数 >= db连接池的场合，aquery要等空闲连接出来，耗时和query一样
-# 并发数 < db连接池的场合，aquery可以马上用空闲连接发起下一波查询，也就更早拿到callback，比query快
+require 'em-synchrony'
+require 'em-synchrony/mysql2'
+require 'em-synchrony/fiber_iterator'
+require 'yaml'
+
+options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
+puts options.inspect
+
+number_of = 10
+concurrency = 2
+connection_pool_size = 4
+results = []
+
+db = EM::Synchrony::ConnectionPool.new(size: connection_pool_size) do
+  Mysql2::EM::Client.new(options)
+end
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...number_of, concurrency).each do |i|
+    puts i
+    aquery = db.aquery('select sleep(1)')
+    aquery.callback do |r| 
+      puts 'callback' 
+      results << r.first
+      EM.stop if results.size >= number_of
+    end
+  end
+
+  puts "results.size #{results.size}"
+end
+
+puts results.inspect
+puts "results.size #{results.size}"
+
+# time ruby test/async/mysql2_aquery.rb
+# 并发数 >= db连接池的场合，aquery要等空闲连接出来，耗时和query一样
+# 并发数 < db连接池的场合，aquery可以马上用空闲连接发起下一波查询，也就更早拿到callback，比query快

data/test/fault/monkey.undefined_method.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../prepare',  __FILE__)
-
-client = Hessian2::Client.new('http://127.0.0.1:8080/')
-
-puts client.undefined_method
+require File.expand_path('../../prepare',  __FILE__)
+
+client = Hessian2::Client.new('http://127.0.0.1:8080/')
+
+puts client.undefined_method

data/test/fault/monkey.wrong_arguments.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../prepare',  __FILE__)
-
-client = Hessian2::Client.new('http://127.0.0.1:8080/')
-
-puts client.sleep('wrong', 'arguments')
+require File.expand_path('../../prepare',  __FILE__)
+
+client = Hessian2::Client.new('http://127.0.0.1:8080/')
+
+puts client.sleep('wrong', 'arguments')

data/test/fiber_concurrency/em_http_asleep.rb

@@ -1,17 +1,17 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'em-synchrony'
-require 'em-synchrony/em-http'
-require 'em-synchrony/fiber_iterator'
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
-    puts i
-    @results << EM::HttpRequest.new("http://127.0.0.1:8080/asleep").post.response
-  end
-
-  puts "results.size #{@results.size}"
-  EM.stop
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'em-synchrony'
+require 'em-synchrony/em-http'
+require 'em-synchrony/fiber_iterator'
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
+    puts i
+    @results << EM::HttpRequest.new("http://127.0.0.1:8080/asleep").post.response
+  end
+
+  puts "results.size #{@results.size}"
+  EM.stop
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/fiber_concurrency/em_http_sleep.rb

@@ -1,17 +1,17 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'em-synchrony'
-require 'em-synchrony/em-http'
-require 'em-synchrony/fiber_iterator'
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
-    puts i
-    @results << EM::HttpRequest.new("http://127.0.0.1:8080/sleep").post.response
-  end
-
-  puts "results.size #{@results.size}"
-  EM.stop
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'em-synchrony'
+require 'em-synchrony/em-http'
+require 'em-synchrony/fiber_iterator'
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
+    puts i
+    @results << EM::HttpRequest.new("http://127.0.0.1:8080/sleep").post.response
+  end
+
+  puts "results.size #{@results.size}"
+  EM.stop
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/fiber_concurrency/monkey.asleep.fiber_aware.rb

@@ -1,18 +1,18 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'em-synchrony'
-require 'em-synchrony/fiber_iterator'
-
-client = Hessian2::Client.new('http://127.0.0.1:8080/', fiber_aware: true)
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
-    puts i
-    @results << client.asleep
-  end
-
-  puts "results.size #{@results.size}"
-  EM.stop
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'em-synchrony'
+require 'em-synchrony/fiber_iterator'
+
+client = Hessian2::Client.new('http://127.0.0.1:8080/', fiber_aware: true)
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
+    puts i
+    @results << client.asleep
+  end
+
+  puts "results.size #{@results.size}"
+  EM.stop
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/fiber_concurrency/mysql2_query.rb

@@ -1,29 +1,29 @@
-require 'em-synchrony'
-require 'em-synchrony/mysql2'
-require 'em-synchrony/fiber_iterator'
-require 'yaml'
-
-options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
-puts options.inspect
-
-number_of = 10
-concurrency = 2
-connection_pool_size = 4
-results = []
-
-db = EM::Synchrony::ConnectionPool.new(size: connection_pool_size) do
-  Mysql2::EM::Client.new(options)
-end
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...number_of, concurrency).each do |i|
-    puts i
-    results << db.query('select sleep(1)').first
-  end
-
-  puts "results.size #{results.size}"
-  EM.stop
-end
-
-puts results.inspect
-puts "results.size #{results.size}"
+require 'em-synchrony'
+require 'em-synchrony/mysql2'
+require 'em-synchrony/fiber_iterator'
+require 'yaml'
+
+options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
+puts options.inspect
+
+number_of = 10
+concurrency = 2
+connection_pool_size = 4
+results = []
+
+db = EM::Synchrony::ConnectionPool.new(size: connection_pool_size) do
+  Mysql2::EM::Client.new(options)
+end
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...number_of, concurrency).each do |i|
+    puts i
+    results << db.query('select sleep(1)').first
+  end
+
+  puts "results.size #{results.size}"
+  EM.stop
+end
+
+puts results.inspect
+puts "results.size #{results.size}"

data/test/fiber_concurrency/net_http_asleep.rb

@@ -1,19 +1,19 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'em-synchrony'
-require 'em-synchrony/fiber_iterator'
-require 'net/http'
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
-    puts i
-    Net::HTTP.new('127.0.0.1', 8080).start do |http|
-      @results << http.request(Net::HTTP::Post.new('/asleep')).body
-    end
-  end
-
-  puts "results.size #{@results.size}"
-  EM.stop
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'em-synchrony'
+require 'em-synchrony/fiber_iterator'
+require 'net/http'
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
+    puts i
+    Net::HTTP.new('127.0.0.1', 8080).start do |http|
+      @results << http.request(Net::HTTP::Post.new('/asleep')).body
+    end
+  end
+
+  puts "results.size #{@results.size}"
+  EM.stop
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/fiber_concurrency/net_http_sleep.rb

@@ -1,19 +1,19 @@
-require File.expand_path('../../prepare', __FILE__)
-require 'em-synchrony'
-require 'em-synchrony/fiber_iterator'
-require 'net/http'
-
-EM.synchrony do
-  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
-    puts i
-    Net::HTTP.new('127.0.0.1', 8080).start do |http|
-      @results << http.request(Net::HTTP::Post.new('/sleep')).body
-    end
-  end
-
-  puts "results.size #{@results.size}"
-  EM.stop
-end
-
-puts @results.inspect
-puts "results.size #{@results.size}"
+require File.expand_path('../../prepare', __FILE__)
+require 'em-synchrony'
+require 'em-synchrony/fiber_iterator'
+require 'net/http'
+
+EM.synchrony do
+  EM::Synchrony::FiberIterator.new(0...@number_of, @concurrency).each do |i|
+    puts i
+    Net::HTTP.new('127.0.0.1', 8080).start do |http|
+      @results << http.request(Net::HTTP::Post.new('/sleep')).body
+    end
+  end
+
+  puts "results.size #{@results.size}"
+  EM.stop
+end
+
+puts @results.inspect
+puts "results.size #{@results.size}"

data/test/fibered_rainbows/Gemfile

@@ -1,15 +1,15 @@
-source "http://ruby.taobao.org"
-
-gem 'em-synchrony', require: ['em-synchrony']
-
-gem 'activerecord'
-
-gem 'bigdecimal'
-
-gem 'rack-fiber_pool'
-
-gem 'rainbows'
-
-gem 'sinatra'
-
-gem 'sinatra-contrib'
+source "http://ruby.taobao.org"
+
+gem 'em-synchrony', require: ['em-synchrony']
+
+gem 'activerecord'
+
+gem 'bigdecimal'
+
+gem 'rack-fiber_pool'
+
+gem 'rainbows'
+
+gem 'sinatra'
+
+gem 'sinatra-contrib'

data/test/fibered_rainbows/config.ru

@@ -1,11 +1,11 @@
-lib_path = File.expand_path('../../../lib', __FILE__)
-$:.unshift(lib_path)
-
-require 'hessian2'
-require 'bundler'
-Bundler.require
-
-use Rack::FiberPool
-
-require ::File.expand_path('../../app',  __FILE__)
-run Sinatra::Application
+lib_path = File.expand_path('../../../lib', __FILE__)
+$:.unshift(lib_path)
+
+require 'hessian2'
+require 'bundler'
+Bundler.require
+
+use Rack::FiberPool
+
+require ::File.expand_path('../../app',  __FILE__)
+run Sinatra::Application

data/test/fibered_rainbows/rainbows.rb

@@ -1,13 +1,13 @@
-Rainbows! do
-  use :EventMachine
-end
-
-worker_processes 1
-
-timeout 30
-
-pid '/tmp/monkey.pid'
-
-preload_app true
-GC.respond_to?(:copy_on_write_friendly=) and
-  GC.copy_on_write_friendly = true
+Rainbows! do
+  use :EventMachine
+end
+
+worker_processes 1
+
+timeout 30
+
+pid '/tmp/monkey.pid'
+
+preload_app true
+GC.respond_to?(:copy_on_write_friendly=) and
+  GC.copy_on_write_friendly = true

data/test/monkey_service.rb

@@ -1,16 +1,16 @@
-class MonkeyService
-  extend Hessian2::Handler
-
-  def self.sleep(name = '')
-    Kernel.sleep 1
-
-    "wake #{name}"
-  end
-
-  def self.asleep(name = '')
-    EM::Synchrony.sleep(1)
-
-    "awake #{name}"
-  end
-
-end
+class MonkeyService
+  extend Hessian2::Handler
+
+  def self.sleep(name = '')
+    Kernel.sleep 1
+
+    "wake #{name}"
+  end
+
+  def self.asleep(name = '')
+    EM::Synchrony.sleep(1)
+
+    "awake #{name}"
+  end
+
+end

data/test/prepare.rb

@@ -1,7 +1,7 @@
-lib_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib_path)
-require 'hessian2'
-
-@number_of = 10
-@concurrency = 2
-@results = []
+lib_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(lib_path)
+require 'hessian2'
+
+@number_of = 10
+@concurrency = 2
+@results = []

data/test/thread_concurrency/active_record_execute.rb

@@ -1,29 +1,29 @@
-require 'active_record'
-require 'thread/pool'
-require 'yaml'
-
-options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
-puts options.inspect
-
-number_of = 10
-concurrency = 2
-connection_pool_size = 4
-results = []
-
-thread_pool = Thread.pool(concurrency)
-db = ActiveRecord::Base.establish_connection(options.merge('pool' => connection_pool_size))
-
-number_of.times do |i|
-  thread_pool.process do
-    puts i
-    results << ActiveRecord::Base.connection_pool.with_connection do |conn|
-      conn.execute('select sleep(1)').first
-    end
-  end
-end
-
-puts "results.size #{results.size}"
-thread_pool.shutdown
-
-puts results.inspect
-puts "results.size #{results.size}"
+require 'active_record'
+require 'thread/pool'
+require 'yaml'
+
+options = YAML.load_file(File.expand_path('../../../spec/database.yml', __FILE__))
+puts options.inspect
+
+number_of = 10
+concurrency = 2
+connection_pool_size = 4
+results = []
+
+thread_pool = Thread.pool(concurrency)
+db = ActiveRecord::Base.establish_connection(options.merge('pool' => connection_pool_size))
+
+number_of.times do |i|
+  thread_pool.process do
+    puts i
+    results << ActiveRecord::Base.connection_pool.with_connection do |conn|
+      conn.execute('select sleep(1)').first
+    end
+  end
+end
+
+puts "results.size #{results.size}"
+thread_pool.shutdown
+
+puts results.inspect
+puts "results.size #{results.size}"