Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/os.cpp	Thu Oct 18 13:09:47 2012 -0400
     1.2 +++ b/src/share/vm/runtime/os.cpp	Fri Oct 19 21:40:07 2012 -0400
     1.3 @@ -600,9 +600,7 @@
     1.4    if (PrintMalloc && tty != NULL) tty->print_cr("os::malloc " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, memblock);
     1.5  
     1.6    // we do not track MallocCushion memory
     1.7 -  if (MemTracker::is_on()) {
     1.8      MemTracker::record_malloc((address)memblock, size, memflags, caller == 0 ? CALLER_PC : caller);
     1.9 -  }
    1.10  
    1.11    return memblock;
    1.12  }
    1.13 @@ -613,7 +611,7 @@
    1.14    NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
    1.15    NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
    1.16    void* ptr = ::realloc(memblock, size);
    1.17 -  if (ptr != NULL && MemTracker::is_on()) {
    1.18 +  if (ptr != NULL) {
    1.19      MemTracker::record_realloc((address)memblock, (address)ptr, size, memflags,
    1.20       caller == 0 ? CALLER_PC : caller);
    1.21    }
    1.22 @@ -1401,7 +1399,7 @@
    1.23  
    1.24  char* os::reserve_memory(size_t bytes, char* addr, size_t alignment_hint) {
    1.25    char* result = pd_reserve_memory(bytes, addr, alignment_hint);
    1.26 -  if (result != NULL && MemTracker::is_on()) {
    1.27 +  if (result != NULL) {
    1.28      MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
    1.29    }
    1.30  
    1.31 @@ -1409,7 +1407,7 @@
    1.32  }
    1.33  char* os::attempt_reserve_memory_at(size_t bytes, char* addr) {
    1.34    char* result = pd_attempt_reserve_memory_at(bytes, addr);
    1.35 -  if (result != NULL && MemTracker::is_on()) {
    1.36 +  if (result != NULL) {
    1.37      MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
    1.38    }
    1.39    return result;
    1.40 @@ -1422,7 +1420,7 @@
    1.41  
    1.42  bool os::commit_memory(char* addr, size_t bytes, bool executable) {
    1.43    bool res = pd_commit_memory(addr, bytes, executable);
    1.44 -  if (res && MemTracker::is_on()) {
    1.45 +  if (res) {
    1.46      MemTracker::record_virtual_memory_commit((address)addr, bytes, CALLER_PC);
    1.47    }
    1.48    return res;
    1.49 @@ -1431,7 +1429,7 @@
    1.50  bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
    1.51                                bool executable) {
    1.52    bool res = os::pd_commit_memory(addr, size, alignment_hint, executable);
    1.53 -  if (res && MemTracker::is_on()) {
    1.54 +  if (res) {
    1.55      MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
    1.56    }
    1.57    return res;
    1.58 @@ -1458,8 +1456,9 @@
    1.59                             char *addr, size_t bytes, bool read_only,
    1.60                             bool allow_exec) {
    1.61    char* result = pd_map_memory(fd, file_name, file_offset, addr, bytes, read_only, allow_exec);
    1.62 -  if (result != NULL && MemTracker::is_on()) {
    1.63 +  if (result != NULL) {
    1.64      MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
    1.65 +    MemTracker::record_virtual_memory_commit((address)result, bytes, CALLER_PC);
    1.66    }
    1.67    return result;
    1.68  }
    1.69 @@ -1474,6 +1473,7 @@
    1.70  bool os::unmap_memory(char *addr, size_t bytes) {
    1.71    bool result = pd_unmap_memory(addr, bytes);
    1.72    if (result) {
    1.73 +    MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
    1.74      MemTracker::record_virtual_memory_release((address)addr, bytes);
    1.75    }
    1.76    return result;