Mercurial > hg > truffle

diff src/share/vm/services/memTracker.hpp @ 6599:4acebbe310e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7185614: NMT ON: "check by caller" assertion failed on nsk ThreadMXBean test 7187429: NMT ON: Merge failure should cause NMT to shutdown Summary: Fixed NMT assertion failures Reviewed-by: acorn, kvn
author zgu
date Wed, 01 Aug 2012 17:19:30 -0400
parents d5bc62fcfac7
children 33143ee07800
line wrap: on
line diff
--- a/src/share/vm/services/memTracker.hpp	Mon Jul 23 14:28:38 2012 -0700
+++ b/src/share/vm/services/memTracker.hpp	Wed Aug 01 17:19:30 2012 -0400
@@ -184,7 +184,6 @@
   // record a 'malloc' call
   static inline void record_malloc(address addr, size_t size, MEMFLAGS flags,
                             address pc = 0, Thread* thread = NULL) {
-    assert(is_on(), "check by caller");
     if (NMT_CAN_TRACK(flags)) {
       create_memory_record(addr, (flags|MemPointerRecord::malloc_tag()), size, pc, thread);
     }
@@ -285,7 +284,6 @@
 
   // retrieve global snapshot
   static MemSnapshot* get_snapshot() {
-    assert(is_on(), "native memory tracking is off");
     if (shutdown_in_progress()) {
       return NULL;
     }