Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
0d4d4f97
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0d4d4f97
编写于
3月 08, 2016
作者:
M
Manish Vasani
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9571 from mavasani/AnalyzerStateAllocations
Port analyzer driver pooling fix to future-stabilization
上级
3a88e9f3
b67ef9d4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
71 addition
and
7 deletion
+71
-7
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.PerAnalyzerState.cs
...able/DiagnosticAnalyzer/AnalysisState.PerAnalyzerState.cs
+44
-1
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs
...mpilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs
+27
-6
未找到文件。
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.PerAnalyzerState.cs
浏览文件 @
0d4d4f97
...
...
@@ -15,6 +15,7 @@ internal partial class AnalysisState
{
private
class
PerAnalyzerState
{
private
const
int
SymbolLimitForPooling
=
100
;
private
readonly
object
_gate
=
new
object
();
private
readonly
Dictionary
<
CompilationEvent
,
AnalyzerStateData
>
_pendingEvents
=
new
Dictionary
<
CompilationEvent
,
AnalyzerStateData
>();
private
readonly
Dictionary
<
ISymbol
,
AnalyzerStateData
>
_pendingSymbols
=
new
Dictionary
<
ISymbol
,
AnalyzerStateData
>();
...
...
@@ -37,6 +38,48 @@ private class PerAnalyzerState
_currentlyAnalyzingDeclarationsMapPool
=
currentlyAnalyzingDeclarationsMapPool
;
}
/// <summary>
/// Returns true if the object should be returned to the pool.
/// </summary>
public
bool
Free
()
{
lock
(
_gate
)
{
foreach
(
var
analyzerStateData
in
_pendingEvents
.
Values
)
{
FreeState_NoLock
(
analyzerStateData
,
_analyzerStateDataPool
);
}
foreach
(
var
analyzerStateData
in
_pendingSymbols
.
Values
)
{
FreeState_NoLock
(
analyzerStateData
,
_analyzerStateDataPool
);
}
foreach
(
var
declarationDataMap
in
_pendingDeclarations
.
Values
)
{
foreach
(
var
declarationStateData
in
declarationDataMap
.
Values
)
{
FreeDeclarationAnalyzerState_NoLock
(
declarationStateData
);
}
FreeDeclarationDataMap_NoLock
(
declarationDataMap
);
}
// If we have too many symbols then just discard the state object from the pool - we don't want to hold onto really large dictionaries.
if
(
_pendingSymbols
.
Count
>
SymbolLimitForPooling
)
{
return
false
;
}
_pendingEvents
.
Clear
();
_pendingSymbols
.
Clear
();
_pendingDeclarations
.
Clear
();
_lazySyntaxTreesWithAnalysisData
=
null
;
_pendingSyntaxAnalysisTreesCount
=
0
;
return
true
;
}
}
public
void
AddPendingEvents
(
HashSet
<
CompilationEvent
>
uniqueEvents
)
{
lock
(
_gate
)
...
...
@@ -275,7 +318,7 @@ private void FreeDeclarationAnalyzerState_NoLock(DeclarationAnalyzerStateData st
private
static
void
FreeState_NoLock
<
TAnalyzerStateData
>(
TAnalyzerStateData
state
,
ObjectPool
<
TAnalyzerStateData
>
pool
)
where
TAnalyzerStateData
:
AnalyzerStateData
{
if
(
state
!=
null
)
if
(
state
!=
null
&&
!
ReferenceEquals
(
state
,
AnalyzerStateData
.
FullyProcessedInstance
)
)
{
state
.
Free
();
pool
.
Free
(
state
);
...
...
src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalysisState.cs
浏览文件 @
0d4d4f97
...
...
@@ -63,6 +63,13 @@ internal partial class AnalysisState
private
readonly
ObjectPool
<
HashSet
<
CompilationEvent
>>
_compilationEventsPool
;
private
readonly
HashSet
<
CompilationEvent
>
_pooledEventsWithAnyActionsSet
;
// Create static pools for heavily allocated per-analyzer state objects - this helps in reducing allocations across CompilationWithAnalyzer instances.
private
const
int
PoolSize
=
5000
;
private
static
readonly
ObjectPool
<
AnalyzerStateData
>
s_analyzerStateDataPool
=
new
ObjectPool
<
AnalyzerStateData
>(()
=>
new
AnalyzerStateData
(),
PoolSize
);
private
static
readonly
ObjectPool
<
DeclarationAnalyzerStateData
>
s_declarationAnalyzerStateDataPool
=
new
ObjectPool
<
DeclarationAnalyzerStateData
>(()
=>
new
DeclarationAnalyzerStateData
(),
PoolSize
);
private
static
readonly
ObjectPool
<
Dictionary
<
int
,
DeclarationAnalyzerStateData
>>
s_currentlyAnalyzingDeclarationsMapPool
=
new
ObjectPool
<
Dictionary
<
int
,
DeclarationAnalyzerStateData
>>(()
=>
new
Dictionary
<
int
,
DeclarationAnalyzerStateData
>(),
PoolSize
);
private
static
readonly
ObjectPool
<
PerAnalyzerState
>
s_perAnalyzerStatePool
=
new
ObjectPool
<
PerAnalyzerState
>(()
=>
new
PerAnalyzerState
(
s_analyzerStateDataPool
,
s_declarationAnalyzerStateDataPool
,
s_currentlyAnalyzingDeclarationsMapPool
),
PoolSize
);
public
AnalysisState
(
ImmutableArray
<
DiagnosticAnalyzer
>
analyzers
,
CompilationData
compilationData
)
{
_gate
=
new
object
();
...
...
@@ -80,19 +87,33 @@ public AnalysisState(ImmutableArray<DiagnosticAnalyzer> analyzers, CompilationDa
_pooledEventsWithAnyActionsSet
=
new
HashSet
<
CompilationEvent
>();
}
private
static
ImmutableDictionary
<
DiagnosticAnalyzer
,
int
>
CreateAnalyzerStateMap
(
ImmutableArray
<
DiagnosticAnalyzer
>
analyzers
,
out
ImmutableArray
<
PerAnalyzerState
>
analyzerStates
)
~
AnalysisState
(
)
{
var
analyzerStateDataPool
=
new
ObjectPool
<
AnalyzerStateData
>(()
=>
new
AnalyzerStateData
());
var
declarationAnalyzerStateDataPool
=
new
ObjectPool
<
DeclarationAnalyzerStateData
>(()
=>
new
DeclarationAnalyzerStateData
());
var
currentlyAnalyzingDeclarationsMapPool
=
new
ObjectPool
<
Dictionary
<
int
,
DeclarationAnalyzerStateData
>>(
()
=>
new
Dictionary
<
int
,
DeclarationAnalyzerStateData
>());
// Free the per-analyzer state tracking objects.
foreach
(
var
analyzerState
in
_analyzerStates
)
{
var
shouldReturnToPool
=
analyzerState
.
Free
();
// If we have too many symbols then just discard the state object from the pool - we don't want to hold onto really large dictionaries.
if
(
shouldReturnToPool
)
{
s_perAnalyzerStatePool
.
Free
(
analyzerState
);
}
else
{
s_perAnalyzerStatePool
.
ForgetTrackedObject
(
analyzerState
);
}
}
}
private
static
ImmutableDictionary
<
DiagnosticAnalyzer
,
int
>
CreateAnalyzerStateMap
(
ImmutableArray
<
DiagnosticAnalyzer
>
analyzers
,
out
ImmutableArray
<
PerAnalyzerState
>
analyzerStates
)
{
var
statesBuilder
=
ImmutableArray
.
CreateBuilder
<
PerAnalyzerState
>();
var
map
=
ImmutableDictionary
.
CreateBuilder
<
DiagnosticAnalyzer
,
int
>();
var
index
=
0
;
foreach
(
var
analyzer
in
analyzers
)
{
statesBuilder
.
Add
(
new
PerAnalyzerState
(
analyzerStateDataPool
,
declarationAnalyzerStateDataPool
,
currentlyAnalyzingDeclarationsMapPool
));
statesBuilder
.
Add
(
s_perAnalyzerStatePool
.
Allocate
(
));
map
[
analyzer
]
=
index
;
index
++;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录