Merge f2c30b4 into ba5059c

lib/listen.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'weakref'
 require 'listen/logger'
 require 'listen/listener'
 
@@ -18,6 +19,8 @@
 Listen::Logger.info "Listen version: #{Listen::VERSION}"
 
 module Listen
+  @listeners = Queue.new
+
   class << self
     # Listens to file system modifications on a either single directory or
     # multiple directories.
@@ -32,21 +35,23 @@ class << self
     # @return [Listen::Listener] the listener
     #
     def to(*args, &block)
-      @listeners ||= []
       Listener.new(*args, &block).tap do |listener|
-        @listeners << listener
+        @listeners.enq(WeakRef.new(listener))
       end
     end
 
     # This is used by the `listen` binary to handle Ctrl-C
     #
     def stop
       Internals::ThreadPool.stop
-      @listeners ||= []
 
-      # TODO: should use a mutex for this
-      @listeners.each(&:stop)
-      @listeners = nil
+      while (listener = @listeners.deq(true))
+        begin
+          listener.stop
+        rescue WeakRef::RefError
+        end
+      end
+    rescue ThreadError
     end
   end
 end