memcached 0.16.1 → 0.16.2

data/BENCHMARKS

@@ -7,90 +7,49 @@ You can easily run your own benchmarks, as long as you have memcached itself on
 
 == x86-64 OS X
 
-These benchmarks were run on an OS X 10.5 Core 2 Duo machine (25,000 iterations):
+These benchmarks were run on an OS X 10.5 Core 2 Duo machine (10,000 iterations):
 
-                                           user     system      total        real
-  set:plain:noblock:memcached:net      0.650000   0.250000   0.900000 (  2.165262)
-  set:plain:noblock:memcached:uds      0.580000   0.140000   0.720000 (  1.023195)
-  set:plain:memcached:net              1.540000   2.440000   3.980000 (  9.317136)
-  set:plain:memcached:uds              1.230000   1.400000   2.630000 (  4.919294)
-  set:plain:memcache-client           21.030000   8.650000  29.680000 ( 31.999873)
-  set:ruby:noblock:memcached:net       1.160000   0.250000   1.410000 (  2.685066)
-  set:ruby:noblock:memcached:uds       1.080000   0.160000   1.240000 (  1.496034)
-  set:ruby:memcached:net               2.250000   2.660000   4.910000 ( 10.650423)
-  set:ruby:memcached:uds               1.930000   1.590000   3.520000 (  6.051250)
-  set:ruby:memcache-client            22.000000   8.780000  30.780000 ( 32.554235)
-  get:plain:memcached:net              1.860000   2.720000   4.580000 (  9.813708)
-  get:plain:memcached:uds              1.540000   1.540000   3.080000 (  5.065145)
-  get:plain:memcache-client           25.040000   8.780000  33.820000 ( 35.932318)
-  get:ruby:memcached:net               2.380000   2.780000   5.160000 ( 10.395301)
-  get:ruby:memcached:uds               1.960000   1.590000   3.550000 (  5.531036)
-  get:ruby:memcache-client            25.490000   8.790000  34.280000 ( 36.092947)
-  multiget:ruby:memcached:net          1.300000   0.970000   2.270000 (  3.424010)
-  multiget:ruby:memcached:uds          1.280000   0.720000   2.000000 (  2.375904)
-  multiget:ruby:memcache-client       13.380000   3.170000  16.550000 ( 17.743902)
-  missing:ruby:memcached:net           2.450000   2.600000   5.050000 (  9.982122)
-  missing:ruby:memcached:uds           2.080000   1.600000   3.680000 (  5.168750)
-  missing:ruby:memcached:inline        2.370000   2.480000   4.850000 ( 10.374502)
-  missing:ruby:memcached:uds:inline    2.020000   1.600000   3.620000 (  5.315222)
-  missing:ruby:memcache-client        21.200000   8.220000  29.420000 ( 30.533481)
-  mixed:ruby:noblock:memcached:net     4.590000   6.050000  10.640000 ( 20.344957)
-  mixed:ruby:noblock:memcached:uds     3.650000   2.650000   6.300000 ( 10.304713)
-  mixed:ruby:memcached:net             4.580000   4.920000   9.500000 ( 19.785283)
-  mixed:ruby:memcached:uds             3.850000   2.920000   6.770000 ( 10.850842)
-  mixed:ruby:memcache-client          47.790000  16.510000  64.300000 ( 67.698660)
-  hash:hsieh                           0.050000   0.000000   0.050000 (  0.051601)
-  hash:fnv1_32                         0.090000   0.000000   0.090000 (  0.091872)
-  hash:fnv1a_32                        0.140000   0.000000   0.140000 (  0.137040)
-  hash:fnv1_64                         0.240000   0.000000   0.240000 (  0.246802)
-  hash:fnv1a_64                        0.130000   0.000000   0.130000 (  0.133671)
-  hash:murmur                          0.090000   0.000000   0.090000 (  0.095826)
-  hash:default                         0.120000   0.000000   0.120000 (  0.124794)
-  hash:jenkins                         0.100000   0.010000   0.110000 (  0.111693)
-  hash:md5                             0.230000   0.000000   0.230000 (  0.229894)
-  hash:crc                             0.090000   0.000000   0.090000 (  0.093286)
+Ruby 1.8.7p174
+Loaded memcached 0.16.2
+Loaded memcache-client 1.7.4
+                                         user     system      total        real
+set:plain:noblock:memcached:net      0.270000   0.110000   0.380000 (  0.911797)
+set:plain:noblock:memcached:uds      0.250000   0.060000   0.310000 (  0.471307)
+set:plain:memcached:net              0.640000   0.980000   1.620000 (  3.662495)
+set:plain:memcached:uds              0.500000   0.560000   1.060000 (  1.962946)
+set:plain:memcache-client            7.640000   3.200000  10.840000 ( 11.264549)
+set:ruby:noblock:memcached:net       0.450000   0.110000   0.560000 (  1.049771)
+set:ruby:noblock:memcached:uds       0.420000   0.060000   0.480000 (  0.581246)
+set:ruby:memcached:net               0.890000   0.990000   1.880000 (  4.022136)
+set:ruby:memcached:uds               0.770000   0.590000   1.360000 (  2.462128)
+set:ruby:memcache-client             7.210000   3.000000  10.210000 ( 12.328381)
+get:plain:memcached:net              0.730000   0.970000   1.700000 (  3.866983)
+get:plain:memcached:uds              0.650000   0.600000   1.250000 (  2.477487)
+get:plain:memcache-client            8.340000   2.910000  11.250000 ( 12.963698)
+get:ruby:memcached:net               0.910000   0.930000   1.840000 (  4.232627)
+get:ruby:memcached:uds               0.750000   0.580000   1.330000 (  2.107293)
+get:ruby:memcache-client             9.180000   3.160000  12.340000 ( 13.018086)
+multiget:ruby:memcached:net          0.510000   0.360000   0.870000 (  1.286799)
+multiget:ruby:memcached:uds          0.500000   0.270000   0.770000 (  0.957104)
+multiget:ruby:memcache-client        5.000000   1.140000   6.140000 (  6.357939)
+missing:ruby:memcached:net           0.990000   1.040000   2.030000 (  3.863125)
+missing:ruby:memcached:uds           0.860000   0.650000   1.510000 (  2.375266)
+missing:ruby:memcached:inline        0.960000   1.030000   1.990000 (  3.810818)
+missing:ruby:memcached:uds:inline    0.830000   0.640000   1.470000 (  2.189629)
+missing:ruby:memcache-client         7.690000   3.180000  10.870000 ( 11.838813)
+mixed:ruby:noblock:memcached:net     1.840000   2.530000   4.370000 (  8.177355)
+mixed:ruby:noblock:memcached:uds     1.420000   1.050000   2.470000 (  4.167074)
+mixed:ruby:memcached:net             1.830000   1.980000   3.810000 (  7.666954)
+mixed:ruby:memcached:uds             1.520000   1.160000   2.680000 (  4.286830)
+mixed:ruby:memcache-client          17.980000   6.490000  24.470000 ( 26.107002)
+hash:murmur                          0.040000   0.000000   0.040000 (  0.039768)
+hash:default                         0.040000   0.000000   0.040000 (  0.041131)
+hash:jenkins                         0.050000   0.000000   0.050000 (  0.051128)
+hash:md5                             0.090000   0.010000   0.100000 (  0.092318)
+hash:crc                             0.040000   0.000000   0.040000 (  0.036825)
+hash:hsieh                           0.020000   0.000000   0.020000 (  0.020522)
+hash:fnv1_32                         0.050000   0.000000   0.050000 (  0.044151)
+hash:fnv1a_32                        0.040000   0.000000   0.040000 (  0.046496)
+hash:fnv1_64                         0.100000   0.000000   0.100000 (  0.110565)
+hash:fnv1a_64                        0.050000   0.000000   0.050000 (  0.052217)
 
-== x86-64 Linux
-  
-These benchmarks were run on a RHEL4 Xeon machine (25,000 iterations):
-
-                                           user     system      total        real
-  set:plain:noblock:memcached:net      0.560000   0.370000   0.930000 (  1.492691)
-  set:plain:noblock:memcached:uds      0.500000   0.120000   0.620000 (  0.837311)
-  set:plain:memcached:net              1.070000   1.350000   2.420000 (  4.655494)
-  set:plain:memcached:uds              1.030000   0.590000   1.620000 (  3.126471)
-  set:plain:memcache-client           19.270000   1.500000  20.770000 ( 24.860087)
-  set:ruby:noblock:memcached:net       1.090000   0.120000   1.210000 (  2.583293)
-  set:ruby:noblock:memcached:uds       1.100000   0.120000   1.220000 (  1.501633)
-  set:ruby:memcached:net               1.760000   1.410000   3.170000 (  5.481738)
-  set:ruby:memcached:uds               1.750000   0.590000   2.340000 (  4.040445)
-  set:ruby:memcache-client            19.490000   1.430000  20.920000 ( 24.545314)
-  get:plain:memcached:net              1.160000   1.200000   2.360000 (  4.515177)
-  get:plain:memcached:uds              1.110000   0.630000   1.740000 (  3.039308)
-  get:plain:memcache-client           22.100000   1.440000  23.540000 ( 26.822877)
-  get:ruby:memcached:net               1.770000   1.110000   2.880000 (  5.029304)
-  get:ruby:memcached:uds               1.680000   0.600000   2.280000 (  3.241249)
-  get:ruby:memcache-client            22.770000   1.430000  24.200000 ( 28.643709)
-  multiget:ruby:memcached:net          1.030000   0.420000   1.450000 (  2.132928)
-  multiget:ruby:memcached:uds          1.080000   0.250000   1.330000 (  1.914999)
-  multiget:ruby:memcache-client       13.410000   0.520000  13.930000 ( 15.359580)
-  missing:ruby:memcached:net           1.760000   1.290000   3.050000 (  5.029804)
-  missing:ruby:memcached:uds           1.730000   0.620000   2.350000 (  3.772379)
-  missing:ruby:memcached:inline        1.750000   1.220000   2.970000 (  5.029707)
-  missing:ruby:memcached:uds:inline    1.620000   0.670000   2.290000 (  3.612413)
-  missing:ruby:memcache-client        19.310000   1.360000  20.670000 ( 24.277446)
-  mixed:ruby:noblock:memcached:net     3.530000   2.310000   5.840000 ( 10.037807)
-  mixed:ruby:noblock:memcached:uds     3.270000   1.000000   4.270000 (  6.980218)
-  mixed:ruby:memcached:net             3.760000   2.510000   6.270000 ( 10.478885)
-  mixed:ruby:memcached:uds             3.740000   1.190000   4.930000 (  7.898747)
-  mixed:ruby:memcache-client          45.900000   2.870000  48.770000 ( 56.733674)
-  hash:hsieh                           0.040000   0.000000   0.040000 (  0.041816)
-  hash:md5                             0.120000   0.000000   0.120000 (  0.121045)
-  hash:fnv1_32                         0.060000   0.000000   0.060000 (  0.062099)
-  hash:fnv1a_32                        0.060000   0.000000   0.060000 (  0.063173)
-  hash:fnv1a_64                        0.070000   0.000000   0.070000 (  0.071170)
-  hash:default                         0.080000   0.000000   0.080000 (  0.081224)
-  hash:jenkins                         0.050000   0.000000   0.050000 (  0.053789)
-  hash:fnv1_64                         0.090000   0.000000   0.090000 (  0.089719)
-  hash:crc                             0.080000   0.000000   0.080000 (  0.079723)
-  hash:murmur                          0.050000   0.000000   0.050000 (  0.048248)

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.16.2. Fix memory leak.
+
 v0.16.1. Use seeded random. Fix realloc bug on Linux.
 
 v0.16. Build properly on OS X Snow Leopard.

data/ext/extconf.rb

@@ -38,9 +38,7 @@ if !ENV["EXTERNAL_LIB"]
 
       Dir.chdir(BUNDLE_PATH) do
         
-        cflags = "-fPIC"
-        cxxflags = cflags
-        ldflags = "-fPIC"
+        cxxflags = cflags = ldflags = "-fPIC"
         extraconf = ''
         
         # again... is there a better way to do this?
@@ -50,6 +48,12 @@ if !ENV["EXTERNAL_LIB"]
           ldflags = "#{ldflags} #{archflags}"
           extraconf = '--enable-dtrace --disable-dependency-tracking'
         end
+                
+        if ENV['DEBUG']
+          puts "Setting debug flags for libmemcached."
+          cflags << " -O0 -ggdb -DHAVE_DEBUG"
+          extraconf << " --enable-debug"
+        end
         
         puts(cmd = "env CFLAGS='#{cflags}' LDFLAGS='#{ldflags}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils #{extraconf} 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
@@ -58,7 +62,10 @@ if !ENV["EXTERNAL_LIB"]
         puts(cmd = "make install || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
       end
-      system("rm -rf #{BUNDLE_PATH}") unless ENV['DEV']
+
+      unless ENV['DEBUG'] or ENV['DEV']
+        system("rm -rf #{BUNDLE_PATH}")
+      end
     end
   end
   
@@ -70,6 +77,15 @@ if !ENV["EXTERNAL_LIB"]
   $LIBS << " -lmemcached_gem"
 end
 
+$CFLAGS.gsub! /-O\d/, ''
+
+if ENV['DEBUG']
+  puts "Setting debug flags for gem."
+  $CFLAGS << " -O0 -ggdb -DHAVE_DEBUG"
+else
+  $CFLAGS << " -O3"
+end
+
 if DARWIN
   $CFLAGS.gsub! /-arch \S+/, ''
   $CFLAGS << " #{archflags}"
@@ -83,13 +99,4 @@ if ENV['SWIG']
   raise "'#{cmd}' failed" unless system(cmd)
 end
 
-$CFLAGS.gsub! /-O\d/, ''
-
-if ENV['DEBUG']
-  puts "Setting debug flags."
-  $CFLAGS << " -O0 -ggdb -DHAVE_DEBUG"
-else
-  $CFLAGS << " -O3"
-end
-
 create_makefile 'rlibmemcached'

data/ext/rlibmemcached.i

@@ -15,6 +15,9 @@
 
 // Register libmemcached's struct free function to prevent memory leaks
 %freefunc memcached_st "memcached_free";
+%freefunc memcached_server_st "memcached_server_free";
+
+// %trackobjects; // Doesn't fix any interesting leaks
 
 //// Input maps
 

data/ext/rlibmemcached_wrap.c

@@ -11595,11 +11595,6 @@ fail:
 }
 
 
-SWIGINTERN void
-free_memcached_server_st(struct memcached_server_st *arg1) {
-    free((char *) arg1);
-}
-
 SWIGINTERN VALUE
 _wrap_memcached_server_cursor(int argc, VALUE *argv, VALUE self) {
   memcached_st *arg1 = (memcached_st *) 0 ;
@@ -13040,7 +13035,7 @@ SWIGEXPORT void Init_rlibmemcached(void) {
   rb_define_method(cMemcachedServerSt.klass, "hostname=", _wrap_MemcachedServerSt_hostname_set, -1);
   rb_define_method(cMemcachedServerSt.klass, "hostname", _wrap_MemcachedServerSt_hostname_get, -1);
   cMemcachedServerSt.mark = 0;
-  cMemcachedServerSt.destroy = (void (*)(void *)) free_memcached_server_st;
+  cMemcachedServerSt.destroy = (void (*)(void *)) memcached_server_free;
   cMemcachedServerSt.trackObjects = 0;
   rb_define_module_function(mRlibmemcached, "memcached_server_cursor", _wrap_memcached_server_cursor, -1);
   rb_define_module_function(mRlibmemcached, "memcached_server_by_key", _wrap_memcached_server_by_key, -1);

data/lib/memcached/memcached.rb

@@ -137,9 +137,12 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
   # object.
   #
   def clone
-    memcached = super
-    memcached.instance_variable_set('@struct', Lib.memcached_clone(nil, @struct))
-    memcached
+    # FIXME Memory leak
+    # memcached = super
+    # struct = Lib.memcached_clone(nil, @struct)
+    # memcached.instance_variable_set('@struct', struct)
+    # memcached
+    self.class.new(servers, options)
   end
 
   # Reset the state of the libmemcached struct. This is useful for changing the server list at runtime.
@@ -337,7 +340,11 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
   # Return the server used by a particular key.
   def server_by_key(key)
     ret = Lib.memcached_server_by_key(@struct, key)
-    inspect_server(ret.first) if ret.is_a?(Array)
+    if ret.is_a?(Array)
+      string = inspect_server(ret.first) 
+      Rlibmemcached.memcached_server_free(ret.first)
+      string
+    end
   end
 
   # Return a Hash of statistics responses from the set of servers. Each value is an array with one entry for each server, in the same order the servers were defined.

data/memcached.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.16.1"
+  s.version = "0.16.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]

data/test/profile/benchmark.rb

@@ -11,6 +11,9 @@ begin; require 'memory'; rescue LoadError; end
 
 ARGV << "--with-memcached" << "--with-memcache-client" if ARGV.join !~ /--with/
 
+puts `uname -a`
+puts "Ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+
 ARGV.each do |flag|
   require_name = flag[/--with-(\w+)/, 1]
   gem_name = flag[/--with-(.*)$/, 1]

data/test/profile/valgrind.rb

@@ -9,6 +9,8 @@ class Worker
   def initialize(method_name, iterations)
     @method = method_name || 'mixed'
     @i = (iterations || 10000).to_i
+    
+    puts "*** Running #{@method.inspect} test for #{@i} loops. ***"
 
     @key1 = "key1-"*8  
     @key2 = "key2-"*8  
@@ -102,17 +104,36 @@ class Worker
         @i.times do
           cache = @cache.clone
         end
+      when "reset"
+        @i.times do
+          @cache.reset
+        end
       when "servers"
         @i.times do
           @cache.servers
         end
+      when "server_by_key"
+        @i.times do
+          @cache.server_by_key(@key1)
+        end
       else
         raise "No such method"
     end
     
-    GC.start
+    puts "*** Garbage collect. ***"
+    10.times do       
+      GC.start
+      sleep 0.1
+    end
+
+    sts, server_sts, clients = 0, 0, 0
+    ObjectSpace.each_object(Memcached) { clients += 1 }
+    ObjectSpace.each_object(Rlibmemcached::MemcachedSt) { sts += 1 }  
+    ObjectSpace.each_object(Rlibmemcached::MemcachedServerSt) { server_sts += 1 }  
+    puts "*** Structs: #{sts} ***"
+    puts "*** Server structs: #{server_sts} ***"
+    puts "*** Clients: #{clients} ***"
   end  
-  
 end
 
 Worker.new(ENV['METHOD'], ENV['LOOPS']).work

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors: 
 - Evan Weaver

metadata.gz.sig

@@ -1 +1,2 @@
-]v>�2lS_L�bR�C�
�e�#b����?�P�WAv��8T��g�qO�L���N�����6�b9 w�'�!�;�n�j��Pb*o�hhl;y�uXF_;�P;�o//
Ml�|��}���X8�R�'	Q��m�[|�C,�_��ް%$���#��41z�#}���fǯ��tK3�Y��&��-�R��6�K�"�44�v�|"�2�w?+�Ji��pΘ\8c�7/A'f���\2������8��C��꽲1� �E�m�sT�,�
+t�3I�r/G��&��2j#���ҩ�|���
-8iwA�t	��ҡ�-��ѝ��}-�_a�~���a�.<O��&P�Si�c5v�`���.���v��YIu��Ff®m�<�(�f������u�ԅy0��6���}��X<-�8�
w$� 9�o���MF{��	ck���j��]*�ݔŴBz$�GXN�
+�a����������*���P�a��b&s���\���e�]G�&�*���v�2}e�g:l�