revent 0.3 → 0.3.1

data/lib/revent/as_r.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'eventmachine'
 require 'zlib'
 require 'logger'
+
+require "#{File.dirname(__FILE__)}/synchronize"
 require "#{File.dirname(__FILE__)}/amf3/amf3"
 
 # AS clients are not reliable. For security, we close the connection immediately
@@ -75,12 +77,8 @@ module Revent
 
     def unbind
       @connected = false
-      if @cons.nil?
-        @me.on_close
-      else
-        @me.on_close(self)
-        @cons.delete(self)
-      end
+      @cons.synchronize { @cons.delete(self) }
+      @me.on_close(self)
     end
 
   # ----------------------------------------------------------------------------
@@ -168,8 +166,9 @@ EOF
       end
 
       @revent_cons = []
+      @revent_cons_mutex = Mutex.new
       EventMachine::start_server(host, port, ASRCon) do |con|
-        @revent_cons << con
+        @revent_cons.synchronize { @revent_cons << con }
         con.me = self
         con.cons = @revent_cons
         on_connect(con)

data/lib/revent/r_r.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'eventmachine'
 require 'stringio'
 
+require "#{File.dirname(__FILE__)}/synchronize"
+
 module Revent
   # Included by both Revent::RRServer and Revent::RRClient.
   module RRCon
@@ -55,7 +57,7 @@ module Revent
         @me.on_close
       else
         @me.on_close(self)
-        @cons.delete(self)
+        @cons.synchronize { @cons.delete(self) }
       end
     end
 
@@ -87,7 +89,7 @@ module Revent
     def start_server(host, port)
       @revent_cons = []
       EventMachine::start_server(host, port, RRCon) do |con|
-        @revent_cons << con
+        @revent_cons.synchronize { @revent_cons << con }
         con.me = self
         con.cons = @revent_cons
         on_connect(con)
@@ -173,4 +175,4 @@ module Revent
     def on_error(cmd, value)
     end
   end
-end
+end

data/lib/revent/synchronize.rb

@@ -0,0 +1,9 @@
+class Object
+  def synchronize
+    mutex.synchronize { yield self }
+  end
+
+  def mutex
+    @mutex ||= Mutex.new
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: revent
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ngoc DAO Thanh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-17 00:00:00 +09:00
+date: 2008-02-20 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - lib/revent/r_r.rb
 - lib/revent/as_r.rb
 - lib/revent/Client.as
+- lib/revent/synchronize.rb
 - lib/revent/amf3
 - lib/revent/amf3/app
 - lib/revent/amf3/app/fault_object.rb