author | tschatzl |
Wed, 24 Jul 2019 11:49:39 +0200 | |
changeset 57508 | 28ab01c06755 |
parent 52149 | 0edbbc64393c |
permissions | -rw-r--r-- |
2 | 1 |
/* |
48534 | 2 |
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5506 | 19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
2 | 22 |
*/ |
23 |
||
24 |
/** |
|
25 |
* |
|
26 |
* @test |
|
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
27 |
* @modules java.base/java.io:open |
50727
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
28 |
* @library /test/lib |
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
29 |
* @build jdk.test.lib.util.FileUtils UnreferencedFOSClosesFd |
2 | 30 |
* @bug 6524062 |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
31 |
* @summary Test to ensure that the fd is closed if left unreferenced |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
32 |
* @run main/othervm UnreferencedFOSClosesFd |
2 | 33 |
*/ |
48534 | 34 |
import java.io.File; |
35 |
import java.io.FileDescriptor; |
|
36 |
import java.io.FileNotFoundException; |
|
37 |
import java.io.FileOutputStream; |
|
38 |
import java.io.IOException; |
|
39 |
import java.lang.management.ManagementFactory; |
|
40 |
import java.lang.management.OperatingSystemMXBean; |
|
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
41 |
import java.lang.ref.Reference; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
42 |
import java.lang.ref.ReferenceQueue; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
43 |
import java.lang.ref.WeakReference; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
44 |
import java.lang.reflect.Field; |
50727
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
45 |
import java.nio.file.Path; |
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
46 |
import java.util.ArrayDeque; |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
47 |
import java.util.HashSet; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
48 |
import java.util.concurrent.atomic.AtomicInteger; |
2 | 49 |
|
48534 | 50 |
import com.sun.management.UnixOperatingSystemMXBean; |
51 |
||
50727
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
52 |
import jdk.test.lib.util.FileUtils; |
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
53 |
|
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
54 |
public class UnreferencedFOSClosesFd { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
55 |
|
2 | 56 |
static final String FILE_NAME = "empty.txt"; |
57 |
||
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
58 |
/** |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
59 |
* Subclass w/ no overrides; not close. |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
60 |
* Cleanup should be via the Cleaner. |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
61 |
*/ |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
62 |
public static class StreamOverrides extends FileOutputStream { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
63 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
64 |
protected final AtomicInteger closeCounter; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
65 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
66 |
public StreamOverrides(String name) throws FileNotFoundException { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
67 |
super(name); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
68 |
closeCounter = new AtomicInteger(0); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
69 |
} |
2 | 70 |
|
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
71 |
final AtomicInteger closeCounter() { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
72 |
return closeCounter; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
73 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
74 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
75 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
76 |
/** |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
77 |
* Subclass overrides close. |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
78 |
* Cleanup should be via AltFinalizer calling close(). |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
79 |
*/ |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
80 |
public static class StreamOverridesClose extends StreamOverrides { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
81 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
82 |
public StreamOverridesClose(String name) throws FileNotFoundException { |
2 | 83 |
super(name); |
84 |
} |
|
85 |
||
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
86 |
public void close() throws IOException { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
87 |
closeCounter.incrementAndGet(); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
88 |
super.close(); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
89 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
90 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
91 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
92 |
/** |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
93 |
* Subclass overrides finalize and close. |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
94 |
* Cleanup should be via the Cleaner. |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
95 |
*/ |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
96 |
public static class StreamOverridesFinalize extends StreamOverrides { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
97 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
98 |
public StreamOverridesFinalize(String name) throws FileNotFoundException { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
99 |
super(name); |
2 | 100 |
} |
101 |
||
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
102 |
@SuppressWarnings({"deprecation","removal"}) |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
103 |
protected void finalize() throws IOException, Throwable { |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
104 |
super.finalize(); |
2 | 105 |
} |
106 |
} |
|
107 |
||
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
108 |
/** |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
109 |
* Subclass overrides finalize and close. |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
110 |
* Cleanup should be via the Cleaner. |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
111 |
*/ |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
112 |
public static class StreamOverridesFinalizeClose extends StreamOverridesClose { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
113 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
114 |
public StreamOverridesFinalizeClose(String name) throws FileNotFoundException { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
115 |
super(name); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
116 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
117 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
118 |
@SuppressWarnings({"deprecation","removal"}) |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
119 |
protected void finalize() throws IOException, Throwable { |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
120 |
super.finalize(); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
121 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
122 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
123 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
124 |
/** |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
125 |
* Main runs each test case and reports number of failures. |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
126 |
*/ |
2 | 127 |
public static void main(String argv[]) throws Exception { |
128 |
||
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
129 |
File inFile = new File(System.getProperty("test.dir", "."), FILE_NAME); |
2 | 130 |
inFile.createNewFile(); |
131 |
inFile.deleteOnExit(); |
|
132 |
||
133 |
String name = inFile.getPath(); |
|
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
134 |
|
50727
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
135 |
FileUtils.listFileDescriptors(System.out); |
48534 | 136 |
long fdCount0 = getFdCount(); |
137 |
||
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
138 |
int failCount = 0; |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
139 |
failCount += test(new FileOutputStream(name)); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
140 |
|
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
141 |
failCount += test(new StreamOverrides(name)); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
142 |
|
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
143 |
failCount += test(new StreamOverridesClose(name)); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
144 |
|
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
145 |
failCount += test(new StreamOverridesFinalize(name)); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
146 |
|
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
147 |
failCount += test(new StreamOverridesFinalizeClose(name)); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
148 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
149 |
if (failCount > 0) { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
150 |
throw new AssertionError("Failed test count: " + failCount); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
151 |
} |
48534 | 152 |
|
153 |
// Check the final count of open file descriptors |
|
154 |
long fdCount = getFdCount(); |
|
155 |
if (fdCount != fdCount0) { |
|
50727
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
156 |
System.out.printf("initial count of open file descriptors: %d%n", fdCount0); |
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
157 |
System.out.printf("final count of open file descriptors: %d%n", fdCount); |
081b132c4dc0
8202292: java/io/FileOutputStream/UnreferencedFOSClosesFd.java fails with "raw fd count wrong"
rriggs
parents:
48534
diff
changeset
|
158 |
FileUtils.listFileDescriptors(System.out); |
48534 | 159 |
} |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
160 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
161 |
|
48534 | 162 |
// Get the count of open file descriptors, or -1 if not available |
163 |
private static long getFdCount() { |
|
164 |
OperatingSystemMXBean mxBean = ManagementFactory.getOperatingSystemMXBean(); |
|
165 |
return (mxBean instanceof UnixOperatingSystemMXBean) |
|
166 |
? ((UnixOperatingSystemMXBean) mxBean).getOpenFileDescriptorCount() |
|
167 |
: -1L; |
|
168 |
} |
|
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
169 |
|
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
170 |
private static int test(FileOutputStream fos) throws Exception { |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
171 |
|
2 | 172 |
try { |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
173 |
System.out.printf("%nTesting %s%n", fos.getClass().getName()); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
174 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
175 |
// Prepare to wait for FOS to be reclaimed |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
176 |
ReferenceQueue<Object> queue = new ReferenceQueue<>(); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
177 |
HashSet<Reference<?>> pending = new HashSet<>(); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
178 |
WeakReference<FileOutputStream> msWeak = new WeakReference<>(fos, queue); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
179 |
pending.add(msWeak); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
180 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
181 |
FileDescriptor fd = fos.getFD(); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
182 |
WeakReference<FileDescriptor> fdWeak = new WeakReference<>(fd, queue); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
183 |
pending.add(fdWeak); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
184 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
185 |
Field fdField = FileDescriptor.class.getDeclaredField("fd"); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
186 |
fdField.setAccessible(true); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
187 |
int ffd = fdField.getInt(fd); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
188 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
189 |
Field cleanupField = FileDescriptor.class.getDeclaredField("cleanup"); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
190 |
cleanupField.setAccessible(true); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
191 |
Object cleanup = cleanupField.get(fd); |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
192 |
System.out.printf(" cleanup: %s, ffd: %d, cf: %s%n", cleanup, ffd, cleanupField); |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
193 |
if (cleanup == null) { |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
194 |
throw new RuntimeException("cleanup should not be null"); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
195 |
} |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
196 |
|
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
197 |
WeakReference<Object> cleanupWeak = new WeakReference<>(cleanup, queue); |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
198 |
pending.add(cleanupWeak); |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
199 |
System.out.printf(" fdWeak: %s%n msWeak: %s%n cleanupWeak: %s%n", |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
200 |
fdWeak, msWeak, cleanupWeak); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
201 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
202 |
AtomicInteger closeCounter = fos instanceof StreamOverrides |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
203 |
? ((StreamOverrides) fos).closeCounter() : null; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
204 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
205 |
Reference<?> r; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
206 |
while (((r = queue.remove(1000L)) != null) |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
207 |
|| !pending.isEmpty()) { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
208 |
System.out.printf(" r: %s, pending: %d%n", |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
209 |
r, pending.size()); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
210 |
if (r != null) { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
211 |
pending.remove(r); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
212 |
} else { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
213 |
fos = null; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
214 |
fd = null; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
215 |
cleanup = null; |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
216 |
System.gc(); // attempt to reclaim them |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
217 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
218 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
219 |
Reference.reachabilityFence(fd); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
220 |
Reference.reachabilityFence(fos); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
221 |
Reference.reachabilityFence(cleanup); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
222 |
|
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
223 |
// Confirm the correct number of calls to close depending on the cleanup type |
52149
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
224 |
if (closeCounter != null && closeCounter.get() > 0) { |
0edbbc64393c
8192939: Remove Finalize methods from FileInputStream and FileOutputStream
rriggs
parents:
50727
diff
changeset
|
225 |
throw new RuntimeException("Close should not have been called: count: " + closeCounter); |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
226 |
} |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
227 |
} catch (Exception ex) { |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
228 |
ex.printStackTrace(System.out); |
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
229 |
return 1; |
2 | 230 |
} |
48224
be0df5ab3093
8080225: FileInput/OutputStream/FileChannel cleanup should be improved
rriggs
parents:
47216
diff
changeset
|
231 |
return 0; |
2 | 232 |
} |
233 |
} |