8153641: assert(thread_state == _thread_in_native) failed: Assumed thread_in_native while heap dump

Reviewed-by: dsamersoff, sspitsyn, sla

src/os/solaris/vm/os_solaris.cpp

@@ -6248,14 +6248,7 @@ bool os::is_headless_jre() {
 }
 
 size_t os::write(int fd, const void *buf, unsigned int nBytes) {
-  Thread* t = ThreadLocalStorage::thread();
-  if (t->is_Java_thread()) {
-    INTERRUPTIBLE_RETURN_INT(::write(fd, buf, nBytes), os::Solaris::clear_interrupted);
-  } else {
-    size_t res;
-    RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res);
-    return res;
-  }
+  INTERRUPTIBLE_RETURN_INT(::write(fd, buf, nBytes), os::Solaris::clear_interrupted);
 }
 
 int os::close(int fd) {

src/share/vm/services/heapDumper.cpp

@@ -468,7 +468,7 @@ void DumpWriter::close() {
   // flush and close dump file
   if (is_open()) {
     flush();
-    os::close(file_descriptor());
+    ::close(file_descriptor());
     set_file_descriptor(-1);
   }
 }
@@ -480,12 +480,11 @@ void DumpWriter::write_internal(void* s, size_t len) {
     ssize_t n = 0;
     while (len > 0) {
       uint tmp = (uint)MIN2(len, (size_t)UINT_MAX);
-      n = os::write(file_descriptor(), pos, tmp);
+      n = ::write(file_descriptor(), pos, tmp);
 
       if (n < 0) {
-        // EINTR cannot happen here, os::write will take care of that
         set_error(strerror(errno));
-        os::close(file_descriptor());
+        ::close(file_descriptor());
         set_file_descriptor(-1);
         return;
       }