1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8193105: Print error code when map_memory_to_file() fails

Browse Source 
Reviewed-by: dholmes, kbarrett
This commit is contained in:
Sangheon Kim 2017-12-07 10:21:13 -08:00
parent 29bab311ab
commit 0ce6f0b889
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotspot/os/posix/os_posix.cpp
View File

@ -243,8 +243,9 @@ char* os::map_memory_to_file(char* base, size_t size, int fd) {
assert(fd != -1, "File descriptor is not valid"); assert(fd != -1, "File descriptor is not valid");
// allocate space for the file // allocate space for the file
if (util_posix_fallocate(fd, 0, (off_t)size) != 0) { int ret = util_posix_fallocate(fd, 0, (off_t)size);
vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory.")); if (ret != 0) {
vm_exit_during_initialization(err_msg("Error in mapping Java heap at the given filesystem directory. error(%d)", ret));
return NULL; return NULL;
} }
@ -256,12 +257,13 @@ char* os::map_memory_to_file(char* base, size_t size, int fd) {
char* addr = (char*)mmap(base, size, prot, flags, fd, 0); char* addr = (char*)mmap(base, size, prot, flags, fd, 0);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
warning("Failed mmap to file. (%s)", os::strerror(errno));
return NULL; return NULL;
} }
if (base != NULL && addr != base) { if (base != NULL && addr != base) {
if (!os::release_memory(addr, size)) { if (!os::release_memory(addr, size)) {
warning("Could not release memory on unsuccessful file mapping"); warning("Could not release memory on unsuccessful file mapping");
} }
return NULL; return NULL;
} }
return addr; return addr;