summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-03 23:00:21 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-03 23:00:21 +0000
commiteaa4e02d4507ad0658d95403a7a53b78ebb2ed53 (patch)
tree38a928b38fc24bd4067c32744e2ed78c62cce6c6
parente1d5d4e7f2dce151a2e768d0e2cea38f88185958 (diff)
* cont.c (fiber_memsize): Return size.
Before this change, fiber_memsize always returns 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--cont.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d2fdef48c4..d1e7d0f0e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 4 07:57:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * cont.c (fiber_memsize): Return size.
+ Before this change, fiber_memsize always returns 0.
+
Mon Oct 4 07:16:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
* enc/unicode.c (onigenc_unicode_property_name_to_ctype):
diff --git a/cont.c b/cont.c
index 503cc5f475..01e15624da 100644
--- a/cont.c
+++ b/cont.c
@@ -319,7 +319,7 @@ fiber_memsize(const void *ptr)
}
size += cont_memsize(&fib->cont);
}
- return 0;
+ return size;
}
static void