memcached 1.2.1 → 1.2.2

data/BUG

@@ -0,0 +1,22 @@
+Program received signal SIGINT, Interrupt.
+0x00007fff86ec39c6 in read ()
+(gdb) bt
+#0  0x00007fff86ec39c6 in read ()
+#1  0x00000001001b043b in memcached_io_read (ptr=0x208915a00, buffer=0x7fff5fbfbc80, length=1, nread=0x7fff5fbfbb58) at memcached_io.c:108
+#2  0x00000001001b0d9c in memcached_io_readline (ptr=0x208915a00, buffer_ptr=0x7fff5fbfbc80 "???_?", size=1024) at memcached_io.c:482
+#3  0x00000001001b2fcc in textual_read_one_response (ptr=0x208915a00, buffer=0x7fff5fbfbc80 "???_?", buffer_length=1024, result=0x7fff5fbfc080) at memcached_response.c:208
+#4  0x00000001001b2a2b in memcached_read_one_response (ptr=0x208915a00, buffer=0x7fff5fbfbc80 "???_?", buffer_length=1024, result=0x7fff5fbfc080) at memcached_response.c:31
+#5  0x00000001001b1100 in memcached_purge (ptr=0x208915a00) at memcached_purge.c:56
+#6  0x00000001001b0aa6 in io_flush (ptr=0x208915a00, error=0x7fff5fbfc2bc) at memcached_io.c:340
+#7  0x00000001001b07bb in memcached_io_write (ptr=0x208915a00, buffer=0x1001bcee9, length=0, with_flush=1 '\001') at memcached_io.c:241
+#8  0x00000001001ac8db in memcached_do (ptr=0x208915a00, command=0x1001bcee9, command_length=6, with_flush=1 '\001') at memcached_do.c:26
+#9  0x00000001001b2516 in memcached_quit_server (ptr=0x208915a00, io_death=0 '\0') at memcached_quit.c:30
+#10 0x00000001001b2673 in memcached_quit (ptr=0x102b1bb50) at memcached_quit.c:73
+#11 0x00000001001aa704 in memcached_free (ptr=0x102b1bb50) at memcached.c:43
+#12 0x0000000100038557 in rb_gc_call_finalizer_at_exit () at gc.c:2738
+#13 0x000000010001be60 in ruby_finalize_1 () at eval.c:1603
+#14 0x000000010002a09a in ruby_cleanup (exArg=<value temporarily unavailable, due to optimizations>) at eval.c:1641
+#15 0x000000010002a1f9 in ruby_stop (ex=<value temporarily unavailable, due to optimizations>) at eval.c:1696
+#16 0x00000001000319f4 in ruby_run () at eval.c:1717
+#17 0x0000000100000994 in main (argc=<value temporarily unavailable, due to optimizations>, argv=<value temporarily unavailable, due to optimizations>, envp=<value temporarily unavailable, due to optimizations>) at main.c:48
+

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.2.2. Work around tcmalloc bug on OS X. Avoid circular reference in memcached_server_by_key().
+
 v1.2.1. Fix large allocation on error bug.
 
 v1.2. Clean up duplicated set_prefix_key API. Pipeline deletes and remove dead replication code. Apply prefix_key to binary protocol properly (tarrall). Add Memcached::Rails#exist? (ssoroka).

data/Manifest

@@ -1,4 +1,5 @@
 BENCHMARKS
+BUG
 CHANGELOG
 LICENSE
 Manifest
@@ -8,13 +9,15 @@ TODO
 ext/extconf-make.rb
 ext/extconf.rb
 ext/libmemcached-0.32.tar.gz
+ext/libmemcached-1.patch
 ext/libmemcached-2.patch
 ext/libmemcached-3.patch
 ext/libmemcached-4.patch
 ext/libmemcached-5.patch
 ext/libmemcached-6.patch
 ext/libmemcached-7.patch
-ext/libmemcached.patch
+ext/libmemcached-8.patch
+ext/libmemcached-9.patch
 ext/rlibmemcached.i
 ext/rlibmemcached_wrap.c
 ext/sasl.patch
@@ -25,6 +28,7 @@ lib/memcached/exceptions.rb
 lib/memcached/experimental.rb
 lib/memcached/memcached.rb
 lib/memcached/rails.rb
+lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 test/profile/benchmark.rb
 test/profile/c_profiler.rb
 test/profile/exercise.rb

data/ext/extconf.rb

@@ -47,13 +47,13 @@ def check_libmemcached
   $DEFLIBPATH = [] unless SOLARIS_32
 
   Dir.chdir(HERE) do
-    if File.exist?("lib")
-      puts "Libmemcached already configured; run 'rake clean' first if you need to reconfigure."
+    if File.exist?("libmemcached-0.32")
+      puts "Libmemcached already unpacked; run 'rake clean' first if you need to start from scratch."
     else
       system("rm -rf #{BUNDLE_PATH}") unless ENV['DEBUG'] or ENV['DEV']
       run("#{TAR_CMD} xzf #{BUNDLE} 2>&1", "Building libmemcached.")
 
-      patch("libmemcached", "mark-dead behavior")
+      patch("libmemcached-1", "mark-dead behavior")
       patch("sasl", "SASL")
       patch("libmemcached-2", "get_from_last method")
       patch("libmemcached-3", "pipelined prepend and append")
@@ -61,12 +61,14 @@ def check_libmemcached
       patch("libmemcached-5", "get_len method")
       patch("libmemcached-6", "failure count bug")
       patch("libmemcached-7", "pipelined delete and unused replica code")
+      patch("libmemcached-8", "avoid strdup() to work around tcmalloc on OS X bug")
+      patch("libmemcached-9", "don't clone server_st by reference server_by_key()")
 
       run("touch -r #{BUNDLE_PATH}/m4/visibility.m4 #{BUNDLE_PATH}/configure.ac #{BUNDLE_PATH}/m4/pandora_have_sasl.m4", "Touching aclocal.m4 in libmemcached.")
+    end
 
-      Dir.chdir(BUNDLE_PATH) do
-        run("env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
-      end
+    Dir.chdir(BUNDLE_PATH) do
+      run("env CFLAGS='-fPIC #{$CFLAGS}' LDFLAGS='-fPIC #{$LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
     end
 
     Dir.chdir(BUNDLE_PATH) do

data/ext/libmemcached-8.patch

@@ -0,0 +1,137 @@
+diff -ru a/libmemcached-0.32/libmemcached/memcached_response.c b/libmemcached-0.32/libmemcached/memcached_response.c
+--- a/libmemcached-0.32/libmemcached/memcached_response.c	2011-03-08 13:07:36.000000000 -0800
++++ b/libmemcached-0.32/libmemcached/memcached_response.c	2011-03-08 13:02:11.000000000 -0800
+@@ -239,32 +239,19 @@
+       }
+       else if (buffer[1] == 'E') /* SERVER_ERROR */
+ 	{
+-          char *rel_ptr;
+-	  char *startptr= buffer + 13, *endptr= startptr;
+-
+-	  while (*endptr != '\r' && *endptr != '\n') endptr++;
++          memcached_server_error_reset(ptr);
+ 
+-          /*
+-            Yes, we could make this "efficent" but to do that we would need
+-            to maintain more state for the size of the buffer. Why waste
+-            memory in the struct, which is important, for something that
+-            rarely should happen?
+-          */
+-	  rel_ptr= (char *)ptr->root->call_realloc(ptr->root,
+-                                                   ptr->cached_server_error,
+-                                                   (size_t) (endptr - startptr + 1));
+-
+-          if (rel_ptr == NULL)
+-          {
+-            /* If we happened to have some memory, we just null it since we don't know the size */
+-            if (ptr->cached_server_error)
+-              ptr->cached_server_error[0]= 0;
+-            return MEMCACHED_SERVER_ERROR;
+-          }
+-	  ptr->cached_server_error= rel_ptr;
++	  char *startptr= buffer + 13, *endptr= startptr;
++	  while (*endptr != '\r' && *endptr != '\n')
++	    endptr++;
++	  size_t err_len = (endptr - startptr + 1);
++
++	  ptr->cached_server_error = malloc(err_len);
++          if (ptr->cached_server_error == NULL)
++             return MEMCACHED_SERVER_ERROR;
+ 
+-	  memcpy(ptr->cached_server_error, startptr, (size_t) (endptr - startptr));
+-	  ptr->cached_server_error[endptr - startptr]= 0;
++	  strncpy(ptr->cached_server_error, startptr, err_len);
++	  ptr->cached_server_error[err_len - 1]= 0;
+ 	  return MEMCACHED_SERVER_ERROR;
+ 	}
+       else if (buffer[1] == 'T')
+diff -ru a/libmemcached-0.32/libmemcached/memcached_server.c b/libmemcached-0.32/libmemcached/memcached_server.c
+--- a/libmemcached-0.32/libmemcached/memcached_server.c	2009-07-15 03:34:17.000000000 -0700
++++ b/libmemcached-0.32/libmemcached/memcached_server.c	2011-03-08 13:02:11.000000000 -0800
+@@ -16,14 +16,14 @@
+   }
+   else
+     memset(ptr, 0, sizeof(memcached_server_st));
+-  
++
+   ptr->root= memc;
+ 
+   return ptr;
+ }
+ 
+-memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host, 
+-                                                  const char *hostname, unsigned int port, 
++memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
++                                                  const char *hostname, unsigned int port,
+                                                   uint32_t weight, memcached_connection type)
+ {
+   host= memcached_server_create(memc, host);
+@@ -52,9 +52,7 @@
+ void memcached_server_free(memcached_server_st *ptr)
+ {
+   memcached_quit_server(ptr, 0);
+-
+-  if (ptr->cached_server_error)
+-    free(ptr->cached_server_error);
++  memcached_server_error_reset(ptr);
+ 
+   if (ptr->address_info)
+     freeaddrinfo(ptr->address_info);
+@@ -76,21 +74,24 @@
+   if (ptr == NULL)
+     return NULL;
+ 
+-  rv = memcached_server_create_with(ptr->root, clone, 
++  rv = memcached_server_create_with(ptr->root, clone,
+                                     ptr->hostname, ptr->port, ptr->weight,
+                                     ptr->type);
+   if (rv != NULL)
+   {
+     rv->cached_errno= ptr->cached_errno;
+-    if (ptr->cached_server_error)
+-      rv->cached_server_error= strdup(ptr->cached_server_error);
++    if (ptr->cached_server_error) {
++      size_t err_len = strlen(ptr->cached_server_error) + 1;
++      rv->cached_server_error = malloc(err_len);
++      strncpy(rv->cached_server_error, ptr->cached_server_error, err_len);
++    }
+   }
+ 
+   return rv;
+ 
+ }
+ 
+-memcached_return memcached_server_cursor(memcached_st *ptr, 
++memcached_return memcached_server_cursor(memcached_st *ptr,
+                                          memcached_server_function *callback,
+                                          void *context,
+                                          unsigned int number_of_callbacks)
+@@ -119,7 +120,7 @@
+ {
+   uint32_t server_key;
+ 
+-  *error= memcached_validate_key_length(key_length, 
++  *error= memcached_validate_key_length(key_length,
+                                         ptr->flags & MEM_BINARY_PROTOCOL);
+   unlikely (*error != MEMCACHED_SUCCESS)
+     return NULL;
+@@ -144,13 +145,16 @@
+ 
+ const char *memcached_server_error(memcached_server_st *ptr)
+ {
+-  if (ptr)
++  if (ptr->cached_server_error)
+     return ptr->cached_server_error;
+-  else 
++  else
+     return NULL;
+ }
+ 
+ void memcached_server_error_reset(memcached_server_st *ptr)
+ {
+-  ptr->cached_server_error[0]= 0;
++  if (ptr->cached_server_error) {
++    free(ptr->cached_server_error);
++    ptr->cached_server_error = 0;
++  }
+ }

data/ext/libmemcached-9.patch

@@ -0,0 +1,13 @@
+diff -uwr a/libmemcached-0.32/libmemcached/memcached_server.c b/libmemcached-0.32/libmemcached/memcached_server.c
+--- a/libmemcached-0.32/libmemcached/memcached_server.c	2011-03-13 11:49:57.000000000 -0700
++++ b/libmemcached-0.32/libmemcached/memcached_server.c	2011-03-13 21:35:17.000000000 -0700
+@@ -139,8 +139,7 @@
+ 
+   server_key= memcached_generate_hash(ptr, key, key_length);
+ 
+-  return memcached_server_clone(NULL, &ptr->hosts[server_key]);
+-
++  return &ptr->hosts[server_key];
+ }
+ 
+ const char *memcached_server_error(memcached_server_st *ptr)

data/ext/rlibmemcached.i

@@ -25,7 +25,6 @@
 %newobject memcached_clone;
 %newobject memcached_stat_get_value;
 // %newobject memcached_stat;
-%newobject memcached_server_by_key;
 
 // %trackobjects; // Doesn't fix any interesting leaks
 

data/ext/rlibmemcached_wrap.c

@@ -11987,7 +11987,7 @@ _wrap_memcached_server_by_key(int argc, VALUE *argv, VALUE self) {
     arg3 = (size_t) RSTRING_LEN(argv[1]);
   }
   result = (memcached_server_st *)memcached_server_by_key(arg1,(char const *)arg2,arg3,arg4);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_memcached_server_st, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_memcached_server_st, 0 |  0 );
   if (SWIG_IsTmpObj(res4)) {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_unsigned_SS_short((*arg4)));
   } else {

data/lib/memcached/behaviors.rb

@@ -13,7 +13,7 @@ class Memcached
   BEHAVIORS = load_constants("MEMCACHED_BEHAVIOR_")
 
   BEHAVIOR_VALUES = {
-    false => 0, 
+    false => 0,
     true => 1
   }
 
@@ -66,13 +66,12 @@ class Memcached
         # Scoped values; still annoying
         when :hash then HASH_VALUES.invert[value]
         when :distribution then DISTRIBUTION_VALUES.invert[value]
-        when *DIRECT_VALUE_BEHAVIORS then value
         else
-          BEHAVIOR_VALUES.invert[value]
+          value
       end
     else
       value
     end
   end
-  
-end
+
+end

data/lib/memcached/memcached.rb

@@ -121,9 +121,13 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
 
     instance_eval { send(:extend, Experimental) } if options[:experimental_features]
 
+    # SASL requires binary protocol
     options[:binary_protocol] = true if options[:credentials]
 
-    # Force :buffer_requests to use :no_block
+    # UDP requires noreply
+    options[:noreply] = true if options[:use_udp]
+
+    # Buffering requires non-blocking
     # FIXME This should all be wrapped up in a single :pipeline option.
     options[:no_block] = true if options[:buffer_requests]
 

data/lib/rlibmemcached.bundle.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.rlibmemcached.bundle</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

data/memcached.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-14}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.files = ["BENCHMARKS", "BUG", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-1.patch", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached-8.patch", "ext/libmemcached-9.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/rlibmemcached.bundle.dSYM/Contents/Info.plist", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
   s.homepage = %q{http://fauna.github.com/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]

data/test/profile/exercise.rb

@@ -147,6 +147,13 @@ class Worker
         @i.times do
           @cache.server_by_key(@key1)
         end
+      when "server_error"
+        @i.times do
+          begin
+            @cache.set @key1, "I'm big" * 1000000
+          rescue
+          end
+        end
       else
         raise "No such method"
     end

data/test/profile/valgrind.rb

@@ -1,3 +1,3 @@
 require "#{File.dirname(__FILE__)}/../setup"
 
-exec("valgrind --tool=memcheck --error-limit=no --undef-value-errors=no --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --leak-resolution=med --max-stackframe=7304328 --dsymutil=yes ruby -r#{File.dirname(__FILE__)}/exercise.rb -e \"Worker.new(ENV['TEST'] || 'everything', 50, 'true').work\"")
+exec("valgrind --tool=memcheck --error-limit=no --undef-value-errors=no --leak-check=full --show-reachable=no --num-callers=15 --track-fds=yes --workaround-gcc296-bugs=yes --leak-resolution=med --max-stackframe=7304328 --dsymutil=yes ruby -r#{File.dirname(__FILE__)}/exercise.rb -e \"Worker.new(ENV['TEST'] || 'everything', (ENV['LOOPS'] || 50).to_i, 'true').work\"")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -36,7 +36,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -60,6 +60,7 @@ extra_rdoc_files:
 - lib/memcached/rails.rb
 files: 
 - BENCHMARKS
+- BUG
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -69,13 +70,15 @@ files:
 - ext/extconf-make.rb
 - ext/extconf.rb
 - ext/libmemcached-0.32.tar.gz
+- ext/libmemcached-1.patch
 - ext/libmemcached-2.patch
 - ext/libmemcached-3.patch
 - ext/libmemcached-4.patch
 - ext/libmemcached-5.patch
 - ext/libmemcached-6.patch
 - ext/libmemcached-7.patch
-- ext/libmemcached.patch
+- ext/libmemcached-8.patch
+- ext/libmemcached-9.patch
 - ext/rlibmemcached.i
 - ext/rlibmemcached_wrap.c
 - ext/sasl.patch
@@ -86,6 +89,7 @@ files:
 - lib/memcached/experimental.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
+- lib/rlibmemcached.bundle.dSYM/Contents/Info.plist
 - test/profile/benchmark.rb
 - test/profile/c_profiler.rb
 - test/profile/exercise.rb