Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6f254023
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看板
提交
6f254023
编写于
10月 13, 2015
作者:
I
igerasim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8138819: (se) File descriptor leak when Selector.open fails
Reviewed-by: rriggs, alanb
上级
ea4e7475
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
73 addition
and
17 deletion
+73
-17
src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+19
-5
src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
+18
-4
src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
+18
-4
src/solaris/classes/sun/nio/ch/PollSelectorImpl.java
src/solaris/classes/sun/nio/ch/PollSelectorImpl.java
+18
-4
未找到文件。
src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
浏览文件 @
6f254023
/*
/*
* Copyright (c) 2011, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 201
5
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -84,10 +84,24 @@ class KQueueSelectorImpl
...
@@ -84,10 +84,24 @@ class KQueueSelectorImpl
long
fds
=
IOUtil
.
makePipe
(
false
);
long
fds
=
IOUtil
.
makePipe
(
false
);
fd0
=
(
int
)(
fds
>>>
32
);
fd0
=
(
int
)(
fds
>>>
32
);
fd1
=
(
int
)
fds
;
fd1
=
(
int
)
fds
;
kqueueWrapper
=
new
KQueueArrayWrapper
();
try
{
kqueueWrapper
.
initInterrupt
(
fd0
,
fd1
);
kqueueWrapper
=
new
KQueueArrayWrapper
();
fdMap
=
new
HashMap
<>();
kqueueWrapper
.
initInterrupt
(
fd0
,
fd1
);
totalChannels
=
1
;
fdMap
=
new
HashMap
<>();
totalChannels
=
1
;
}
catch
(
Throwable
t
)
{
try
{
FileDispatcherImpl
.
closeIntFD
(
fd0
);
}
catch
(
IOException
ioe0
)
{
t
.
addSuppressed
(
ioe0
);
}
try
{
FileDispatcherImpl
.
closeIntFD
(
fd1
);
}
catch
(
IOException
ioe1
)
{
t
.
addSuppressed
(
ioe1
);
}
throw
t
;
}
}
}
...
...
src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
浏览文件 @
6f254023
/*
/*
* Copyright (c) 2001, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 201
5
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -68,9 +68,23 @@ class DevPollSelectorImpl
...
@@ -68,9 +68,23 @@ class DevPollSelectorImpl
long
pipeFds
=
IOUtil
.
makePipe
(
false
);
long
pipeFds
=
IOUtil
.
makePipe
(
false
);
fd0
=
(
int
)
(
pipeFds
>>>
32
);
fd0
=
(
int
)
(
pipeFds
>>>
32
);
fd1
=
(
int
)
pipeFds
;
fd1
=
(
int
)
pipeFds
;
pollWrapper
=
new
DevPollArrayWrapper
();
try
{
pollWrapper
.
initInterrupt
(
fd0
,
fd1
);
pollWrapper
=
new
DevPollArrayWrapper
();
fdToKey
=
new
HashMap
<
Integer
,
SelectionKeyImpl
>();
pollWrapper
.
initInterrupt
(
fd0
,
fd1
);
fdToKey
=
new
HashMap
<>();
}
catch
(
Throwable
t
)
{
try
{
FileDispatcherImpl
.
closeIntFD
(
fd0
);
}
catch
(
IOException
ioe0
)
{
t
.
addSuppressed
(
ioe0
);
}
try
{
FileDispatcherImpl
.
closeIntFD
(
fd1
);
}
catch
(
IOException
ioe1
)
{
t
.
addSuppressed
(
ioe1
);
}
throw
t
;
}
}
}
protected
int
doSelect
(
long
timeout
)
protected
int
doSelect
(
long
timeout
)
...
...
src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
浏览文件 @
6f254023
/*
/*
* Copyright (c) 2005, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
5
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -65,9 +65,23 @@ class EPollSelectorImpl
...
@@ -65,9 +65,23 @@ class EPollSelectorImpl
long
pipeFds
=
IOUtil
.
makePipe
(
false
);
long
pipeFds
=
IOUtil
.
makePipe
(
false
);
fd0
=
(
int
)
(
pipeFds
>>>
32
);
fd0
=
(
int
)
(
pipeFds
>>>
32
);
fd1
=
(
int
)
pipeFds
;
fd1
=
(
int
)
pipeFds
;
pollWrapper
=
new
EPollArrayWrapper
();
try
{
pollWrapper
.
initInterrupt
(
fd0
,
fd1
);
pollWrapper
=
new
EPollArrayWrapper
();
fdToKey
=
new
HashMap
<>();
pollWrapper
.
initInterrupt
(
fd0
,
fd1
);
fdToKey
=
new
HashMap
<>();
}
catch
(
Throwable
t
)
{
try
{
FileDispatcherImpl
.
closeIntFD
(
fd0
);
}
catch
(
IOException
ioe0
)
{
t
.
addSuppressed
(
ioe0
);
}
try
{
FileDispatcherImpl
.
closeIntFD
(
fd1
);
}
catch
(
IOException
ioe1
)
{
t
.
addSuppressed
(
ioe1
);
}
throw
t
;
}
}
}
protected
int
doSelect
(
long
timeout
)
throws
IOException
{
protected
int
doSelect
(
long
timeout
)
throws
IOException
{
...
...
src/solaris/classes/sun/nio/ch/PollSelectorImpl.java
浏览文件 @
6f254023
/*
/*
* Copyright (c) 2001, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 201
5
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -57,9 +57,23 @@ class PollSelectorImpl
...
@@ -57,9 +57,23 @@ class PollSelectorImpl
long
pipeFds
=
IOUtil
.
makePipe
(
false
);
long
pipeFds
=
IOUtil
.
makePipe
(
false
);
fd0
=
(
int
)
(
pipeFds
>>>
32
);
fd0
=
(
int
)
(
pipeFds
>>>
32
);
fd1
=
(
int
)
pipeFds
;
fd1
=
(
int
)
pipeFds
;
pollWrapper
=
new
PollArrayWrapper
(
INIT_CAP
);
try
{
pollWrapper
.
initInterrupt
(
fd0
,
fd1
);
pollWrapper
=
new
PollArrayWrapper
(
INIT_CAP
);
channelArray
=
new
SelectionKeyImpl
[
INIT_CAP
];
pollWrapper
.
initInterrupt
(
fd0
,
fd1
);
channelArray
=
new
SelectionKeyImpl
[
INIT_CAP
];
}
catch
(
Throwable
t
)
{
try
{
FileDispatcherImpl
.
closeIntFD
(
fd0
);
}
catch
(
IOException
ioe0
)
{
t
.
addSuppressed
(
ioe0
);
}
try
{
FileDispatcherImpl
.
closeIntFD
(
fd1
);
}
catch
(
IOException
ioe1
)
{
t
.
addSuppressed
(
ioe1
);
}
throw
t
;
}
}
}
protected
int
doSelect
(
long
timeout
)
protected
int
doSelect
(
long
timeout
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录