summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-11 05:21:30 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-11 05:21:30 +0000
commit1485f3c168d984d02af6530bbe2202b55d24f212 (patch)
tree43d60459b50d35a1f11b37e85143bfe38ea52569
parentac0ab1f67511487d5afbc0d24aa37709b504d8d8 (diff)
* vm.c (thread_memsize): don't ignore size of th->local_storage.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c99862..678735e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 11 14:20:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * vm.c (thread_memsize): don't ignore size of th->local_storage.
+
Sat Jun 11 10:32:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
diff --git a/vm.c b/vm.c
index 57cb090..83d4351 100644
--- a/vm.c
+++ b/vm.c
@@ -1761,7 +1761,7 @@ thread_memsize(const void *ptr)
size += th->stack_size * sizeof(VALUE);
}
if (th->local_storage) {
- st_memsize(th->local_storage);
+ size += st_memsize(th->local_storage);
}
return size;
}