1.1 --- a/src/share/vm/services/memTracker.hpp Mon Sep 17 11:46:19 2012 +0200 1.2 +++ b/src/share/vm/services/memTracker.hpp Mon Sep 17 10:20:04 2012 -0400 1.3 @@ -185,6 +185,7 @@ 1.4 static inline void record_malloc(address addr, size_t size, MEMFLAGS flags, 1.5 address pc = 0, Thread* thread = NULL) { 1.6 if (NMT_CAN_TRACK(flags)) { 1.7 + assert(size > 0, "Sanity check"); 1.8 create_memory_record(addr, (flags|MemPointerRecord::malloc_tag()), size, pc, thread); 1.9 } 1.10 } 1.11 @@ -198,6 +199,7 @@ 1.12 static inline void record_realloc(address old_addr, address new_addr, size_t size, 1.13 MEMFLAGS flags, address pc = 0, Thread* thread = NULL) { 1.14 if (is_on()) { 1.15 + assert(size > 0, "Sanity check"); 1.16 record_free(old_addr, flags, thread); 1.17 record_malloc(new_addr, size, flags, pc, thread); 1.18 } 1.19 @@ -208,6 +210,7 @@ 1.20 // we add a positive offset to arena address, so we can have arena size record 1.21 // sorted after arena record 1.22 if (is_on() && !UseMallocOnly) { 1.23 + assert(addr != NULL, "Sanity check"); 1.24 create_memory_record((addr + sizeof(void*)), MemPointerRecord::arena_size_tag(), size, 1.25 0, NULL); 1.26 } 1.27 @@ -217,7 +220,7 @@ 1.28 static inline void record_virtual_memory_reserve(address addr, size_t size, 1.29 address pc = 0, Thread* thread = NULL) { 1.30 if (is_on()) { 1.31 - assert(size > 0, "reserve szero size"); 1.32 + assert(size > 0, "Sanity check"); 1.33 create_memory_record(addr, MemPointerRecord::virtual_memory_reserve_tag(), 1.34 size, pc, thread); 1.35 } 1.36 @@ -248,6 +251,7 @@ 1.37 static inline void record_virtual_memory_commit(address addr, size_t size, 1.38 address pc = 0, Thread* thread = NULL) { 1.39 if (is_on()) { 1.40 + assert(size > 0, "Sanity check"); 1.41 create_memory_record(addr, MemPointerRecord::virtual_memory_commit_tag(), 1.42 size, DEBUG_CALLER_PC, thread); 1.43 } 1.44 @@ -257,6 +261,7 @@ 1.45 static inline void record_virtual_memory_uncommit(address addr, size_t size, 1.46 Thread* thread = NULL) { 1.47 if (is_on()) { 1.48 + assert(size > 0, "Sanity check"); 1.49 create_memory_record(addr, MemPointerRecord::virtual_memory_uncommit_tag(), 1.50 size, DEBUG_CALLER_PC, thread); 1.51 } 1.52 @@ -266,6 +271,7 @@ 1.53 static inline void record_virtual_memory_release(address addr, size_t size, 1.54 Thread* thread = NULL) { 1.55 if (is_on()) { 1.56 + assert(size > 0, "Sanity check"); 1.57 create_memory_record(addr, MemPointerRecord::virtual_memory_release_tag(), 1.58 size, DEBUG_CALLER_PC, thread); 1.59 }