em-nodes 0.2.2 → 0.2.3

data/benchmark/client.rb

@@ -2,10 +2,7 @@ require 'rubygems'
 require "bundler/setup"
 Bundler.require
 
-class Client < EM::Nodes::Client
-  include HelloFeature
-  include TaskFeature
-
+class Client < EM::Nodes::DefaultClient
   def info
     { :name => "client" }
   end
@@ -13,15 +10,9 @@ class Client < EM::Nodes::Client
   def on_task(task_id, data)
     send_task_result(task_id, data + 1)
   end
-
-  def unbind
-    super
-    EM.stop
-  end
 end
 
 EM.run do
   puts "client run"
   Client.connect '/tmp/test_em_nodes_sock'
 end
-

data/benchmark/drb_client.rb

@@ -0,0 +1,11 @@
+require 'drb'
+
+class DrbClient
+  def task(data)
+    data + 1
+  end
+end
+
+i = ARGV[0] || '0'
+DRb.start_service("druby://127.0.0.1:111#{i}", DrbClient.new)
+sleep

data/benchmark/drb_server.rb

@@ -0,0 +1,34 @@
+require 'drb'
+
+CLIENTS_COUNT = 5
+TASKS_COUNT = 100000
+
+DRb.start_service
+clients = []
+CLIENTS_COUNT.times do |i|
+  clients << DRbObject.new(nil, "druby://127.0.0.1:111#{i}")
+end
+
+puts "start with clients #{clients.size}"
+
+$res = 0
+$res_count = 0
+$mutex = Mutex.new
+
+tm = Time.now
+clients.map do |cl|
+  Thread.new do
+    data = 0
+    loop do
+      data = cl.task(data)
+      $mutex.synchronize do
+        $res_count += 1
+        $res += data
+        if $res_count >= TASKS_COUNT
+          puts "executed with #{Time.now - tm}, res: #{$res}, res_count: #{$res_count}"
+          exit
+        end
+      end
+    end
+  end
+end.each &:join

data/benchmark/run_drb.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ruby drb_server.rb &
+sleep 0.4
+ruby drb_client.rb 0 &
+ruby drb_client.rb 1 &
+ruby drb_client.rb 2 &
+ruby drb_client.rb 3 &
+ruby drb_client.rb 4 &
+

data/benchmark/server.rb

@@ -5,10 +5,7 @@ Bundler.require
 CLIENTS_COUNT = 5
 TASKS_COUNT = 100000
 
-class Server < EM::Nodes::Server
-  include HelloFeature
-  include TaskFeature
-
+class Server < EM::Nodes::DefaultServer
   def on_task_result(res)
     $res_count += 1
     $res += res

data/lib/em-nodes/client.rb

@@ -9,7 +9,6 @@ class EM::Nodes::Client < EM::Connection
 
   def post_init
     @alive = true
-    EM::Nodes.logger.info { "Connected to server" }
   end
 
   def unbind
@@ -18,6 +17,7 @@ class EM::Nodes::Client < EM::Connection
   end
 
   def self.connect(host, port = nil, *args, &block)
+    EM::Nodes.logger.info { "Connecting to server #{host}:#{port}" }
     EM.connect(host, port, self, *args)
   end
 end

data/lib/em-nodes/default_client.rb

@@ -3,7 +3,7 @@ class EM::Nodes::DefaultClient < EM::Nodes::Client
   include TaskFeature
 
   def unbind
-    super    
+    super
     EM.next_tick { EM.stop }
   end
 end

data/lib/em-nodes/server.rb

@@ -31,6 +31,7 @@ class EM::Nodes::Server < EM::Connection
   end
 
   def post_init
+    super
     @data = OpenStruct.new
 
     self.comm_inactivity_timeout = inactivity_timeout if EM.reactor_running?
@@ -49,6 +50,7 @@ class EM::Nodes::Server < EM::Connection
   end
 
   def unbind
+    super
     @alive = false
     self.class.clients.delete self
     EM::Nodes.logger.info { "Client #{self.data.inspect} has disconnected" }

data/lib/em-nodes/server/hello.rb

@@ -23,5 +23,10 @@ class EM::Nodes::Server
       self.data.ready = true
       EM::Nodes.logger.info { "Hello client #{self.data.inspect}" }
     end
+
+    def unbind
+      super
+      self.data.ready = false
+    end
   end
 end

data/lib/em-nodes/version.rb

@@ -2,5 +2,5 @@ module EventMachine
 end
 
 module EventMachine::Nodes
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,78 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: em-nodes
-version: !ruby/object:Gem::Version
-  version: 0.2.2
+version: !ruby/object:Gem::Version 
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
-authors:
-- '''Konstantin Makarchev'''
+authors: 
+- "'Konstantin Makarchev'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-05-29 00:00:00 +04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  requirement: *id002
+  name: bundler
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple EM client server, and some stuffs
-email:
-- '''kostya27@gmail.com'''
+email: 
+- "'kostya27@gmail.com'"
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -80,7 +92,10 @@ files:
 - README.md
 - Rakefile
 - benchmark/client.rb
+- benchmark/drb_client.rb
+- benchmark/drb_server.rb
 - benchmark/run.sh
+- benchmark/run_drb.sh
 - benchmark/server.rb
 - em-nodes.gemspec
 - examples/chat_client.rb
@@ -104,31 +119,41 @@ files:
 - spec/simple_spec.rb
 - spec/spec_helper.rb
 - spec/task_spec.rb
+has_rdoc: true
 homepage: https://github.com/kostya/em-nodes
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 1.4.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple EM client server, and some stuffs
-test_files:
+test_files: 
 - spec/base_spec.rb
 - spec/hello_spec.rb
 - spec/simple2_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2a95a56a414282e8e364694da3c4c6047a0aabac
-  data.tar.gz: 8b48fd301eb081c7d35346f07aac1e30581a5a26
-SHA512:
-  metadata.gz: 60ed94305f6d7009fe10130dc252e740e896f472719300c660b8cf01c9b93a6b39dfb8178f3ee15c76206c8eb2b5a2f55ba0c715153ec75c24e9eff324c3a9be
-  data.tar.gz: af1caadc1bace8f2a75dc7d59fb09262456810fa711ff13637208d7d248d51e542db3c7cf91621ce41a97cbba0e33a98c72a3c1167eb5995672e0ba835b7643a