Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
4f8884de
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4f8884de
编写于
10月 30, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[#558] Support new memory pool name of java8
上级
c7aff123
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
70 addition
and
61 deletion
+70
-61
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
...ing/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
+12
-12
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java
...king/apm/agent/core/jvm/memorypool/G1CollectorModule.java
+12
-12
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java
...lking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java
+22
-13
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java
...pm/agent/core/jvm/memorypool/ParallelCollectorModule.java
+12
-12
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
.../apm/agent/core/jvm/memorypool/SerialCollectorModule.java
+12
-12
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java
浏览文件 @
4f8884de
...
...
@@ -29,27 +29,27 @@ public class CMSCollectorModule extends MemoryPoolModule {
super
(
beans
);
}
@Override
protected
String
getPermName
()
{
return
"CMS Perm Gen"
;
@Override
protected
String
[]
getPermNames
()
{
return
new
String
[]
{
"CMS Perm Gen"
}
;
}
@Override
protected
String
getCodeCacheName
()
{
return
"Code Cache"
;
@Override
protected
String
[]
getCodeCacheNames
()
{
return
new
String
[]
{
"Code Cache"
}
;
}
@Override
protected
String
getEdenName
()
{
return
"Par Eden Space"
;
@Override
protected
String
[]
getEdenNames
()
{
return
new
String
[]
{
"Par Eden Space"
}
;
}
@Override
protected
String
getOldName
()
{
return
"CMS Old Gen"
;
@Override
protected
String
[]
getOldNames
()
{
return
new
String
[]
{
"CMS Old Gen"
}
;
}
@Override
protected
String
getSurvivorName
()
{
return
"Par Survivor Space"
;
@Override
protected
String
[]
getSurvivorNames
()
{
return
new
String
[]
{
"Par Survivor Space"
}
;
}
@Override
protected
String
getMetaspaceName
()
{
return
"Metaspace"
;
@Override
protected
String
[]
getMetaspaceNames
()
{
return
new
String
[]
{
"Metaspace"
}
;
}
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java
浏览文件 @
4f8884de
...
...
@@ -29,27 +29,27 @@ public class G1CollectorModule extends MemoryPoolModule {
super
(
beans
);
}
@Override
protected
String
getPermName
()
{
return
"G1 Perm Gen"
;
@Override
protected
String
[]
getPermNames
()
{
return
new
String
[]
{
"G1 Perm Gen"
}
;
}
@Override
protected
String
getCodeCacheName
()
{
return
"Code Cache"
;
@Override
protected
String
[]
getCodeCacheNames
()
{
return
new
String
[]
{
"Code Cache"
}
;
}
@Override
protected
String
getEdenName
()
{
return
"G1 Eden Space"
;
@Override
protected
String
[]
getEdenNames
()
{
return
new
String
[]
{
"G1 Eden Space"
}
;
}
@Override
protected
String
getOldName
()
{
return
"G1 Old Gen"
;
@Override
protected
String
[]
getOldNames
()
{
return
new
String
[]
{
"G1 Old Gen"
}
;
}
@Override
protected
String
getSurvivorName
()
{
return
"G1 Survivor Space"
;
@Override
protected
String
[]
getSurvivorNames
()
{
return
new
String
[]
{
"G1 Survivor Space"
}
;
}
@Override
protected
String
getMetaspaceName
()
{
return
"Metaspace"
;
@Override
protected
String
[]
getMetaspaceNames
()
{
return
new
String
[]
{
"Metaspace"
}
;
}
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java
浏览文件 @
4f8884de
...
...
@@ -40,18 +40,18 @@ public abstract class MemoryPoolModule implements MemoryPoolMetricAccessor {
List
<
MemoryPool
>
poolList
=
new
LinkedList
<
MemoryPool
>();
for
(
MemoryPoolMXBean
bean
:
beans
)
{
String
name
=
bean
.
getName
();
PoolType
type
=
null
;
if
(
name
.
equals
(
getCodeCacheName
()
))
{
PoolType
type
;
if
(
contains
(
getCodeCacheNames
(),
name
))
{
type
=
PoolType
.
CODE_CACHE_USAGE
;
}
else
if
(
name
.
equals
(
getEdenName
()
))
{
}
else
if
(
contains
(
getEdenNames
(),
name
))
{
type
=
PoolType
.
NEWGEN_USAGE
;
}
else
if
(
name
.
equals
(
getOldName
()
))
{
}
else
if
(
contains
(
getOldNames
(),
name
))
{
type
=
PoolType
.
OLDGEN_USAGE
;
}
else
if
(
name
.
equals
(
getSurvivorName
()
))
{
}
else
if
(
contains
(
getSurvivorNames
(),
name
))
{
type
=
PoolType
.
SURVIVOR_USAGE
;
}
else
if
(
name
.
equals
(
getMetaspaceName
()
))
{
}
else
if
(
contains
(
getMetaspaceNames
(),
name
))
{
type
=
PoolType
.
METASPACE_USAGE
;
}
else
if
(
name
.
equals
(
getPermName
()
))
{
}
else
if
(
contains
(
getPermNames
(),
name
))
{
type
=
PoolType
.
PERMGEN_USAGE
;
}
else
{
continue
;
...
...
@@ -68,15 +68,24 @@ public abstract class MemoryPoolModule implements MemoryPoolMetricAccessor {
return
poolList
;
}
protected
abstract
String
getPermName
();
private
boolean
contains
(
String
[]
possibleNames
,
String
name
)
{
for
(
String
possibleName
:
possibleNames
)
{
if
(
name
.
equals
(
possibleName
))
{
return
true
;
}
}
return
false
;
}
protected
abstract
String
[]
getPermNames
();
protected
abstract
String
getCodeCacheName
();
protected
abstract
String
[]
getCodeCacheNames
();
protected
abstract
String
getEdenName
();
protected
abstract
String
[]
getEdenNames
();
protected
abstract
String
getOldName
();
protected
abstract
String
[]
getOldNames
();
protected
abstract
String
getSurvivorName
();
protected
abstract
String
[]
getSurvivorNames
();
protected
abstract
String
getMetaspaceName
();
protected
abstract
String
[]
getMetaspaceNames
();
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java
浏览文件 @
4f8884de
...
...
@@ -30,27 +30,27 @@ public class ParallelCollectorModule extends MemoryPoolModule {
super
(
beans
);
}
@Override
protected
String
getPermName
()
{
return
"PS Perm Gen"
;
@Override
protected
String
[]
getPermNames
()
{
return
new
String
[]
{
"PS Perm Gen"
,
"Compressed Class Space"
}
;
}
@Override
protected
String
getCodeCacheName
()
{
return
"Code Cache"
;
@Override
protected
String
[]
getCodeCacheNames
()
{
return
new
String
[]
{
"Code Cache"
}
;
}
@Override
protected
String
getEdenName
()
{
return
"PS Eden Space"
;
@Override
protected
String
[]
getEdenNames
()
{
return
new
String
[]
{
"PS Eden Space"
}
;
}
@Override
protected
String
getOldName
()
{
return
"PS Old Gen"
;
@Override
protected
String
[]
getOldNames
()
{
return
new
String
[]
{
"PS Old Gen"
}
;
}
@Override
protected
String
getSurvivorName
()
{
return
"PS Survivor Space"
;
@Override
protected
String
[]
getSurvivorNames
()
{
return
new
String
[]
{
"PS Survivor Space"
}
;
}
@Override
protected
String
getMetaspaceName
()
{
return
"Metaspace"
;
@Override
protected
String
[]
getMetaspaceNames
()
{
return
new
String
[]
{
"Metaspace"
}
;
}
}
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java
浏览文件 @
4f8884de
...
...
@@ -29,27 +29,27 @@ public class SerialCollectorModule extends MemoryPoolModule {
super
(
beans
);
}
@Override
protected
String
getPermName
()
{
return
"Perm Gen"
;
@Override
protected
String
[]
getPermNames
()
{
return
new
String
[]
{
"Perm Gen"
}
;
}
@Override
protected
String
getCodeCacheName
()
{
return
"Code Cache"
;
@Override
protected
String
[]
getCodeCacheNames
()
{
return
new
String
[]
{
"Code Cache"
}
;
}
@Override
protected
String
getEdenName
()
{
return
"Eden Space"
;
@Override
protected
String
[]
getEdenNames
()
{
return
new
String
[]
{
"Eden Space"
}
;
}
@Override
protected
String
getOldName
()
{
return
"Tenured Gen"
;
@Override
protected
String
[]
getOldNames
()
{
return
new
String
[]
{
"Tenured Gen"
}
;
}
@Override
protected
String
getSurvivorName
()
{
return
"Survivor Space"
;
@Override
protected
String
[]
getSurvivorNames
()
{
return
new
String
[]
{
"Survivor Space"
}
;
}
@Override
protected
String
getMetaspaceName
()
{
return
"Metaspace"
;
@Override
protected
String
[]
getMetaspaceNames
()
{
return
new
String
[]
{
"Metaspace"
}
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录