src/os/bsd/vm/os_bsd.cpp

*** 1973,2004 ****
      ::close(fd);
      unlink(buf);
    }
  }
  
  // NOTE: Bsd kernel does not really reserve the pages for us.
  //       All it does is to check if there are enough free pages
  //       left at the time of mmap(). This could be a potential
  //       problem.
  bool os::pd_commit_memory(char* addr, size_t size, bool exec) {
    int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
  #ifdef __OpenBSD__
    // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
!   return ::mprotect(addr, size, prot) == 0;
  #else
    uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
                                     MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
!   return res != (uintptr_t) MAP_FAILED;
  #endif
- }
  
  
  bool os::pd_commit_memory(char* addr, size_t size, size_t alignment_hint,
                         bool exec) {
!   return commit_memory(addr, size, exec);
  }
  
  void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
  }
  
  void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
    ::madvise(addr, bytes, MADV_DONTNEED);
--- 1973,2038 ----
      ::close(fd);
      unlink(buf);
    }
  }
  
+ static void warn_fail_commit_memory(char* addr, size_t size, bool exec,
+                                     int err) {
+   warning("INFO: os::commit_memory(" PTR_FORMAT ", " SIZE_FORMAT
+           ", %d) failed; error='%s' (errno=%d)", addr, size, exec,
+           strerror(err), err);
+ }
+ 
  // NOTE: Bsd kernel does not really reserve the pages for us.
  //       All it does is to check if there are enough free pages
  //       left at the time of mmap(). This could be a potential
  //       problem.
  bool os::pd_commit_memory(char* addr, size_t size, bool exec) {
    int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
  #ifdef __OpenBSD__
    // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
!   if (::mprotect(addr, size, prot) == 0) {
!     return true;
!   }
  #else
    uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
                                     MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
!   if (res != (uintptr_t) MAP_FAILED) {
!     return true;
!   }
  #endif
  
+   // Warn about any commit errors we see in non-product builds just
+   // in case mmap() doesn't work as described on the man page.
+   NOT_PRODUCT(warn_fail_commit_memory(addr, size, exec, errno);)
  
+   return false;
+ }
+ 
  bool os::pd_commit_memory(char* addr, size_t size, size_t alignment_hint,
                         bool exec) {
!   // alignment_hint is ignored on this OS
!   return pd_commit_memory(addr, size, exec);
  }
  
+ void os::pd_commit_memory_or_exit(char* addr, size_t size, bool exec,
+                                   const char* mesg) {
+   assert(mesg != NULL, "mesg must be specified");
+   if (!pd_commit_memory(addr, size, exec)) {
+     // add extra info in product mode for vm_exit_out_of_memory():
+     PRODUCT_ONLY(warn_fail_commit_memory(addr, size, exec, errno);)
+     vm_exit_out_of_memory(size, OOM_MMAP_ERROR, mesg);
+   }
+ }
+ 
+ void os::pd_commit_memory_or_exit(char* addr, size_t size,
+                                   size_t alignment_hint, bool exec,
+                                   const char* mesg) {
+   // alignment_hint is ignored on this OS
+   pd_commit_memory_or_exit(addr, size, exec, mesg);
+ }
+ 
  void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
  }
  
  void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
    ::madvise(addr, bytes, MADV_DONTNEED);
*** 2047,2057 ****
    return res  != (uintptr_t) MAP_FAILED;
  #endif
  }
  
  bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
!   return os::commit_memory(addr, size);
  }
  
  // If this is a growable mapping, remove the guard pages entirely by
  // munmap()ping them.  If not, just call uncommit_memory().
  bool os::remove_stack_guard_pages(char* addr, size_t size) {
--- 2081,2091 ----
    return res  != (uintptr_t) MAP_FAILED;
  #endif
  }
  
  bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
!   return os::commit_memory(addr, size, !ExecMem);
  }
  
  // If this is a growable mapping, remove the guard pages entirely by
  // munmap()ping them.  If not, just call uncommit_memory().
  bool os::remove_stack_guard_pages(char* addr, size_t size) {
*** 3392,3402 ****
      tty->print("[SafePoint Polling address: " INTPTR_FORMAT "]\n", (intptr_t)polling_page);
  #endif
  
    if (!UseMembar) {
      address mem_serialize_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
!     guarantee( mem_serialize_page != NULL, "mmap Failed for memory serialize page");
      os::set_memory_serialize_page( mem_serialize_page );
  
  #ifndef PRODUCT
      if(Verbose && PrintMiscellaneous)
        tty->print("[Memory Serialize  Page address: " INTPTR_FORMAT "]\n", (intptr_t)mem_serialize_page);
--- 3426,3436 ----
      tty->print("[SafePoint Polling address: " INTPTR_FORMAT "]\n", (intptr_t)polling_page);
  #endif
  
    if (!UseMembar) {
      address mem_serialize_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
!     guarantee( mem_serialize_page != MAP_FAILED, "mmap Failed for memory serialize page");
      os::set_memory_serialize_page( mem_serialize_page );
  
  #ifndef PRODUCT
      if(Verbose && PrintMiscellaneous)
        tty->print("[Memory Serialize  Page address: " INTPTR_FORMAT "]\n", (intptr_t)mem_serialize_page);