Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
529e0e00
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,发现更多精彩内容 >>
提交
529e0e00
编写于
1月 06, 2017
作者:
H
Heejae Chang
提交者:
GitHub
1月 06, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16264 from heejaechang/fixCancellationHandling
Fix cancellation handling
上级
c752659a
73694edb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
3 deletion
+14
-3
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
...e/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
+6
-2
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
...olutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
+1
-0
src/Workspaces/Remote/ServiceHub/Shared/Extensions.cs
src/Workspaces/Remote/ServiceHub/Shared/Extensions.cs
+7
-1
未找到文件。
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.LowPriorityProcessor.cs
浏览文件 @
529e0e00
...
@@ -48,6 +48,7 @@ protected override async Task ExecuteAsync()
...
@@ -48,6 +48,7 @@ protected override async Task ExecuteAsync()
{
{
// we wait for global operation, higher and normal priority processor to finish its working
// we wait for global operation, higher and normal priority processor to finish its working
await
WaitForHigherPriorityOperationsAsync
().
ConfigureAwait
(
false
);
await
WaitForHigherPriorityOperationsAsync
().
ConfigureAwait
(
false
);
// process any available project work, preferring the active project.
// process any available project work, preferring the active project.
if
(
_workItemQueue
.
TryTakeAnyWork
(
if
(
_workItemQueue
.
TryTakeAnyWork
(
this
.
Processor
.
GetActiveProject
(),
this
.
Processor
.
DependencyGraph
,
this
.
Processor
.
DiagnosticAnalyzerService
,
this
.
Processor
.
GetActiveProject
(),
this
.
Processor
.
DependencyGraph
,
this
.
Processor
.
DiagnosticAnalyzerService
,
...
@@ -149,9 +150,12 @@ private async Task ProcessProjectAsync(ImmutableArray<IIncrementalAnalyzer> anal
...
@@ -149,9 +150,12 @@ private async Task ProcessProjectAsync(ImmutableArray<IIncrementalAnalyzer> anal
RemoveProject
(
projectId
);
RemoveProject
(
projectId
);
}
}
}
processedEverything
=
true
;
if
(!
cancellationToken
.
IsCancellationRequested
)
{
processedEverything
=
true
;
}
}
}
}
catch
(
Exception
e
)
when
(
FatalError
.
ReportUnlessCanceled
(
e
))
catch
(
Exception
e
)
when
(
FatalError
.
ReportUnlessCanceled
(
e
))
{
{
...
...
src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs
浏览文件 @
529e0e00
...
@@ -330,6 +330,7 @@ private async Task ProcessDocumentAsync(ImmutableArray<IIncrementalAnalyzer> ana
...
@@ -330,6 +330,7 @@ private async Task ProcessDocumentAsync(ImmutableArray<IIncrementalAnalyzer> ana
{
{
var
cancellationToken
=
source
.
Token
;
var
cancellationToken
=
source
.
Token
;
var
document
=
_processingSolution
.
GetDocument
(
documentId
);
var
document
=
_processingSolution
.
GetDocument
(
documentId
);
if
(
document
!=
null
)
if
(
document
!=
null
)
{
{
await
TrackSemanticVersionsAsync
(
document
,
workItem
,
cancellationToken
).
ConfigureAwait
(
false
);
await
TrackSemanticVersionsAsync
(
document
,
workItem
,
cancellationToken
).
ConfigureAwait
(
false
);
...
...
src/Workspaces/Remote/ServiceHub/Shared/Extensions.cs
浏览文件 @
529e0e00
...
@@ -183,10 +183,16 @@ private static bool ReportUnlessCanceled(Exception ex, CancellationToken token)
...
@@ -183,10 +183,16 @@ private static bool ReportUnlessCanceled(Exception ex, CancellationToken token)
private
static
void
RaiseCancellationIfInvokeFailed
(
Task
task
,
CancellationTokenSource
mergedCancellation
,
CancellationToken
cancellationToken
)
private
static
void
RaiseCancellationIfInvokeFailed
(
Task
task
,
CancellationTokenSource
mergedCancellation
,
CancellationToken
cancellationToken
)
{
{
// if invoke throws an exception, make sure we raise cancellation
// if invoke throws an exception, make sure we raise cancellation
var
dummy
=
task
.
ContinueWith
(
_
=>
var
dummy
=
task
.
ContinueWith
(
p
=>
{
{
try
try
{
{
if
(
p
.
Exception
!=
null
&&
!
cancellationToken
.
IsCancellationRequested
)
{
// fail fast if we are here without cencellation raised.
FatalError
.
Report
(
p
.
Exception
);
}
mergedCancellation
.
Cancel
();
mergedCancellation
.
Cancel
();
}
}
catch
(
ObjectDisposedException
)
catch
(
ObjectDisposedException
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录