qrpc 0.2.1 → 0.2.2

data/CHANGES.txt

@@ -1,4 +1,15 @@
 
+0.2.2 (2011-02-13)
+* subminor bug corrections
+* beanstalkd queue now isn't emptified independently of the max 
+  job settings
+* max jobs set to 0 means, it's unlimited
+* max job settings is now 0 by default
+* minor performance optimizations
+
+0.2.1 (2011-02-06)
+* missing UUID dependency in gem specification
+
 0.2.0 (2011-02-04)
 * client implemented
 * switch to em-jack

data/TODO.md

@@ -1,3 +1,2 @@
-* general queue interface for ability to use more queue servers (starling, redis, ...)
+* general queue interface for ability to use more queue servers (starling, sparrow, kestrel, stomp, AMQP...)
 * copyright headers to all files
-* add @since 0.1.0 to all methods which haven't later @since

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/qrpc/client.rb

@@ -218,7 +218,7 @@ module QRPC
 
                         # Results pooler error handler
                         @input_queue.on_error do |error|
-                            raise Exception::new("Beanstalk error: " << error.to_s)
+                            raise ::Exception::new("Beanstalk error: " << error.to_s)
                         end
                         
                         # Returns

data/lib/qrpc/server/dispatcher.rb

@@ -33,17 +33,24 @@ module QRPC
             
             @max_jobs
             
+            ##
+            # Holds "full state" locking mutex.
+            #
+            
+            @mutex
+            
             ##
             # Constructor.
             #
             
-            def initialize(max_jobs = 20)
+            def initialize(max_jobs = 0)
                 @count = 0
                 @queue = Depq::new
+                @mutex = Mutex::new
                 @max_jobs = max_jobs
                 
                 if @max_jobs.nil?
-                    @max_jobs = 20
+                    @max_jobs = 0
                 end
             end
             
@@ -59,9 +66,10 @@ module QRPC
                     return
                 end
                 
-                if @count < @max_jobs
+                if self.available?
                     self.process_next!
                     @count += 1
+                    self.regulate!
                 end
             end
             
@@ -72,16 +80,55 @@ module QRPC
             def process_next!
                 job = @queue.pop
                 job.callback do
-                    if (@count < @max_jobs) and not @queue.empty?
+                    if self.available? and not @queue.empty?
                         self.process_next!
                     else
                         @count -= 1
+                        self.regulate!
                     end
                 end
 
                 job.process!
             end
             
+            ##
+            # Indicates free space is available in dispatcher.
+            #
+            # If block is given, locks to time space in dispatcher is 
+            # available so works as synchronization primitive by this 
+            # way.
+            #
+            # @overload available?
+            #   @return [Boolean] +true+ if it is, +false+ in otherwise
+            # @overload available?(&block)
+            #   @param [Proc] block synchronized block
+            #
+            
+            def available?(&block)
+                if block.nil?
+                    return ((@count < @max_jobs) or (@max_jobs == 0))
+                else
+                    @mutex.synchronize(&block)
+                end
+            end
+            
+            
+            protected
+            
+            ##
+            # Regulates by locking the dispatcher it if it's full.
+            #
+            
+            def regulate!
+                if self.available?
+                    if @mutex.locked?
+                        @mutex.unlock
+                    end
+                else
+                    @mutex.try_lock
+                end
+            end
+            
         end
     end
 end

data/lib/qrpc/server.rb

@@ -180,9 +180,17 @@ module QRPC
             
             # Process input queue
             self.input_queue do |queue|
-                queue.each_job do |job|
-                    self.process_job(job)
+                worker = Proc::new do
+                    @dispatcher.available? do
+                        queue.reserve do |job|
+                            self.process_job(job)
+                            job.delete()
+                            worker.call()
+                        end
+                    end
                 end
+                
+                worker.call()
             end
         end
         

data/qrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qrpc}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Kozák"]
-  s.date = %q{2011-02-06}
+  s.date = %q{2011-02-13}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/martinkozak/qrpc}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Queued JSON-RPC client and server. Works as normal RPC server, but through queue interface, so allows highly scalable, distributed and asynchronous remote API implementation and fast data processing. It's based on eventmachine and beanstalkd, so it's fast and thread safe.}
 
   if s.respond_to? :specification_version then

data/test-client.rb

@@ -7,19 +7,27 @@ require "eventmachine"
 
 EM::run do
     client = QRPC::Client::new QRPC::Locator::new :test
-    puts client.inspect
-
-    client.subtract(2, 3) do |i|
-        puts i
-    end
-    
-    client.subtract(3, 2) do |i|
-        puts i
+#    puts client.inspect
+
+#    client.something_bad do |i|
+#        puts i
+#    end
+
+    count = 0
+
+    10000.times do
+        client.subtract(2, 3) do |i|
+#            puts i
+            count += 1
+            if count >= 10000
+                EM::stop
+            end
+        end
     end
     
-    client.something_bad do |i|
-        puts i
-    end
+#    client.subtract(3, 2) do |i|
+#        puts i
+#    end
 end
 
 =begin

data/test-server.rb

@@ -10,4 +10,4 @@ end
 
 require "qrpc/server"
 server = QRPC::Server::new(Foo::new)
-server.listen! QRPC::Locator::new("test")
+server.listen! QRPC::Locator::new("test"), :max_jobs => 0

metadata

@@ -2,7 +2,7 @@
 name: qrpc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +01:00
+date: 2011-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 983554285799490160
+      hash: -1069714967795243013
       segments: 
       - 0
       version: "0"
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Queued JSON-RPC client and server. Works as normal RPC server, but through queue interface, so allows highly scalable, distributed and asynchronous remote API implementation and fast data processing. It's based on eventmachine and beanstalkd, so it's fast and thread safe.