stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8010396: checking MallocMaxTestWords in testMalloc() function is redundant

Browse Source 
Remove redundant checks in testMalloc and add assert.

Reviewed-by: dcubed, coleenp, dholmes
This commit is contained in:
Ron Durbin 2013-03-20 20:44:54 -07:00
parent 6009be79b3
commit a003234ac8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/runtime/os.cpp
View File

@ -577,15 +577,15 @@ void verify_block(void* memblock) {
// condition without really running the system out of memory.
//
static u_char* testMalloc(size_t alloc_size) {
assert(MallocMaxTestWords > 0, "sanity check");
if (MallocMaxTestWords > 0 &&
(cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) {
if ((cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) {
return NULL;
}
u_char* ptr = (u_char*)::malloc(alloc_size);
if (MallocMaxTestWords > 0 && (ptr != NULL)) {
if (ptr != NULL) {
Atomic::add(((jint) (alloc_size / BytesPerWord)),
(volatile jint *) &cur_malloc_words);
}