提交 4689707f 编写于 作者: R rdurbin

8010396: checking MallocMaxTestWords in testMalloc() function is redundant

Summary: Remove redundant checks in testMalloc and add assert.
Reviewed-by: dcubed, coleenp, dholmes
上级 e66769b0
...@@ -577,15 +577,15 @@ void verify_block(void* memblock) { ...@@ -577,15 +577,15 @@ void verify_block(void* memblock) {
// condition without really running the system out of memory. // condition without really running the system out of memory.
// //
static u_char* testMalloc(size_t alloc_size) { static u_char* testMalloc(size_t alloc_size) {
assert(MallocMaxTestWords > 0, "sanity check");
if (MallocMaxTestWords > 0 && if ((cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) {
(cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) {
return NULL; return NULL;
} }
u_char* ptr = (u_char*)::malloc(alloc_size); u_char* ptr = (u_char*)::malloc(alloc_size);
if (MallocMaxTestWords > 0 && (ptr != NULL)) { if (ptr != NULL) {
Atomic::add(((jint) (alloc_size / BytesPerWord)), Atomic::add(((jint) (alloc_size / BytesPerWord)),
(volatile jint *) &cur_malloc_words); (volatile jint *) &cur_malloc_words);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册