brb 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+0.2.2 (Apr 21, 2010)
+
+* Change silent option to verbose
+
 0.2.1 (Apr 16, 2010)
 
 * Automatically start EM if not started

data/examples/simple_client.rb

@@ -5,7 +5,7 @@ host = 'localhost'
 
 # Connecting to the core server, retrieving its interface object : core
 # We do not want to expose an object, so the first parameter is nil
-core = BrB::Tunnel.create(nil, "brb://#{host}:#{port}", :silent => false)
+core = BrB::Tunnel.create(nil, "brb://#{host}:#{port}", :verbose => true)
 
 # Calling 10 times an non blocking method on the distant core server
 10.times do

data/examples/simple_core.rb

@@ -24,5 +24,5 @@ port = 5555
 host = 'localhost'
 
 puts " > Starting the core on brb://#{host}:#{port}"
-BrB::Service.start_service(:object => ExposedCoreObject.new, :silent => false, :host => host, :port => port)
+BrB::Service.start_service(:object => ExposedCoreObject.new, :verbose => true, :host => host, :port => port)
 EM.reactor_thread.join

data/lib/brb/request.rb

@@ -27,7 +27,6 @@ module BrB
         begin
           r = recv(block, Thread.current[:brb_nb_out])
         rescue Exception => e
-          #@object.log_error(e, "Error sending out request #{meth}(#{args.inspect})")
           raise e
         ensure
           #TimeMonitor.instance.remove_thread!
@@ -52,7 +51,6 @@ module BrB
         idrequest = args.pop
         thread = args.pop
         begin
-          #TimeMonitor.instance.watch_thread!(25)
           r = ((args.size > 0) ? @object.send(m, *args) : @object.send(m))
           brb_send([:r, r, thread, idrequest])
         rescue Exception => e
@@ -60,8 +58,6 @@ module BrB
           tputs e.to_s
           tputs e.backtrace.join("\n")
           #raise e
-        ensure
-          #TimeMonitor.instance.remove_thread!
         end
       else
 

data/lib/brb/service.rb

@@ -6,13 +6,13 @@ module BrB
   class Service
     @@uri = nil
     @@em_signature = nil
-    @@silent = true
+    @@verbose = false
 
     class << self
 
     private
       def tputs(s)
-        puts s if !@@silent
+        puts s if @@verbose
       end
 
     public
@@ -22,10 +22,10 @@ module BrB
       def start_service(opts = {}, &block)
         return if @@em_signature
   
-        @@silent = opts[:silent]
-  
-        addr = "brb://#{opts[:host] || 'localhost'}:#{opts[:port] || 6200}"
-  
+        @@verbose = opts[:verbose]
+
+        addr = opts[:uri] || "brb://#{opts[:host] || 'localhost'}:#{opts[:port] || 6200}"
+
         tputs " [BrB] Start service on #{addr} ..."
         @@uri, @@em_signature = BrB::Protocol::open_server(addr, BrB::Tunnel::Handler, opts.merge(:block => block))
         tputs " [BrB] Service started on #{@@uri}"

data/lib/brb/tunnel.rb

@@ -6,6 +6,9 @@ require File.join(File.dirname(__FILE__), 'tunnel', 'shared.rb')
 module BrB
   module Tunnel
 
+    # Create a BrB Tunnel by connecting to a distant BrB service
+    # Pass a block if you want to get register and unregister events
+    # The first parameter object is the object you want to expose in the BrB tunnel
     def self.create(object, uri = nil, opts = {}, &block)
       BrB::Protocol.open(uri, BrB::Tunnel::Handler, opts.merge(:object => object, :block => block))
     end
@@ -20,20 +23,19 @@ module BrB
       def initialize(opts = {})
         super
         @object = opts[:object]
-        @silent = opts[:silent]
-        @timeout_rcv_value = opts[:timeout] || 30
+        @verbose = opts[:verbose]
+        @timeout_rcv_value = opts[:timeout] || 30 # Currently not implemented due to the lack of performance of ruby Timeout
         @close_after_timeout = opts[:close_after_timeout] || false
         @uri = opts[:uri]
-        @closed = nil
         @replock = Mutex.new
         @responses = {}
         @block = opts[:block]
-        @mu = Mutex.new
         
         @queue = Queue.new
         @buffer = ''
       end
 
+      # EventMachine Callback, called after connection has been initialized
       def post_init
         tputs " [BrB] Tunnel initialized on #{@uri}"
         @active = true
@@ -49,6 +51,8 @@ module BrB
         super
       end
 
+      # EventMachine unbind event
+      # The connection has been closed
       def unbind
         tputs ' [BrB] Tunnel service closed'
         @active = false
@@ -59,18 +63,21 @@ module BrB
         end
       end
       
+      # Stop the service
       def stop_service
-        tputs ' [BrB] Stop Tunnel service'
+        tputs ' [BrB] Stopping Tunnel service...'
         @active = false
         EM.schedule do
           close_connection
         end
       end
 
+      # Return true if the tunnel is currently active
       def active?
         @active
       end
 
+      # When no method is found on tunnel interface, create an brb out request
       def method_missing(meth, *args)
         return nil if !@active
         new_brb_out_request(meth, *args)

data/lib/brb/tunnel/shared.rb

@@ -4,7 +4,7 @@ module BrB
   module Tunnel
     module Shared
       def tputs(s)
-        puts s if !@silent
+        puts s if @verbose
       end
 
       def make_proxy(r)
@@ -88,14 +88,12 @@ module BrB
             if rep[1] == nb_out # On check ke c'est bien la réponse que l'on attend
               return rep[0]
             end
-            #Error.create(:backtrace => "Error in Brb receiving in thread #{Thread.current}. Try to get #{nb_out} request id, but get #{rep[1]}", :type => 'BrBRecvBadId', :url => "#{@object.class}-#{@uri}")
             if rep[1] > nb_out
               return nil
             end
           end
         rescue Exception => e
           if @close_after_timeout == true
-            #Error.create(:backtrace => "Error in Rcv in thread #{Thread.current}. Try to get #{nb_out} => Stop service #{e.class.to_s}\n\n#{e.backtrace.join("\n")}", :type => e.to_s, :url => "#{@object.class}-#{@uri}")
             stop_service
             sleep 1
             raise e

data/spec/spec_helper.rb

@@ -6,11 +6,11 @@ Thread.abort_on_exception = true
 require File.dirname(__FILE__) + '/../init.rb'
 
 def open_service(object, host = 'localhost', port = 6200)
-  BrB::Service.start_service(:object => object, :silent => true, :host => host, :port => port)
+  BrB::Service.start_service(:object => object, :verbose => false, :host => host, :port => port)
 end
 
 def connect_to_the_service(object_exposed, uri, &block)
-  BrB::Tunnel.create(object_exposed, uri, :silent => true, &block)
+  BrB::Tunnel.create(object_exposed, uri, :verbose => false, &block)
 end
 
 class BrBTest

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Guillaume Luccisano
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +02:00
+date: 2010-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,11 +22,12 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 12
+        version: "0.12"
   type: :runtime
   version_requirements: *id001
 description: BrB is a simple, fully transparent and extremely fast interface for doing simple distributed ruby and message passing