@@ -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.
CHANGELOG
@@ -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'
ext/extconf.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.
lib/memcached/memcached.rb
@@ -10,7 +10,7 @@ class Worker
@method = method_name || 'mixed'
@i = (iterations || 10000).to_i
- puts "Running #{@method.inspect} test for #{@i} loops."
+ puts "*** Running #{@method.inspect} test for #{@i} loops. ***"
@key1 = "key1-"*8
@key2 = "key2-"*8
@@ -104,6 +104,10 @@ class Worker
@i.times do
cache = @cache.clone
end
+ when "reset"
+ @i.times do
+ @cache.reset
+ end
when "servers"
@i.times do
@cache.servers
@@ -112,9 +116,18 @@ class Worker
raise "No such method"
end
- GC.start
+ puts "*** Garbage collect. ***"
+ 10.times do
+ GC.start
+ sleep 0.1
+ end
+
+ sts, clients = 0, 0
+ ObjectSpace.each_object(Memcached) { clients += 1 }
+ ObjectSpace.each_object(Rlibmemcached::MemcachedSt) { sts += 1 }
+ puts "*** Structs: #{sts} ***"
+ puts "*** Clients: #{clients} ***"
end
-
end
Worker.new(ENV['METHOD'], ENV['LOOPS']).work
test/profile/valgrind.rb
2c18ee7cc31b20b4df9ec8c6941dfbc6389f676d
Evan Weaver
eweaver@twitter.com
http://github.com/chriseppstein/memcached/commit/1523ed860a4a620675f63c64a56654f21b728142
1523ed860a4a620675f63c64a56654f21b728142
2009-09-02T21:34:00-07:00
2009-09-02T21:33:39-07:00
Fix clone memory leak.
2606190544497ef10d31c0b960442acc29d21388
Evan Weaver
eweaver@twitter.com