Rejigger evented support to extend server instances rather than

monkeypatch classes.  This makes it much easier and predictable to test.

History.rdoc

@@ -1,4 +1,4 @@
-= HEAD
+= 1.8.2 (2010-04-03)
 
  * Fix concurrency issues with eventmachine support.
 

lib/memcache.rb

@@ -110,7 +110,7 @@ class MemCache
   # Please note this feature only works in memcached 1.2.5 and later.  Earlier
   # versions will reply with "ERROR".
   attr_reader :no_reply
-
+  
   ##
   # Accepts a list of +servers+ and a list of +opts+.  +servers+ may be
   # omitted.  See +servers=+ for acceptable server list arguments.
@@ -154,10 +154,11 @@ def initialize(*args)
       raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
     end
 
+    @evented = defined?(EM) && EM.reactor_running?
     opts = DEFAULT_OPTIONS.merge opts
     @namespace    = opts[:namespace]
     @readonly     = opts[:readonly]
-    @multithread  = opts[:multithread]
+    @multithread  = opts[:multithread] && !@evented
     @autofix_keys = opts[:autofix_keys]
     @timeout      = opts[:timeout]
     @failover     = opts[:failover]
@@ -170,6 +171,7 @@ def initialize(*args)
     logger.info { "memcache-client #{VERSION} #{Array(servers).inspect}" } if logger
 
     Thread.current[:memcache_client] = self.object_id if !@multithread
+
 
     self.servers = servers
   end
@@ -946,6 +948,7 @@ def entry_count_for(server, total_servers, total_weight)
 
   def check_multithread_status!
     return if @multithread
+    return if @evented
 
     if Thread.current[:memcache_client] != self.object_id
       raise MemCacheError, <<-EOM
@@ -1011,6 +1014,8 @@ def initialize(memcache, host, port = DEFAULT_PORT, weight = DEFAULT_WEIGHT)
       @status = 'NOT CONNECTED'
       @timeout = memcache.timeout
       @logger = memcache.logger
+
+      self.extend(MemCache::EventedServer) if defined?(EM) and EM.reactor_running?
     end
 
     ##

lib/memcache/event_machine.rb

@@ -10,24 +10,15 @@ class MemCache
 
   # Since we are working in a single Thread, multiple Fiber environment,
   # disable the multithread Mutex as it will not work.
-  DEFAULT_OPTIONS[:multithread] = false
+#  DEFAULT_OPTIONS[:multithread] = false
 
-  def check_multithread_status!
-  end
-
-  class Server
-    alias :blocking_socket :socket
+  module EventedServer
 
     def fiber_key
       @fiber_key ||= "memcached-#{@host}-#{@port}"
     end
 
     def socket
-      # Support plain old TCP socket connections if the user
-      # has not setup EM.  Much easier to deal with in irb, 
-      # script/console, etc.
-      return blocking_socket if !EM.reactor_running?
-
       sock = Thread.current[fiber_key]
       return sock if sock and not sock.closed?
 
@@ -58,8 +49,10 @@ def socket
 
     def close
       sock = Thread.current[fiber_key]
-      sock.close if sock && !sock.closed?
-      Thread.current[fiber_key] = nil
+      if sock
+        sock.close if !sock.closed?
+        Thread.current[fiber_key] = nil
+      end
       @retry  = nil
       @status = "NOT CONNECTED"
     end

test/test_mem_cache.rb

@@ -1201,6 +1201,7 @@ def test_crazy_multithreaded_access
       # Use a null logger to verify logging doesn't blow up at runtime
       cache = MemCache.new(['localhost:11211', '127.0.0.1:11211'], :logger => Logger.new('/dev/null'))
       cache.flush_all
+      assert_equal true, cache.multithread
       workers = []
 
       cache.set('f', 'zzz')