Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
3f47f739
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,发现更多精彩内容 >>
未验证
提交
3f47f739
编写于
6月 04, 2019
作者:
S
Sam Harwell
提交者:
GitHub
6月 04, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #36130 from sharwell/simpler-cancellation
Pass CancellationToken instead of CancellationTokenSource
上级
84018880
27ea137e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
27 deletion
+19
-27
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.AsyncWorkItemQueue.cs
...ble/SolutionCrawler/WorkCoordinator.AsyncWorkItemQueue.cs
+8
-8
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs
.../SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs
+5
-6
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
...e/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
+3
-7
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
...olutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
+3
-6
未找到文件。
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.AsyncWorkItemQueue.cs
浏览文件 @
3f47f739
...
...
@@ -177,19 +177,19 @@ protected void Cancel_NoLock(object key)
}
}
public
bool
TryTake
(
TKey
key
,
out
WorkItem
workInfo
,
out
CancellationToken
Source
source
)
public
bool
TryTake
(
TKey
key
,
out
WorkItem
workInfo
,
out
CancellationToken
cancellationToken
)
{
lock
(
_gate
)
{
if
(
TryTake_NoLock
(
key
,
out
workInfo
))
{
source
=
GetNewCancellationSource
_NoLock
(
key
);
cancellationToken
=
GetNewCancellationToken
_NoLock
(
key
);
workInfo
.
AsyncToken
.
Dispose
();
return
true
;
}
else
{
source
=
null
;
cancellationToken
=
CancellationToken
.
None
;
return
false
;
}
}
...
...
@@ -199,33 +199,33 @@ public bool TryTake(TKey key, out WorkItem workInfo, out CancellationTokenSource
ProjectId
preferableProjectId
,
ProjectDependencyGraph
dependencyGraph
,
IDiagnosticAnalyzerService
analyzerService
,
out
WorkItem
workItem
,
out
CancellationToken
Source
source
)
out
WorkItem
workItem
,
out
CancellationToken
cancellationToken
)
{
lock
(
_gate
)
{
// there must be at least one item in the map when this is called unless host is shutting down.
if
(
TryTakeAnyWork_NoLock
(
preferableProjectId
,
dependencyGraph
,
analyzerService
,
out
workItem
))
{
source
=
GetNewCancellationSource
_NoLock
(
workItem
.
Key
);
cancellationToken
=
GetNewCancellationToken
_NoLock
(
workItem
.
Key
);
workItem
.
AsyncToken
.
Dispose
();
return
true
;
}
else
{
source
=
null
;
cancellationToken
=
CancellationToken
.
None
;
return
false
;
}
}
}
protected
CancellationToken
Source
GetNewCancellationSource
_NoLock
(
object
key
)
protected
CancellationToken
GetNewCancellationToken
_NoLock
(
object
key
)
{
Debug
.
Assert
(!
_cancellationMap
.
ContainsKey
(
key
));
var
source
=
new
CancellationTokenSource
();
_cancellationMap
.
Add
(
key
,
source
);
return
source
;
return
source
.
Token
;
}
protected
ProjectId
GetBestProjectId_NoLock
<
T
>(
...
...
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.HighPriorityProcessor.cs
浏览文件 @
3f47f739
...
...
@@ -124,13 +124,13 @@ protected override async Task ExecuteAsync()
}
}
private
bool
GetNextWorkItem
(
out
WorkItem
workItem
,
out
CancellationToken
Source
documentCancellatio
n
)
private
bool
GetNextWorkItem
(
out
WorkItem
workItem
,
out
CancellationToken
cancellationToke
n
)
{
// GetNextWorkItem since it can't fail. we still return bool to confirm that this never fail.
var
documentId
=
_processor
.
_documentTracker
.
TryGetActiveDocument
();
if
(
documentId
!=
null
)
{
if
(
_workItemQueue
.
TryTake
(
documentId
,
out
workItem
,
out
documentCancellatio
n
))
if
(
_workItemQueue
.
TryTake
(
documentId
,
out
workItem
,
out
cancellationToke
n
))
{
return
true
;
}
...
...
@@ -141,10 +141,10 @@ private bool GetNextWorkItem(out WorkItem workItem, out CancellationTokenSource
dependencyGraph
:
_processor
.
DependencyGraph
,
analyzerService
:
_processor
.
DiagnosticAnalyzerService
,
workItem
:
out
workItem
,
source
:
out
documentCancellatio
n
);
cancellationToken
:
out
cancellationToke
n
);
}
private
async
Task
ProcessDocumentAsync
(
Solution
solution
,
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
WorkItem
workItem
,
CancellationToken
Source
source
)
private
async
Task
ProcessDocumentAsync
(
Solution
solution
,
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
WorkItem
workItem
,
CancellationToken
cancellationToken
)
{
if
(
this
.
CancellationToken
.
IsCancellationRequested
)
{
...
...
@@ -156,9 +156,8 @@ private async Task ProcessDocumentAsync(Solution solution, ImmutableArray<IIncre
try
{
using
(
Logger
.
LogBlock
(
FunctionId
.
WorkCoordinator_ProcessDocumentAsync
,
w
=>
w
.
ToString
(),
workItem
,
source
.
Token
))
using
(
Logger
.
LogBlock
(
FunctionId
.
WorkCoordinator_ProcessDocumentAsync
,
w
=>
w
.
ToString
(),
workItem
,
cancellation
Token
))
{
var
cancellationToken
=
source
.
Token
;
var
document
=
solution
.
GetDocument
(
documentId
);
if
(
document
!=
null
)
{
...
...
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
浏览文件 @
3f47f739
...
...
@@ -114,7 +114,7 @@ private void CancelRunningTaskIfHigherQueueHasWorkItem()
_workItemQueue
.
RequestCancellationOnRunningTasks
();
}
private
async
Task
ProcessProjectAsync
(
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
WorkItem
workItem
,
CancellationToken
Source
source
)
private
async
Task
ProcessProjectAsync
(
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
WorkItem
workItem
,
CancellationToken
cancellationToken
)
{
if
(
this
.
CancellationToken
.
IsCancellationRequested
)
{
...
...
@@ -128,10 +128,8 @@ private async Task ProcessProjectAsync(ImmutableArray<IIncrementalAnalyzer> anal
try
{
using
(
Logger
.
LogBlock
(
FunctionId
.
WorkCoordinator_ProcessProjectAsync
,
w
=>
w
.
ToString
(),
workItem
,
source
.
Token
))
using
(
Logger
.
LogBlock
(
FunctionId
.
WorkCoordinator_ProcessProjectAsync
,
w
=>
w
.
ToString
(),
workItem
,
cancellation
Token
))
{
var
cancellationToken
=
source
.
Token
;
var
project
=
processingSolution
.
GetProject
(
projectId
);
if
(
project
!=
null
)
{
...
...
@@ -195,14 +193,12 @@ public override void Shutdown()
internal
void
WaitUntilCompletion_ForTestingPurposesOnly
(
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
List
<
WorkItem
>
items
)
{
CancellationTokenSource
source
=
new
CancellationTokenSource
();
var
uniqueIds
=
new
HashSet
<
ProjectId
>();
foreach
(
var
item
in
items
)
{
if
(
uniqueIds
.
Add
(
item
.
ProjectId
))
{
ProcessProjectAsync
(
analyzers
,
item
,
sourc
e
).
Wait
();
ProcessProjectAsync
(
analyzers
,
item
,
CancellationToken
.
Non
e
).
Wait
();
}
}
}
...
...
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
浏览文件 @
3f47f739
...
...
@@ -301,7 +301,7 @@ private void RemoveHigherPriorityDocument(DocumentId documentId)
}
}
private
async
Task
ProcessDocumentAsync
(
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
WorkItem
workItem
,
CancellationToken
Source
source
)
private
async
Task
ProcessDocumentAsync
(
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
WorkItem
workItem
,
CancellationToken
cancellationToken
)
{
if
(
this
.
CancellationToken
.
IsCancellationRequested
)
{
...
...
@@ -332,9 +332,8 @@ private async Task ProcessDocumentAsync(ImmutableArray<IIncrementalAnalyzer> ana
var
solution
=
this
.
Processor
.
CurrentSolution
;
try
{
using
(
Logger
.
LogBlock
(
FunctionId
.
WorkCoordinator_ProcessDocumentAsync
,
w
=>
w
.
ToString
(),
workItem
,
source
.
Token
))
using
(
Logger
.
LogBlock
(
FunctionId
.
WorkCoordinator_ProcessDocumentAsync
,
w
=>
w
.
ToString
(),
workItem
,
cancellation
Token
))
{
var
cancellationToken
=
source
.
Token
;
var
document
=
solution
.
GetDocument
(
documentId
);
if
(
document
!=
null
)
...
...
@@ -542,11 +541,9 @@ public override void Shutdown()
internal
void
WaitUntilCompletion_ForTestingPurposesOnly
(
ImmutableArray
<
IIncrementalAnalyzer
>
analyzers
,
List
<
WorkItem
>
items
)
{
CancellationTokenSource
source
=
new
CancellationTokenSource
();
foreach
(
var
item
in
items
)
{
ProcessDocumentAsync
(
analyzers
,
item
,
sourc
e
).
Wait
();
ProcessDocumentAsync
(
analyzers
,
item
,
CancellationToken
.
Non
e
).
Wait
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录