Mercurial > hg > truffle

diff src/share/vm/prims/jvm.cpp @ 362:f8199438385b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author apetrusenko
date Wed, 17 Sep 2008 16:49:18 +0400
parents 1ee8caae33af
children f008d3631bd1
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp	Thu Sep 04 18:40:43 2008 -0700
+++ b/src/share/vm/prims/jvm.cpp	Wed Sep 17 16:49:18 2008 +0400
@@ -377,7 +377,11 @@
 JVM_ENTRY_NO_ENV(jlong, JVM_FreeMemory(void))
   JVMWrapper("JVM_FreeMemory");
   CollectedHeap* ch = Universe::heap();
-  size_t n = ch->capacity() - ch->used();
+  size_t n;
+  {
+     MutexLocker x(Heap_lock);
+     n = ch->capacity() - ch->used();
+  }
   return convert_size_t_to_jlong(n);
 JVM_END