8000 merge revision(s) r45291,r45299,r45314,r45325: [Backport #9518] · github/ruby@0385f54 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0385f54

Browse files
nagachikanagachika
committed
merge revision(s) r45291,r45299,r45314,r45325: [Backport ruby#9518]
 * ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free), ext/fiddle/handle.c (fiddle_handle_free), ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak. based on the patch Heesob Park at [ruby-dev:48021] [Bug ruby#9599]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent e82dd50 commit 0385f54

File tree

11 files changed

+33
-3
lines changed

11 files changed

+33
-3
lines changed

‎ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Mon May 5 02:21:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
2+
3+
* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
4+
ext/fiddle/handle.c (fiddle_handle_free),
5+
ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
6+
based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].
7+
18
Mon May 5 01:20:27 2014 Eric Wong <e@80x24.org>
29

310
* gc.c (rb_gc_writebarrier): drop special case for big hash/array

‎ext/dl/cptr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ dlptr_free(void *ptr)
4949
(*(data->free))(data->ptr);
5050
}
5151
}
52+
xfree(ptr);
5253
}
5354

5455
static size_t

‎ext/dl/handle.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ dlhandle_free(void *ptr)
3838
if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
3939
dlclose(dlhandle->ptr);
4040
}
41+
xfree(ptr);
4142
}
4243

4344
static size_t

â 10000 €Žext/fiddle/handle.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ fiddle_handle_free(void *ptr)
4040
if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
4141
dlclose(fiddle_handle->ptr);
4242
}
43+
xfree(ptr);
4344
}
4445

4546
static size_t

‎ext/fiddle/pointer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ fiddle_ptr_free(void *ptr)
5656
(*(data->free))(data->ptr);
5757
}
5858
}
59+
xfree(ptr);
5960
}
6061

6162
static size_t

‎test/dl/test_cptr.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,8 @@ def test_null_pointer
219219
assert_raise(DLError) {nullpo[0] = 1}
220220
end
221221
end
222+
223+
def test_no_memory_leak
224+
assert_no_memory_leak(%w[-W0 -rdl.so], '', '100_000.times {DL::CPtr.allocate}', rss: true)
225+
end
222226
end

‎test/dl/test_handle.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,8 @@ def test_dlerror
184184
DL.dlopen("/lib/libc.so.7").sym('strcpy')
185185
end if /freebsd/=~ RUBY_PLATFORM
186186
end
187+
188+
def test_no_memory_leak
189+
assert_no_memory_leak(%w[-W0 -rdl.so], '', '100_000.times {DL::Handle.allocate}; GC.start', rss: true)
190+
end
187191
end

‎test/fiddle/test_handle.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
begin
22
require_relative 'helper'
3+
require_relative '../ruby/envutil'
34
rescue LoadError
45
end
56

67
module Fiddle
78
class TestHandle < TestCase
89
include Fiddle
910

11+
include Test::Unit::Assertions
12+
1013
def test_to_i
1114
handle = Fiddle::Handle.new(LIBC_SO)
1215
assert_kind_of Integer, handle.to_i
@@ -185,5 +188,9 @@ def test_dlerror
185188
Socket.gethostbyname("localhost")
186189
Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
187190
end if /freebsd/=~ RUBY_PLATFORM
191+
192+
def test_no_memory_leak
193+
assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Handle.allocate}; GC.start', rss: true)
194+
end
188195
end
189196
end if defined?(Fiddle)

‎test/fiddle/test_pointer.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,9 @@ def test_null_pointer
230230
assert_raise(DLError) {nullpo[0]}
231231
assert_raise(DLError) {nullpo[0] = 1}
232232
end
233+
234+
def test_no_memory_leak
235+
assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Pointer.allocate}', rss: true)
236+
end
233237
end
234238
end if defined?(Fiddle)

‎test/ruby/envutil.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def assert_warn(*args)
372372
assert_warning(*args) {$VERBOSE = false; yield}
373373
end
374374

375-
def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5, **opt)
375+
def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5, rss: false, **opt)
376376
require_relative 'memory_status'
377377
token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m"
378378
token_dump = token.dump
@@ -397,7 +397,7 @@ def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.5, **opt)
397397
before = err.sub!(/^#{token_re}START=(\{.*\})\n/, '') && Memory::Status.parse($1)
398398
after = err.sub!(/^#{token_re}FINAL=(\{.*\})\n/, '') && Memory::Status.parse($1)
399399
assert_equal([true, ""], [status.success?, err], message)
400-
([:size, :rss] & after.members).each do |n|
400+
([:size, (rss && :rss)] & after.members).each do |n|
401401
b = before[n]
402402
a = after[n]
403403
next unless a > 0 and b > 0

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.2"
22
#define RUBY_RELEASE_DATE "2014-05-05"
3-
#define RUBY_PATCHLEVEL 90
3+
#define RUBY_PATCHLEVEL 91
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 5

0 commit comments

Comments
 (0)
0