amqp 0.5.1 → 0.5.2

data/README

@@ -59,4 +59,21 @@ Other AMQP resources:
     http://github.com/0x6e6562/as3-amqp
 
   RabbitMQ's protocol code generator:
-    http://hg.rabbitmq.com/rabbitmq-codegen/
+    http://hg.rabbitmq.com/rabbitmq-codegen/
+
+  Jonahthan Conway's series on RabbitMQ and using it with Ruby/Merb:
+    http://jaikoo.com/2008/3/20/daemonize-rabbitmq
+    http://jaikoo.com/2008/3/14/oh-hai-rabbitmq
+    http://jaikoo.com/2008/2/29/friday-round-up-2008-02-29
+    http://jaikoo.com/2007/9/4/didn-t-you-get-the-memo
+
+Messaging and distributed systems resources:
+
+  A Critique of the Remote Procedure Call Paradigm
+    http://www.cs.vu.nl/~ast/publications/euteco-1988.pdf
+
+  A Note on Distributed Computing
+    http://research.sun.com/techrep/1994/smli_tr-94-29.pdf
+
+  Convenience Over Correctness
+    http://steve.vinoski.net/pdf/IEEE-Convenience_Over_Correctness.pdf

data/lib/amqp.rb

@@ -3,6 +3,8 @@ module AMQP
   
   $:.unshift DIR
   
+  require 'ext/em'
+  
   %w[ buffer spec protocol frame client ].each do |file|
     require "amqp/#{file}"
   end

data/lib/amqp/client.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'eventmachine'
 require 'amqp/frame'
 require 'pp'
 

data/lib/ext/em.rb

@@ -0,0 +1,50 @@
+begin
+  require 'eventmachine'
+rescue LoadError
+  require 'rubygems'
+  require 'eventmachine'
+end
+
+# copied from EM trunk, will be removed when 0.12.1 is released
+if EM::VERSION < '0.12.1'
+    
+  def EventMachine::run blk=nil, tail=nil, &block
+    @tails ||= []
+    tail and @tails.unshift(tail)
+
+    if reactor_running?
+      (b = blk || block) and b.call # next_tick(b)
+    else
+      @conns = {}
+      @acceptors = {}
+      @timers = {}
+      begin
+        @reactor_running = true
+        initialize_event_machine
+        (b = blk || block) and add_timer(0, b)
+        run_machine
+      ensure
+        release_machine
+        @reactor_running = false
+      end
+
+      until @tails.empty?
+        @tails.pop.call
+      end
+    end
+  end
+
+  def EventMachine::fork_reactor &block
+    Kernel.fork do
+      if self.reactor_running?
+        self.stop_event_loop
+        self.release_machine
+        self.instance_variable_set( '@reactor_running', false )
+      end
+      self.run block
+    end
+  end
+
+end
+
+require 'ext/emfork'

data/lib/mq/rpc.rb

@@ -1,5 +1,3 @@
-require 'emfork'
-
 unless defined?(BlankSlate)
   class BlankSlate < BasicObject; end if defined?(BasicObject)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-21 00:00:00 -07:00
+date: 2008-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.1
+        version: 0.12.0
     version: 
 description: AMQP client implementation in Ruby/EventMachine
 email: amqp@tmm1.net
@@ -35,10 +35,7 @@ files:
 - examples/clock.rb
 - examples/hashtable.rb
 - examples/pingpong.rb
-- examples/primes-forked.rb
-- examples/primes-processes.rb
 - examples/primes-simple.rb
-- examples/primes-threaded.rb
 - examples/primes.rb
 - examples/simple.rb
 - examples/stocks.rb
@@ -48,7 +45,8 @@ files:
 - lib/amqp/protocol.rb
 - lib/amqp/spec.rb
 - lib/amqp.rb
-- lib/emfork.rb
+- lib/ext/em.rb
+- lib/ext/emfork.rb
 - lib/mq/exchange.rb
 - lib/mq/queue.rb
 - lib/mq/rpc.rb

data/examples/primes-forked.rb

@@ -1,63 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'mq'
-
-MAX = 5000
-
-def EM.fork &blk
-  raise if reactor_running?
-
-  unless @forks
-    at_exit{
-      @forks.each{ |pid| Process.kill('KILL', pid) }
-    }
-  end
-
-  (@forks ||= []) << Kernel.fork do
-    EM.run(&blk)
-  end
-end
-
-def log *args
-  p args
-end
-
-# MQ.logging = true
-
-# worker
-
-  workers = ARGV[0] ? (Integer(ARGV[0]) rescue 2) : 2
-
-  workers.times do
-    EM.fork{
-      log "prime checker", Process.pid, :started
-
-      class Fixnum
-        def prime?
-          ('1' * self) !~ /^1?$|^(11+?)\1+$/
-        end
-      end
-
-      MQ.queue('prime checker').subscribe{ |info, num|
-        log "prime checker #{Process.pid}", :prime?, num
-        if Integer(num).prime?
-          MQ.queue(info.reply_to).publish(num, :reply_to => Process.pid)
-        end
-      }
-    }
-  end
-
-# controller
-
-  EM.run{
-    MQ.queue('prime collector').subscribe{ |info, prime|
-      log 'prime collector', :received, prime, :from, info.reply_to
-      (@primes ||= []) << Integer(prime)
-      EM.stop_event_loop if prime == '499'
-    }
-
-    MAX.times do |i|
-      EM.next_tick do
-        MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
-      end
-    end
-  }

data/examples/primes-processes.rb

@@ -1,135 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'mq'
-
-MAX = 500
-
-EM.run{
-
-  def log *args
-    p args
-  end
-
-  # MQ.logging = true
-
-  if ARGV[0] == 'worker'
-
-    log "prime checker #{Process.pid}", :started
-
-    class Fixnum
-      def prime?
-        ('1' * self) !~ /^1?$|^(11+?)\1+$/
-      end
-    end
-
-    MQ.queue('prime checker').subscribe{ |info, num|
-      log "prime checker #{Process.pid}", :prime?, num
-      if Integer(num).prime?
-        MQ.queue(info.reply_to).publish(num, :reply_to => Process.pid)
-        EM.stop_event_loop if num == (MAX-1).to_s
-      end
-    }
-
-  elsif ARGV[0] == 'controller'
-
-    MQ.queue('prime collector').subscribe{ |info, prime|
-      log 'prime collector', :received, prime, :from, info.reply_to
-      (@primes ||= []) << Integer(prime)
-    }
-
-    MAX.times do |i|
-      EM.next_tick do
-        MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
-      end
-    end
-
-  else # run n workers and 1 controller as an example
-
-    workers = ARGV[0] ? (Integer(ARGV[0]) rescue 2) : 2
-
-    ([ :worker ] * workers + [ :controller ]).each do |type|
-      log :spawning, "`ruby #{$0} #{type}`"
-
-      EM.popen("ruby #{$0} #{type}") do |c|
-        def c.receive_data data
-          puts data
-        end
-
-        def c.unbind
-          EM.stop_event_loop
-        end
-      end
-    end
-
-  end
-}
-
-__END__
-
-["prime checker", :started, {:pid=>1958}]
-["prime checker", :started, {:pid=>1957}]
-["prime checker", :started, {:pid=>1956}]
-["prime checker", :prime?, "1", {:pid=>1958}]
-["prime checker", :prime?, "2", {:pid=>1957}]
-["prime collector", :received, "2", {:from_pid=>"1957"}]
-["prime checker", :prime?, "3", {:pid=>1956}]
-["prime collector", :received, "3", {:from_pid=>"1956"}]
-["prime checker", :prime?, "4", {:pid=>1958}]
-["prime checker", :prime?, "5", {:pid=>1957}]
-["prime collector", :received, "5", {:from_pid=>"1957"}]
-["prime checker", :prime?, "6", {:pid=>1956}]
-["prime checker", :prime?, "7", {:pid=>1958}]
-["prime collector", :received, "7", {:from_pid=>"1958"}]
-["prime checker", :prime?, "8", {:pid=>1957}]
-["prime checker", :prime?, "9", {:pid=>1956}]
-["prime checker", :prime?, "10", {:pid=>1958}]
-["prime checker", :prime?, "11", {:pid=>1957}]
-["prime collector", :received, "11", {:from_pid=>"1957"}]
-["prime checker", :prime?, "12", {:pid=>1956}]
-["prime checker", :prime?, "13", {:pid=>1958}]
-["prime collector", :received, "13", {:from_pid=>"1958"}]
-["prime checker", :prime?, "14", {:pid=>1957}]
-["prime checker", :prime?, "15", {:pid=>1956}]
-["prime checker", :prime?, "16", {:pid=>1958}]
-["prime checker", :prime?, "17", {:pid=>1957}]
-["prime collector", :received, "17", {:from_pid=>"1957"}]
-["prime checker", :prime?, "18", {:pid=>1956}]
-["prime checker", :prime?, "19", {:pid=>1958}]
-["prime collector", :received, "19", {:from_pid=>"1958"}]
-["prime checker", :prime?, "20", {:pid=>1957}]
-["prime checker", :prime?, "21", {:pid=>1956}]
-["prime checker", :prime?, "22", {:pid=>1958}]
-["prime checker", :prime?, "23", {:pid=>1957}]
-["prime collector", :received, "23", {:from_pid=>"1957"}]
-["prime checker", :prime?, "24", {:pid=>1956}]
-["prime checker", :prime?, "25", {:pid=>1958}]
-["prime checker", :prime?, "26", {:pid=>1957}]
-["prime checker", :prime?, "27", {:pid=>1956}]
-["prime checker", :prime?, "28", {:pid=>1958}]
-["prime checker", :prime?, "29", {:pid=>1957}]
-["prime collector", :received, "29", {:from_pid=>"1957"}]
-["prime checker", :prime?, "30", {:pid=>1956}]
-["prime checker", :prime?, "31", {:pid=>1958}]
-["prime collector", :received, "31", {:from_pid=>"1958"}]
-["prime checker", :prime?, "32", {:pid=>1957}]
-["prime checker", :prime?, "33", {:pid=>1956}]
-["prime checker", :prime?, "34", {:pid=>1958}]
-["prime checker", :prime?, "35", {:pid=>1957}]
-["prime checker", :prime?, "36", {:pid=>1956}]
-["prime checker", :prime?, "37", {:pid=>1958}]
-["prime collector", :received, "37", {:from_pid=>"1958"}]
-["prime checker", :prime?, "38", {:pid=>1957}]
-["prime checker", :prime?, "39", {:pid=>1956}]
-["prime checker", :prime?, "40", {:pid=>1958}]
-["prime checker", :prime?, "41", {:pid=>1957}]
-["prime collector", :received, "41", {:from_pid=>"1957"}]
-["prime checker", :prime?, "42", {:pid=>1956}]
-["prime checker", :prime?, "43", {:pid=>1958}]
-["prime collector", :received, "43", {:from_pid=>"1958"}]
-["prime checker", :prime?, "44", {:pid=>1957}]
-["prime checker", :prime?, "45", {:pid=>1956}]
-["prime checker", :prime?, "46", {:pid=>1958}]
-["prime checker", :prime?, "47", {:pid=>1957}]
-["prime collector", :received, "47", {:from_pid=>"1957"}]
-["prime checker", :prime?, "48", {:pid=>1956}]
-["prime checker", :prime?, "49", {:pid=>1958}]
-["prime checker", :prime?, "50", {:pid=>1957}]

data/examples/primes-threaded.rb

@@ -1,49 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'mq'
-
-MAX = 500
-
-def log *args
-  p args
-end
-
-# MQ.logging = true
-
-EM.run{
-
-  # worker
-
-  log "prime checker", Process.pid, :started
-
-  class Fixnum
-    def prime?
-      ('1' * self) !~ /^1?$|^(11+?)\1+$/
-    end
-  end
-
-  MQ.queue('prime checker').subscribe{ |info, num|
-    EM.defer(proc{
-
-      log "prime checker #{Process.pid}-#{Thread.current.object_id}", :prime?, num
-      if Integer(num).prime?
-        MQ.queue(info.reply_to).publish(num, :reply_to => "#{Process.pid}-#{Thread.current.object_id}")
-        EM.stop_event_loop if num == '499'
-      end
-      
-    })
-  }
-
-  # controller
-
-  MQ.queue('prime collector').subscribe{ |info, prime|
-    log 'prime collector', :received, prime, :from, info.reply_to
-    (@primes ||= []) << Integer(prime)
-  }
-
-  MAX.times do |i|
-    EM.next_tick do
-      MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
-    end
-  end
-
-}