Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
464e1765
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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,发现更多精彩内容 >>
提交
464e1765
编写于
7月 14, 2017
作者:
A
asaha
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
398fbcbf
58e426d1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
138 addition
and
6 deletion
+138
-6
.hgtags
.hgtags
+2
-0
src/share/classes/sun/management/MemoryPoolImpl.java
src/share/classes/sun/management/MemoryPoolImpl.java
+3
-5
src/solaris/native/java/net/NetworkInterface.c
src/solaris/native/java/net/NetworkInterface.c
+1
-1
test/java/net/NetworkInterface/GetMacAddress.java
test/java/net/NetworkInterface/GetMacAddress.java
+132
-0
未找到文件。
.hgtags
浏览文件 @
464e1765
...
...
@@ -722,6 +722,8 @@ c92d704420d707d3016d8ee3a4239d1c57692ddd jdk8u141-b10
c6bc194fedb63b20c45c793405d215d206fb4654 jdk8u141-b13
d630e23b8e36c2863225d7ae107c73a38d3e6102 jdk8u141-b14
2ea94405100763c772ab3989200115d7a23c7532 jdk8u141-b15
55899d2b99b0725d74eebc510a116423329ad6f0 jdk8u141-b31
a3c4020f84aeb0dba467534239951f8818bdfb84 jdk8u141-b32
072e084bceeedeb75467e40ca77786ac9ef5227a jdk8u151-b00
5b0fa6e004312a5910a6a70e4fbc0f00a678e650 jdk8u151-b01
bd40efd56b4544ff9048d2f7be4cf108b281a6f3 jdk8u151-b02
...
...
src/share/classes/sun/management/MemoryPoolImpl.java
浏览文件 @
464e1765
/*
* Copyright (c) 2003, 20
08
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 20
17
, 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
...
...
@@ -304,8 +304,7 @@ class MemoryPoolImpl implements MemoryPoolMXBean {
getCount
());
}
void
triggerAction
()
{
// Should not reach here
throw
new
AssertionError
(
"Should not reach here"
);
// do nothing
}
void
clearAction
()
{
// do nothing
...
...
@@ -332,8 +331,7 @@ class MemoryPoolImpl implements MemoryPoolMXBean {
gcSensor
.
getCount
());
}
void
triggerAction
()
{
// Should not reach here
throw
new
AssertionError
(
"Should not reach here"
);
// do nothing
}
void
clearAction
()
{
// do nothing
...
...
src/solaris/native/java/net/NetworkInterface.c
浏览文件 @
464e1765
...
...
@@ -1425,7 +1425,7 @@ static int getMacAddress
return
-
1
;
#elif defined(__linux__)
st
atic
st
ruct
ifreq
ifr
;
struct
ifreq
ifr
;
int
i
;
memset
((
char
*
)
&
ifr
,
0
,
sizeof
(
ifr
));
strncpy
(
ifr
.
ifr_name
,
ifname
,
sizeof
(
ifr
.
ifr_name
)
-
1
);
...
...
test/java/net/NetworkInterface/GetMacAddress.java
0 → 100644
浏览文件 @
464e1765
/*
* Copyright (c) 2017, 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 8182672
* @summary Java 8u121 on Linux intermittently returns null for MAC address
*/
import
java.net.NetworkInterface
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.Future
;
import
java.util.concurrent.Phaser
;
import
java.util.function.Predicate
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
public
class
GetMacAddress
implements
Callable
<
Exception
>
{
static
final
int
NUM_THREADS
=
5
;
static
final
int
NUM_ITERS
=
100
;
static
volatile
boolean
failed
;
// false
final
String
threadName
;
final
NetworkInterface
ni
;
final
Phaser
startingGate
;
public
GetMacAddress
(
NetworkInterface
ni
,
String
name
,
Phaser
phaser
)
{
this
.
ni
=
ni
;
this
.
threadName
=
name
;
this
.
startingGate
=
phaser
;
}
@Override
public
Exception
call
()
{
int
count
=
0
;
startingGate
.
arriveAndAwaitAdvance
();
try
{
for
(
int
i
=
0
;
i
<
NUM_ITERS
;
i
++)
{
ni
.
getMTU
();
byte
[]
addr
=
ni
.
getHardwareAddress
();
if
(
addr
==
null
)
{
System
.
out
.
println
(
threadName
+
". mac id is null"
);
failed
=
true
;
}
count
=
count
+
1
;
if
(
count
%
100
==
0
)
{
System
.
out
.
println
(
threadName
+
". count is "
+
count
);
}
}
}
catch
(
Exception
ex
)
{
System
.
out
.
println
(
threadName
+
". Not expecting exception:"
+
ex
.
getMessage
());
failed
=
true
;
return
ex
;
}
return
null
;
}
static
final
Predicate
<
NetworkInterface
>
hasHardwareAddress
=
ni
->
{
try
{
if
(
ni
.
getHardwareAddress
()
==
null
)
{
System
.
out
.
println
(
"Not testing null addr: "
+
ni
.
getName
());
return
false
;
}
}
catch
(
Exception
ex
)
{
System
.
out
.
println
(
"Not testing: "
+
ni
.
getName
()
+
" "
+
ex
.
getMessage
());
return
false
;
}
return
true
;
};
public
static
Stream
<
NetworkInterface
>
getNetworkInterfacesAsStream
()
throws
Exception
{
// JDK 9 and later
//return NetworkInterface.networkInterfaces();
// pre JDK 9
return
Collections
.
list
(
NetworkInterface
.
getNetworkInterfaces
()).
stream
();
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
List
<
NetworkInterface
>
toTest
=
getNetworkInterfacesAsStream
()
.
filter
(
hasHardwareAddress
)
.
collect
(
Collectors
.
toList
());
ExecutorService
executor
=
Executors
.
newFixedThreadPool
(
NUM_THREADS
);
for
(
NetworkInterface
ni
:
toTest
)
{
Phaser
startingGate
=
new
Phaser
(
NUM_THREADS
);
System
.
out
.
println
(
"Testing: "
+
ni
.
getName
());
List
<
Callable
<
Exception
>>
list
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
NUM_THREADS
;
i
++)
list
.
add
(
new
GetMacAddress
(
ni
,
ni
.
getName
()
+
"-Thread-"
+
i
,
startingGate
));
List
<
Future
<
Exception
>>
futures
=
executor
.
invokeAll
(
list
);
for
(
Future
<
Exception
>
f
:
futures
)
{
if
(
f
.
get
()
!=
null
)
f
.
get
().
printStackTrace
(
System
.
out
);
}
if
(
failed
)
break
;
}
executor
.
shutdownNow
();
if
(!
failed
)
{
System
.
out
.
println
(
"PASSED - Finished all threads"
);
}
else
{
throw
new
RuntimeException
(
"Failed"
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录