diff src/os/linux/vm/perfMemory_linux.cpp @ 2103:e24ab3fa6aaf hs20-b06 jdk7-b125

Merge
author trims
date Fri, 07 Jan 2011 22:56:35 -0800
parents 02895c6a2f82
children d2a62e0f25eb
line wrap: on
line diff
--- a/src/os/linux/vm/perfMemory_linux.cpp	Fri Jan 07 22:42:10 2011 -0800
+++ b/src/os/linux/vm/perfMemory_linux.cpp	Fri Jan 07 22:56:35 2011 -0800
@@ -635,7 +635,29 @@
     return -1;
   }
 
-  return fd;
+  // Verify that we have enough disk space for this file.
+  // We'll get random SIGBUS crashes on memory accesses if
+  // we don't.
+
+  for (size_t seekpos = 0; seekpos < size; seekpos += os::vm_page_size()) {
+    int zero_int = 0;
+    result = (int)os::seek_to_file_offset(fd, (jlong)(seekpos));
+    if (result == -1 ) break;
+    RESTARTABLE(::write(fd, &zero_int, 1), result);
+    if (result != 1) {
+      if (errno == ENOSPC) {
+        warning("Insufficient space for shared memory file:\n   %s\nTry using the -Djava.io.tmpdir= option to select an alternate temp location.\n", filename);
+      }
+      break;
+    }
+  }
+
+  if (result != -1) {
+    return fd;
+  } else {
+    RESTARTABLE(::close(fd), result);
+    return -1;
+  }
 }
 
 // open the shared memory file for the given user and vmid. returns