Changeset 5860

Timestamp:

01/30/08 10:44:54 (5 years ago)

Author:

cho45

Message:

lang/ruby/net-irc/trunk/lib/net/irc.rb,
lang/ruby/net-irc/trunk/spec/net-irc_spec.rb:

Synchronize @channels between threads surely.

Location:

lang/ruby/net-irc/trunk

Files:

• lib/net/irc.rb (modified) (8 diffs)
• spec/net-irc_spec.rb (modified) (1 diff)

lang/ruby/net-irc/trunk/lib/net/irc.rb

@@ -5 +5 @@
 require "thread"
 require "logger"
+require "monitor"
 
 module Net; end
@@ -450 +451 @@
 #                       }
                 }
+                @channels.extend(MonitorMixin)
         end
 
@@ -510 +512 @@
                 init_channel(channel)
 
-                m[3].split(/\s+/).each do |u|
-                        _, mode, nick = *u.match(/^([@+]?)(.+)/)
-
-                        @channels[channel][:users] << nick
-                        @channels[channel][:users].uniq!
-
-                        case mode
-                        when "@" # channel operator
-                                @channels[channel][:modes] << ["o", nick]
-                        when "+" # voiced (under moderating mode)
-                                @channels[channel][:modes] << ["v", nick]
-                        end
-                end
-
-                case type
-                when "@" # secret
-                        @channels[channel][:modes] << ["s", nil]
-                when "*" # private
-                        @channels[channel][:modes] << ["p", nil]
-                when "=" # public
-                end
-
-                @channels[channel][:modes].uniq!
+                @channels.synchronize do
+                        m[3].split(/\s+/).each do |u|
+                                _, mode, nick = *u.match(/^([@+]?)(.+)/)
+
+                                @channels[channel][:users] << nick
+                                @channels[channel][:users].uniq!
+
+                                case mode
+                                when "@" # channel operator
+                                        @channels[channel][:modes] << ["o", nick]
+                                when "+" # voiced (under moderating mode)
+                                        @channels[channel][:modes] << ["v", nick]
+                                end
+                        end
+
+                        case type
+                        when "@" # secret
+                                @channels[channel][:modes] << ["s", nil]
+                        when "*" # private
+                                @channels[channel][:modes] << ["p", nil]
+                        when "=" # public
+                        end
+
+                        @channels[channel][:modes].uniq!
+                end
         end
 
@@ -541 +545 @@
                 init_channel(channel)
 
-                info = @channels[channel]
-                if info
-                        info[:users].delete(nick)
-                        info[:modes].delete_if {|u|
-                                u[1] == nick
-                        }
+                @channels.synchronize do
+                        info = @channels[channel]
+                        if info
+                                info[:users].delete(nick)
+                                info[:modes].delete_if {|u|
+                                        u[1] == nick
+                                }
+                        end
                 end
         end
@@ -554 +560 @@
                 nick = m.prefix.nick
 
-                @channels.each do |channel, info|
-                        info[:users].delete(nick)
-                        info[:modes].delete_if {|u|
-                                u[1] == nick
-                        }
+                @channels.synchronize do
+                        @channels.each do |channel, info|
+                                info[:users].delete(nick)
+                                info[:modes].delete_if {|u|
+                                        u[1] == nick
+                                }
+                        end
                 end
         end
@@ -565 +573 @@
         def on_kick(m)
                 users = m[1].split(/,/)
-                m[0].split(/,/).each do |chan|
-                        init_channel(chan)
-                        info = @channels[chan]
-                        if info
-                                users.each do |nick|
-                                        info[:users].delete(nick)
-                                        info[:modes].delete_if {|u|
-                                                u[1] == nick
-                                        }
+
+                @channels.synchronize do
+                        m[0].split(/,/).each do |chan|
+                                init_channel(chan)
+                                info = @channels[chan]
+                                if info
+                                        users.each do |nick|
+                                                info[:users].delete(nick)
+                                                info[:modes].delete_if {|u|
+                                                        u[1] == nick
+                                                }
+                                        end
                                 end
                         end
@@ -583 +594 @@
                 nick    = m.prefix.nick
                 channel = m[0]
-                init_channel(channel)
-
-                @channels[channel][:users] << nick
-                @channels[channel][:users].uniq!
+
+                @channels.synchronize do
+                        init_channel(channel)
+
+                        @channels[channel][:users] << nick
+                        @channels[channel][:users].uniq!
+                end
         end
 
@@ -592 +606 @@
         def on_mode(m)
                 channel = m[0]
-                init_channel(channel)
-
-                positive_mode = []
-                negative_mode = []
-
-                mode = positive_mode
-                arg_pos = 0
-                m[1].each_byte do |c|
-                        case c
-                        when ?+
-                                mode = positive_mode
-                        when ?-
-                                mode = negative_mode
-                        when ?o, ?v, ?k, ?l, ?b, ?e, ?I
-                                mode << [c.chr, m[arg_pos + 2]]
-                                arg_pos += 1
-                        else
-                                mode << [c.chr, nil]
-                        end
-                end
-                mode = nil
-
-                negative_mode.each do |m|
-                        @channels[channel][:modes].delete(m)
-                end
-
-                positive_mode.each do |m|
-                        @channels[channel][:modes] << m
-                end
-
-                @channels[channel][:modes].uniq!
-                [negative_mode, positive_mode]
+                @channels.synchronize do
+                        init_channel(channel)
+
+                        positive_mode = []
+                        negative_mode = []
+
+                        mode = positive_mode
+                        arg_pos = 0
+                        m[1].each_byte do |c|
+                                case c
+                                when ?+
+                                        mode = positive_mode
+                                when ?-
+                                        mode = negative_mode
+                                when ?o, ?v, ?k, ?l, ?b, ?e, ?I
+                                        mode << [c.chr, m[arg_pos + 2]]
+                                        arg_pos += 1
+                                else
+                                        mode << [c.chr, nil]
+                                end
+                        end
+                        mode = nil
+
+                        negative_mode.each do |m|
+                                @channels[channel][:modes].delete(m)
+                        end
+
+                        positive_mode.each do |m|
+                                @channels[channel][:modes] << m
+                        end
+
+                        @channels[channel][:modes].uniq!
+                        [negative_mode, positive_mode]
+                end
         end
 

lang/ruby/net-irc/trunk/spec/net-irc_spec.rb

@@ -222 +222 @@
                         @server.start
                 end
+
+                true until @server.instance_variable_get(:@serv)
 
                 @port = @server.instance_variable_get(:@serv).addr[1]