Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
b8287999
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,发现更多精彩内容 >>
提交
b8287999
编写于
11月 28, 2016
作者:
H
Heejae Chang
提交者:
GitHub
11月 28, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15110 from heejaechang/checkcancel
fixed 2 known OOP issues
上级
8f062669
5121b001
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
66 addition
and
46 deletion
+66
-46
src/VisualStudio/Core/Next/Remote/ServiceHubRemoteHostClient.cs
...sualStudio/Core/Next/Remote/ServiceHubRemoteHostClient.cs
+26
-8
src/Workspaces/Remote/ServiceHub/Shared/Extensions.cs
src/Workspaces/Remote/ServiceHub/Shared/Extensions.cs
+40
-38
未找到文件。
src/VisualStudio/Core/Next/Remote/ServiceHubRemoteHostClient.cs
浏览文件 @
b8287999
...
...
@@ -4,6 +4,7 @@
using
System.IO
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.ErrorReporting
;
using
Microsoft.CodeAnalysis.Execution
;
using
Microsoft.CodeAnalysis.Internal.Log
;
using
Microsoft.CodeAnalysis.Remote
;
...
...
@@ -105,16 +106,33 @@ private void OnRpcDisconnected(object sender, JsonRpcDisconnectedEventArgs e)
private
static
async
Task
<
Stream
>
RequestServiceAsync
(
HubClient
client
,
string
serviceName
,
string
hostGroup
,
CancellationToken
cancellationToken
=
default
(
CancellationToken
))
{
// we can remove these once whole system moved to new servicehub API
const
int
max_retry
=
10
;
const
int
retry_delayInMS
=
50
;
// call to get service can fail due to this bug - devdiv#288961
// until root cause is fixed, we decide to have retry rather than fail right away
for
(
var
i
=
0
;
i
<
max_retry
;
i
++)
{
cancellationToken
.
ThrowIfCancellationRequested
();
try
{
var
descriptor
=
new
ServiceDescriptor
(
serviceName
)
{
HostGroup
=
new
HostGroup
(
hostGroup
)
};
return
await
client
.
RequestServiceAsync
(
descriptor
,
cancellationToken
).
ConfigureAwait
(
false
);
}
catch
catch
(
RemoteInvocationException
ex
)
{
return
await
client
.
RequestServiceAsync
(
serviceName
,
cancellationToken
).
ConfigureAwait
(
false
);
// RequestServiceAsync should never fail unless service itself is actually broken.
// right now, we know only 1 case where it can randomly fail. but there might be more cases so
// adding non fatal watson here.
FatalError
.
ReportWithoutCrash
(
ex
);
}
// wait for retry_delayInMS before next try
await
Task
.
Delay
(
retry_delayInMS
,
cancellationToken
).
ConfigureAwait
(
false
);
}
return
Contract
.
FailWithReturn
<
Stream
>(
"Fail to get service. look FatalError.s_reportedException for more detail"
);
}
}
}
\ No newline at end of file
src/Workspaces/Remote/ServiceHub/Shared/Extensions.cs
浏览文件 @
b8287999
...
...
@@ -17,11 +17,11 @@ internal static partial class Extensions
public
static
async
Task
InvokeAsync
(
this
JsonRpc
rpc
,
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
Task
>
funcWithDirectStreamAsync
,
CancellationToken
cancellationToken
)
{
try
{
using
(
var
mergedCancellation
=
CancellationTokenSource
.
CreateLinkedTokenSource
(
cancellationToken
))
using
(
var
stream
=
new
ServerDirectStream
())
{
try
{
// send request by adding direct stream name to end of arguments
var
task
=
rpc
.
InvokeAsync
(
targetName
,
arguments
.
Concat
(
stream
.
Name
).
ToArray
());
...
...
@@ -38,22 +38,22 @@ internal static partial class Extensions
// wait task to finish
await
task
.
ConfigureAwait
(
false
);
}
}
catch
(
Exception
ex
)
when
(
IsCancelled
(
ex
))
catch
(
Exception
ex
)
when
(
ReportUnlessCanceled
(
ex
,
mergedCancellation
.
Token
))
{
cancellationToken
.
ThrowIfCancellationRequested
();
throw
;
}
}
}
public
static
async
Task
<
T
>
InvokeAsync
<
T
>(
this
JsonRpc
rpc
,
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
Task
<
T
>>
funcWithDirectStreamAsync
,
CancellationToken
cancellationToken
)
{
try
{
using
(
var
mergedCancellation
=
CancellationTokenSource
.
CreateLinkedTokenSource
(
cancellationToken
))
using
(
var
stream
=
new
ServerDirectStream
())
{
try
{
// send request to asset source
var
task
=
rpc
.
InvokeAsync
(
targetName
,
arguments
.
Concat
(
stream
.
Name
).
ToArray
());
...
...
@@ -72,22 +72,22 @@ internal static partial class Extensions
return
result
;
}
}
catch
(
Exception
ex
)
when
(
IsCancelled
(
ex
))
catch
(
Exception
ex
)
when
(
ReportUnlessCanceled
(
ex
,
mergedCancellation
.
Token
))
{
cancellationToken
.
ThrowIfCancellationRequested
();
throw
;
}
}
}
public
static
async
Task
InvokeAsync
(
this
JsonRpc
rpc
,
string
targetName
,
IEnumerable
<
object
>
arguments
,
Action
<
Stream
,
CancellationToken
>
actionWithDirectStream
,
CancellationToken
cancellationToken
)
{
try
{
using
(
var
mergedCancellation
=
CancellationTokenSource
.
CreateLinkedTokenSource
(
cancellationToken
))
using
(
var
stream
=
new
ServerDirectStream
())
{
try
{
// send request by adding direct stream name to end of arguments
var
task
=
rpc
.
InvokeAsync
(
targetName
,
arguments
.
Concat
(
stream
.
Name
).
ToArray
());
...
...
@@ -104,22 +104,22 @@ internal static partial class Extensions
// wait task to finish
await
task
.
ConfigureAwait
(
false
);
}
}
catch
(
Exception
ex
)
when
(
IsCancelled
(
ex
))
catch
(
Exception
ex
)
when
(
ReportUnlessCanceled
(
ex
,
mergedCancellation
.
Token
))
{
cancellationToken
.
ThrowIfCancellationRequested
();
throw
;
}
}
}
public
static
async
Task
<
T
>
InvokeAsync
<
T
>(
this
JsonRpc
rpc
,
string
targetName
,
IEnumerable
<
object
>
arguments
,
Func
<
Stream
,
CancellationToken
,
T
>
funcWithDirectStream
,
CancellationToken
cancellationToken
)
{
try
{
using
(
var
mergedCancellation
=
CancellationTokenSource
.
CreateLinkedTokenSource
(
cancellationToken
))
using
(
var
stream
=
new
ServerDirectStream
())
{
try
{
// send request to asset source
var
task
=
rpc
.
InvokeAsync
(
targetName
,
arguments
.
Concat
(
stream
.
Name
).
ToArray
());
...
...
@@ -138,25 +138,27 @@ internal static partial class Extensions
return
result
;
}
}
catch
(
Exception
ex
)
when
(
IsCancelled
(
ex
))
catch
(
Exception
ex
)
when
(
ReportUnlessCanceled
(
ex
,
mergedCancellation
.
Token
))
{
cancellationToken
.
ThrowIfCancellationRequested
();
throw
;
}
}
}
private
static
bool
IsCancelled
(
Exception
ex
)
private
static
bool
ReportUnlessCanceled
(
Exception
ex
,
CancellationToken
token
)
{
// object disposed exception can be thrown from StreamJsonRpc if JsonRpc is disposed in the middle of read/write.
// the way we added cancellation support to the JsonRpc which doesn't support cancellation natively
// can cause this exception to happen. newer version supports cancellation token natively, but
// we can't use it now, so we will catch object disposed exception and check cancellation token
if
(
ex
is
ObjectDisposedException
||
ex
is
OperationCanceledException
)
// check whether we are in cancellation mode
if
(
token
.
IsCancellationRequested
)
{
// we are under cancellation, we don't care what the exception is.
// due to the way we do cancellation (forcefully closing connection in the middle of reading/writing)
// various exceptions can be thrown. for example, if we close our own named pipe stream in the middle of
// object reader/writer using it, we could get invalid operation exception or invalid cast exception.
return
true
;
}
// unexpected exception case. crash VS
return
FatalError
.
Report
(
ex
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录