Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
32d0db96
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
32d0db96
编写于
10月 02, 2013
作者:
S
serb
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8013563: Memory leak in JFrame on Linux
Reviewed-by: anthony, art
上级
c6149eae
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
93 addition
and
8 deletion
+93
-8
src/share/classes/java/awt/Window.java
src/share/classes/java/awt/Window.java
+22
-8
test/java/awt/Window/WindowsLeak/WindowsLeak.java
test/java/awt/Window/WindowsLeak/WindowsLeak.java
+71
-0
未找到文件。
src/share/classes/java/awt/Window.java
浏览文件 @
32d0db96
...
...
@@ -226,6 +226,7 @@ public class Window extends Container implements Accessible {
boolean
syncLWRequests
=
false
;
transient
boolean
beforeFirstShow
=
true
;
private
transient
boolean
disposing
=
false
;
transient
WindowDisposerRecord
disposerRecord
=
null
;
static
final
int
OPENED
=
0x01
;
...
...
@@ -437,18 +438,28 @@ public class Window extends Container implements Accessible {
transient
Object
anchor
=
new
Object
();
static
class
WindowDisposerRecord
implements
sun
.
java2d
.
DisposerRecord
{
final
WeakReference
<
Window
>
owner
;
WeakReference
<
Window
>
owner
;
final
WeakReference
<
Window
>
weakThis
;
final
WeakReference
<
AppContext
>
context
;
WindowDisposerRecord
(
AppContext
context
,
Window
victim
)
{
owner
=
new
WeakReference
<
Window
>(
victim
.
getOwner
());
weakThis
=
victim
.
weakThis
;
this
.
context
=
new
WeakReference
<
AppContext
>(
context
);
}
public
void
updateOwner
()
{
Window
victim
=
weakThis
.
get
();
owner
=
(
victim
==
null
)
?
null
:
new
WeakReference
<
Window
>(
victim
.
getOwner
());
}
public
void
dispose
()
{
Window
parent
=
owner
.
get
();
if
(
parent
!=
null
)
{
parent
.
removeOwnedWindow
(
weakThis
);
if
(
owner
!=
null
)
{
Window
parent
=
owner
.
get
();
if
(
parent
!=
null
)
{
parent
.
removeOwnedWindow
(
weakThis
);
}
}
AppContext
ac
=
context
.
get
();
if
(
null
!=
ac
)
{
...
...
@@ -502,6 +513,8 @@ public class Window extends Container implements Accessible {
}
modalExclusionType
=
Dialog
.
ModalExclusionType
.
NO_EXCLUDE
;
disposerRecord
=
new
WindowDisposerRecord
(
appContext
,
this
);
sun
.
java2d
.
Disposer
.
addRecord
(
anchor
,
disposerRecord
);
SunToolkit
.
checkAndSetPolicy
(
this
);
}
...
...
@@ -619,9 +632,8 @@ public class Window extends Container implements Accessible {
owner
.
addOwnedWindow
(
weakThis
);
}
// Fix for 6758673: this call is moved here from init(gc), because
// WindowDisposerRecord requires a proper value of parent field.
Disposer
.
addRecord
(
anchor
,
new
WindowDisposerRecord
(
appContext
,
this
)
);
disposerRecord
.
updateOwner
(
);
}
/**
...
...
@@ -2774,6 +2786,7 @@ public class Window extends Container implements Accessible {
void
connectOwnedWindow
(
Window
child
)
{
child
.
parent
=
this
;
addOwnedWindow
(
child
.
weakThis
);
child
.
disposerRecord
.
updateOwner
();
}
private
void
addToWindowList
()
{
...
...
@@ -2936,7 +2949,8 @@ public class Window extends Container implements Accessible {
weakThis
=
new
WeakReference
<>(
this
);
anchor
=
new
Object
();
sun
.
java2d
.
Disposer
.
addRecord
(
anchor
,
new
WindowDisposerRecord
(
appContext
,
this
));
disposerRecord
=
new
WindowDisposerRecord
(
appContext
,
this
);
sun
.
java2d
.
Disposer
.
addRecord
(
anchor
,
disposerRecord
);
addToWindowList
();
initGC
(
null
);
...
...
test/java/awt/Window/WindowsLeak/WindowsLeak.java
0 → 100644
浏览文件 @
32d0db96
/*
* Copyright (c) 2013, 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 8013563
* @summary Tests that windows are removed from windows list
* @run main/othervm -Xms32M -Xmx32M WindowsLeak
*/
import
java.awt.*
;
import
sun.awt.AppContext
;
import
java.lang.ref.WeakReference
;
import
java.util.Vector
;
public
class
WindowsLeak
{
public
static
void
main
(
String
[]
args
)
{
for
(
int
i
=
0
;
i
<
100
;
i
++)
{
Frame
f
=
new
Frame
();
f
.
pack
();
f
.
dispose
();
}
Vector
garbage
=
new
Vector
();
while
(
true
)
{
try
{
garbage
.
add
(
new
byte
[
1000
]);
}
catch
(
OutOfMemoryError
e
)
{
break
;
}
}
garbage
=
null
;
Vector
<
WeakReference
<
Window
>>
windowList
=
(
Vector
<
WeakReference
<
Window
>>)
AppContext
.
getAppContext
().
get
(
Window
.
class
);
if
(
windowList
!=
null
&&
!
windowList
.
isEmpty
())
{
throw
new
RuntimeException
(
"Test FAILED: Window list is not empty: "
+
windowList
.
size
());
}
System
.
out
.
println
(
"Test PASSED"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录