darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-30 15:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8184157: (ch) AsynchronousFileChannel hangs with internal error when reading locked file

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2019-07-25 11:44:37 -07:00
parent da6f042616
commit a8af569fa0
5 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/windows/classes/sun/nio/ch/Iocp.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -317,7 +317,7 @@ class Iocp extends AsynchronousChannelGroupImpl {
myGroupAndInvokeCount.resetInvokeCount();
// wait for I/O completion event
// A error here is fatal (thread will not be replaced)
// An error here is fatal (thread will not be replaced)
replaceMe = false;
try {
getQueuedCompletionStatus(port, ioResult);

3
src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -143,7 +143,6 @@ class PendingIoCache {
// simulate the failure of all pending I/O operations.
for (Long ov: pendingIoMap.keySet()) {
PendingFuture<?,?> result = pendingIoMap.get(ov);
assert !result.isDone();
// make I/O port aware of the stale OVERLAPPED structure
Iocp iocp = (Iocp)((Groupable)result.channel()).group();

17
src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -228,7 +228,6 @@ public class WindowsAsynchronousFileChannelImpl
@Override
public void run() {
long overlapped = 0L;
boolean pending = false;
try {
begin();
@ -242,7 +241,6 @@ public class WindowsAsynchronousFileChannelImpl
overlapped);
if (n == IOStatus.UNAVAILABLE) {
// I/O is pending
pending = true;
return;
}
// acquired lock immediately
@ -253,9 +251,9 @@ public class WindowsAsynchronousFileChannelImpl
// lock failed or channel closed
removeFromFileLockTable(fli);
result.setFailure(toIOException(x));
} finally {
if (!pending && overlapped != 0L)
if (overlapped != 0L)
ioCache.remove(overlapped);
} finally {
end();
}
@ -448,13 +446,12 @@ public class WindowsAsynchronousFileChannelImpl
} catch (Throwable x) {
// failed to initiate read
result.setFailure(toIOException(x));
if (overlapped != 0L)
ioCache.remove(overlapped);
} finally {
if (!pending) {
if (!pending)
// release resources
if (overlapped != 0L)
ioCache.remove(overlapped);
releaseBufferIfSubstituted();
}
end();
}
@ -628,9 +625,9 @@ public class WindowsAsynchronousFileChannelImpl
result.setFailure(toIOException(x));
// release resources
releaseBufferIfSubstituted();
if (overlapped != 0L)
ioCache.remove(overlapped);
releaseBufferIfSubstituted();
} finally {
end();

4
src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -115,7 +115,7 @@ Java_sun_nio_ch_WindowsAsynchronousFileChannelImpl_lockFile(JNIEnv *env, jobject
if (error == ERROR_IO_PENDING) {
return IOS_UNAVAILABLE;
}
JNU_ThrowIOExceptionWithLastError(env, "WriteFile failed");
JNU_ThrowIOExceptionWithLastError(env, "LockFile failed");
return IOS_THROWN;
}
return 0;

54
test/jdk/java/nio/channels/AsynchronousFileChannel/LockReadWriteStressTest.java Normal file
View File

@ -0,0 +1,54 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8184157
* @summary Ensure that correct PendingFuture is used in Iocp completion status event handler
* @requires (os.family == "windows")
*/
import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousFileChannel;
import java.nio.channels.FileLock;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import static java.nio.file.StandardOpenOption.*;
public class LockReadWriteStressTest {
public static void main(String[] args) throws Exception {
Path path = Path.of("blah");
ByteBuffer buf = ByteBuffer.allocate(16);
for (int i=0; i < 1000; i++) {
try (AsynchronousFileChannel ch = AsynchronousFileChannel.open(path,READ, WRITE, CREATE)) {
FileLock lock = ch.lock().get();
ch.read(buf, 0).get();
buf.rewind();
ch.write(buf, 0).get();
lock.release();
buf.clear();
}
}
}
}