diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/io/natFileDescriptorPosix.cc | 60 |
2 files changed, 44 insertions, 23 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5b447ee..05f433a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-07-25 Tom Tromey <tromey@redhat.com> + + * java/io/natFileDescriptorPosix.cc (write): Try again on EINTR. + (write): Likewise. + (read): Likewise. + (read): Likewise. + 2003-07-25 Mark Wielaard <mark@klomp.org> * java/lang/natRuntime.cc (_load): Add library name to diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index 2ad2d9d..e43bb9d 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -150,7 +150,8 @@ java::io::FileDescriptor::write (jint b) iioe->bytesTransferred = r == -1 ? 0 : r; throw iioe; } - throw new IOException (JvNewStringLatin1 (strerror (errno))); + if (errno != EINTR) + throw new IOException (JvNewStringLatin1 (strerror (errno))); } } position++; @@ -178,7 +179,8 @@ java::io::FileDescriptor::write (jbyteArray b, jint offset, jint len) iioe->bytesTransferred = written; throw iioe; } - throw new IOException (JvNewStringLatin1 (strerror (errno))); + if (errno != EINTR) + throw new IOException (JvNewStringLatin1 (strerror (errno))); } written += r; @@ -282,20 +284,26 @@ jint java::io::FileDescriptor::read (void) { jbyte b; - int r = ::read (fd, &b, 1); - if (r == 0) - return -1; - if (r == -1) + int r; + do { - if (java::lang::Thread::interrupted()) + r = ::read (fd, &b, 1); + if (r == 0) + return -1; + if (r == -1) { - InterruptedIOException *iioe - = new InterruptedIOException (JvNewStringLatin1 (strerror (errno))); - iioe->bytesTransferred = r == -1 ? 0 : r; - throw iioe; + if (java::lang::Thread::interrupted()) + { + InterruptedIOException *iioe + = new InterruptedIOException (JvNewStringLatin1 (strerror (errno))); + iioe->bytesTransferred = r == -1 ? 0 : r; + throw iioe; + } + if (errno != EINTR) + throw new IOException (JvNewStringLatin1 (strerror (errno))); } - throw new IOException (JvNewStringLatin1 (strerror (errno))); } + while (r != 1); position++; return b & 0xFF; } @@ -314,20 +322,26 @@ java::io::FileDescriptor::read (jbyteArray buffer, jint offset, jint count) return 0; jbyte *bytes = elements (buffer) + offset; - int r = ::read (fd, bytes, count); - if (r == 0) - return -1; - if (r == -1) - { - if (java::lang::Thread::interrupted()) + int r; + do + { + r = ::read (fd, bytes, count); + if (r == 0) + return -1; + if (r == -1) { - InterruptedIOException *iioe - = new InterruptedIOException (JvNewStringLatin1 (strerror (errno))); - iioe->bytesTransferred = r == -1 ? 0 : r; - throw iioe; + if (java::lang::Thread::interrupted()) + { + InterruptedIOException *iioe + = new InterruptedIOException (JvNewStringLatin1 (strerror (errno))); + iioe->bytesTransferred = r == -1 ? 0 : r; + throw iioe; + } + if (errno != EINTR) + throw new IOException (JvNewStringLatin1 (strerror (errno))); } - throw new IOException (JvNewStringLatin1 (strerror (errno))); } + while (r <= 0); position += r; return r; } |