From 3bd554d393118fd5553157eabf746ebd72348291 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 2 Dec 2010 08:05:44 +0000 Subject: merges r29406 from trunk into ruby_1_9_2. -- * cont.c (fiber_memsize): Return size. Before this change, fiber_memsize always returns 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ cont.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 925555acb3..a2cbd54141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 4 07:57:51 2010 NARUSE, Yui + + * cont.c (fiber_memsize): Return size. + Before this change, fiber_memsize always returns 0. + Sat Oct 2 22:59:32 2010 Masaki Suketa * test/win32ole/test_thread.rb: add for win32ole with Thread. diff --git a/cont.c b/cont.c index 294a197f7f..ff7cfd50e9 100644 --- a/cont.c +++ b/cont.c @@ -221,7 +221,7 @@ fiber_memsize(const void *ptr) } size += cont_memsize(&fib->cont); } - return 0; + return size; } static void diff --git a/version.h b/version.h index 20b87a9cbe..a6abdb2aab 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 57 +#define RUBY_PATCHLEVEL 58 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3