memcached-seanl 0.19.5.5 → 0.19.5.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.19.5.6. Attempt to be compatible with Rails session store
+
 v0.19.5.5. Test version I plan to push
 
 v0.19.5.4. Multiget with binary protocol

data/Rakefile

@@ -23,7 +23,7 @@ task :exceptions do
 end
 
 task :valgrind do
-  exec("valgrind  --tool=memcheck --leak-check=yes --show-reachable=no --num-callers=15 --track-fds=yes ruby #{File.dirname(__FILE__)}/test/profile/valgrind.rb")
+  exec("valgrind  --tool=memcheck --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --max-stackframe=7304328 --dsymutil=yes --track-origins=yes ruby #{File.dirname(__FILE__)}/test/profile/valgrind.rb")
 end
 
 task :profile do

data/ext/extconf.rb

@@ -5,7 +5,11 @@ HERE = File.expand_path(File.dirname(__FILE__))
 BUNDLE = Dir.glob("libmemcached-*.tar.gz").first
 BUNDLE_PATH = BUNDLE.sub(".tar.gz", "")
 
+SOLARIS_32 = RbConfig::CONFIG['target'] == "i386-pc-solaris2.10"
+
 $CFLAGS = "#{RbConfig::CONFIG['CFLAGS']} #{$CFLAGS}".gsub("$(cflags)", "").gsub("-fno-common", "")
+$CFLAGS << " -std=gnu99" if SOLARIS_32
+$EXTRA_CONF = " --disable-64bit" if SOLARIS_32
 $LDFLAGS = "#{RbConfig::CONFIG['LDFLAGS']} #{$LDFLAGS}".gsub("$(ldflags)", "").gsub("-fno-common", "")
 $CXXFLAGS = " -std=gnu++98 #{$CFLAGS}"
 $CPPFLAGS = $ARCH_FLAG = $DLDFLAGS = ""
@@ -25,12 +29,14 @@ def check_libmemcached
   $CFLAGS = "#{$includes} #{$libraries} #{$CFLAGS}"
   $LDFLAGS = "#{$libraries} #{$LDFLAGS}"
   $LIBPATH = ["#{HERE}/lib"]
-  $DEFLIBPATH = []
+  $DEFLIBPATH = [] unless SOLARIS_32
 
   Dir.chdir(HERE) do
     if File.exist?("lib")
       puts "Libmemcached already built; run 'rake clean' first if you need to rebuild."
     else
+      tar = SOLARIS_32 ? 'gtar' : 'tar'
+      patch = SOLARIS_32 ? 'gpatch' : 'patch'
 
       # have_sasl check may fail on OSX, skip it
       # unless RUBY_PLATFORM =~ /darwin/ or have_library('sasl2')
@@ -38,15 +44,15 @@ def check_libmemcached
       # end
 
       puts "Building libmemcached."
-      puts(cmd = "tar xzf #{BUNDLE} 2>&1")
+      puts(cmd = "#{tar} xzf #{BUNDLE} 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
 
       puts "Patching libmemcached source."
-      puts(cmd = "patch -p1 -Z < libmemcached.patch")
+      puts(cmd = "#{patch} -p1 -Z < libmemcached.patch")
       raise "'#{cmd}' failed" unless system(cmd)
 
       puts "Patching libmemcached with SASL support."
-      puts(cmd = "patch -p1 -Z < sasl.patch")
+      puts(cmd = "#{patch} -p1 -Z < sasl.patch")
       raise "'#{cmd}' failed" unless system(cmd)
 
       puts "Touching aclocal.m4  in libmemcached."

data/lib/memcached/memcached.rb

@@ -160,6 +160,9 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
   # Set the server list.
   # FIXME Does not necessarily free any existing server structs.
   def set_servers(servers)
+    server_structs.each do |server|
+      Lib.memcached_server_remove(server)
+    end
     Array(servers).each_with_index do |server, index|
       # Socket
       check_return_code(
@@ -588,12 +591,14 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       message = "Key #{inspect_keys(key, (detect_failure if ret == Lib::MEMCACHED_SERVER_MARKED_DEAD)).inspect}"
       if key.is_a?(String)
         if ret == Lib::MEMCACHED_ERRNO
-          server = Lib.memcached_server_by_key(@struct, key)
-          errno = server.first.cached_errno
-          message = "Errno #{errno}: #{ERRNO_HASH[errno].inspect}. #{message}"
+          if (server = Lib.memcached_server_by_key(@struct, key)).is_a?(Array)
+            errno = server.first.cached_errno
+            message = "Errno #{errno}: #{ERRNO_HASH[errno].inspect}. #{message}"
+          end
         elsif ret == Lib::MEMCACHED_SERVER_ERROR
-          server = Lib.memcached_server_by_key(@struct, key)
-          message = "\"#{server.first.cached_server_error}\". #{message}."
+          if (server = Lib.memcached_server_by_key(@struct, key)).is_a?(Array)
+            message = "\"#{server.first.cached_server_error}\". #{message}."
+          end
         end
       end
       raise EXCEPTIONS[ret], message

data/lib/memcached/rails.rb

@@ -26,6 +26,12 @@ class Memcached
       super(servers, opts)
     end
 
+    def servers
+      server_structs.map do |server|
+        Server.new server
+      end
+    end
+
     def logger=(logger)
       @logger = logger
     end
@@ -116,4 +122,38 @@ class Memcached
     alias :"[]=" :set
 
   end
-end
+
+  class Server
+    def initialize(struct)
+      @struct = struct
+    end
+
+    def host
+      @struct.hostname
+    end
+
+    def port
+      @struct.port
+    end
+
+    def weight
+      @struct.weight
+    end
+
+    def multithreaded
+      true
+    end
+
+    def status
+      alive? ? 'CONNECTED' : 'NOT CONNECTED'
+    end
+
+    def inspect
+      "<Memcached::Rails::Server: %s:%d [%d] (%s)>" % [host, port, weight, status]
+    end
+
+    def alive?
+      @struct.fd != -1 || @struct.next_retry <= Time.now
+    end
+  end
+end

data/memcached-seanl.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached-seanl}
-  s.version = "0.19.5.5"
+  s.version = "0.19.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Lynch"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-05-25}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]

data/test/profile/valgrind.rb

@@ -5,6 +5,8 @@ $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib/"
 require 'memcached'
 require 'rubygems'
 
+GC.copy_on_write_friendly = true if GC.respond_to?("copy_on_write_friendly=")
+
 class Worker  
   def initialize(method_name, iterations)
     @method = method_name || 'mixed'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: memcached-seanl
 version: !ruby/object:Gem::Version 
-  hash: 201
+  hash: 207
   prerelease: false
   segments: 
   - 0
   - 19
   - 5
-  - 5
-  version: 0.19.5.5
+  - 6
+  version: 0.19.5.6
 platform: ruby
 authors: 
 - Sean Lynch
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: []