Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
1689a20d
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,发现更多精彩内容 >>
未验证
提交
1689a20d
编写于
9月 18, 2019
作者:
J
Jared Parsons
提交者:
GitHub
9月 18, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #38688 from jaredpar/fix-sync
Additional logging in the compiler server
上级
41548da4
4b2cc832
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
84 addition
and
71 deletion
+84
-71
src/Compilers/Shared/BuildServerConnection.cs
src/Compilers/Shared/BuildServerConnection.cs
+84
-71
未找到文件。
src/Compilers/Shared/BuildServerConnection.cs
浏览文件 @
1689a20d
...
...
@@ -125,79 +125,109 @@ internal sealed class BuildServerConnection
return
new
IncorrectHashBuildResponse
();
}
var
clientDir
=
buildPaths
.
ClientDirectory
;
var
timeoutNewProcess
=
timeoutOverride
??
TimeOutMsNewProcess
;
var
timeoutExistingProcess
=
timeoutOverride
??
TimeOutMsExistingProcess
;
Task
<
NamedPipeClientStream
>
pipeTask
=
null
;
IServerMutex
clientMutex
=
null
;
try
var
pipeTask
=
tryConnectToServer
(
pipeName
,
buildPaths
,
timeoutOverride
,
createServerFunc
,
cancellationToken
);
if
(
pipeTask
is
null
)
{
var
holdsMutex
=
false
;
try
return
new
RejectedBuildResponse
();
}
else
{
var
pipe
=
await
pipeTask
.
ConfigureAwait
(
false
);
if
(
pipe
is
null
)
{
var
clientMutexName
=
GetClientMutexName
(
pipeName
);
clientMutex
=
OpenOrCreateMutex
(
clientMutexName
,
out
holdsMutex
);
return
new
RejectedBuildResponse
();
}
catch
else
{
// The Mutex constructor can throw in certain cases. One specific example is docker containers
// where the /tmp directory is restricted. In those cases there is no reliable way to execute
// the server and we need to fall back to the command line.
//
// Example: https://github.com/dotnet/roslyn/issues/24124
return
new
RejectedBuildResponse
();
var
request
=
BuildRequest
.
Create
(
language
,
buildPaths
.
WorkingDirectory
,
buildPaths
.
TempDirectory
,
BuildProtocolConstants
.
GetCommitHash
(),
arguments
,
keepAlive
,
libEnvVariable
);
return
await
TryCompile
(
pipe
,
request
,
cancellationToken
).
ConfigureAwait
(
false
);
}
}
if
(!
holdsMutex
)
// This code uses a Mutex.WaitOne / ReleaseMutex pairing. Both of these calls must occur on the same thread
// or an exception will be thrown. This code lives in a separate non-async function to help ensure this
// invariant doesn't get invalidated in the future by an `await` being inserted.
static
Task
<
NamedPipeClientStream
>
tryConnectToServer
(
string
pipeName
,
BuildPathsAlt
buildPaths
,
int
?
timeoutOverride
,
CreateServerFunc
createServerFunc
,
CancellationToken
cancellationToken
)
{
var
originalThreadId
=
Thread
.
CurrentThread
.
ManagedThreadId
;
var
clientDir
=
buildPaths
.
ClientDirectory
;
var
timeoutNewProcess
=
timeoutOverride
??
TimeOutMsNewProcess
;
var
timeoutExistingProcess
=
timeoutOverride
??
TimeOutMsExistingProcess
;
Task
<
NamedPipeClientStream
>
pipeTask
=
null
;
IServerMutex
clientMutex
=
null
;
try
{
var
holdsMutex
=
false
;
try
{
holdsMutex
=
clientMutex
.
TryLock
(
timeoutNewProcess
);
var
clientMutexName
=
GetClientMutexName
(
pipeName
);
clientMutex
=
OpenOrCreateMutex
(
clientMutexName
,
out
holdsMutex
);
}
catch
{
// The Mutex constructor can throw in certain cases. One specific example is docker containers
// where the /tmp directory is restricted. In those cases there is no reliable way to execute
// the server and we need to fall back to the command line.
//
// Example: https://github.com/dotnet/roslyn/issues/24124
return
null
;
}
if
(!
holdsMutex
)
if
(!
holdsMutex
)
{
try
{
return
new
RejectedBuildResponse
();
holdsMutex
=
clientMutex
.
TryLock
(
timeoutNewProcess
);
if
(!
holdsMutex
)
{
return
null
;
}
}
catch
(
AbandonedMutexException
)
{
holdsMutex
=
true
;
}
}
catch
(
AbandonedMutexException
)
// Check for an already running server
var
serverMutexName
=
GetServerMutexName
(
pipeName
);
bool
wasServerRunning
=
WasServerMutexOpen
(
serverMutexName
);
var
timeout
=
wasServerRunning
?
timeoutExistingProcess
:
timeoutNewProcess
;
if
(
wasServerRunning
||
createServerFunc
(
clientDir
,
pipeName
))
{
holdsMutex
=
true
;
pipeTask
=
TryConnectToServerAsync
(
pipeName
,
timeout
,
cancellationToken
)
;
}
}
// Check for an already running server
var
serverMutexName
=
GetServerMutexName
(
pipeName
);
bool
wasServerRunning
=
WasServerMutexOpen
(
serverMutexName
);
var
timeout
=
wasServerRunning
?
timeoutExistingProcess
:
timeoutNewProcess
;
if
(
wasServerRunning
||
createServerFunc
(
clientDir
,
pipeName
))
{
pipeTask
=
TryConnectToServerAsync
(
pipeName
,
timeout
,
cancellationToken
);
return
pipeTask
;
}
}
finally
{
clientMutex
?.
Dispose
();
}
if
(
pipeTask
!=
null
)
{
var
pipe
=
await
pipeTask
.
ConfigureAwait
(
false
);
if
(
pipe
!=
null
)
finally
{
var
request
=
BuildRequest
.
Create
(
language
,
buildPaths
.
WorkingDirectory
,
buildPaths
.
TempDirectory
,
BuildProtocolConstants
.
GetCommitHash
(),
arguments
,
keepAlive
,
libEnvVariable
);
return
await
TryCompile
(
pipe
,
request
,
cancellationToken
).
ConfigureAwait
(
false
);
try
{
clientMutex
?.
Dispose
();
}
catch
(
ApplicationException
e
)
{
var
releaseThreadId
=
Thread
.
CurrentThread
.
ManagedThreadId
;
var
message
=
$"ReleaseMutex failed. WaitOne Id:
{
originalThreadId
}
Release Id:
{
releaseThreadId
}
"
;
throw
new
Exception
(
message
,
e
);
}
}
}
return
new
RejectedBuildResponse
();
}
/// <summary>
...
...
@@ -601,7 +631,6 @@ public static string GetTempPath(string workingDir)
internal
interface
IServerMutex
:
IDisposable
{
bool
TryLock
(
int
timeoutMs
);
void
Unlock
();
bool
IsDisposed
{
get
;
}
}
...
...
@@ -732,16 +761,6 @@ public bool TryLock(int timeoutMs)
return
IsLocked
=
Mutex
.
WaitOne
(
timeoutMs
);
}
public
void
Unlock
()
{
if
(
IsDisposed
)
throw
new
ObjectDisposedException
(
"Mutex"
);
if
(!
IsLocked
)
throw
new
InvalidOperationException
(
"Lock not held"
);
Mutex
.
ReleaseMutex
();
IsLocked
=
false
;
}
public
void
Dispose
()
{
if
(
IsDisposed
)
...
...
@@ -756,6 +775,7 @@ public void Dispose()
finally
{
Mutex
.
Dispose
();
IsLocked
=
false
;
}
}
}
...
...
@@ -792,13 +812,6 @@ public bool TryLock(int timeoutMs)
return
HeldMutex
.
TryLock
(
timeoutMs
);
}
public
void
Unlock
()
{
if
(
IsDisposed
)
throw
new
ObjectDisposedException
(
"Mutex"
);
HeldMutex
.
Unlock
();
}
public
void
Dispose
()
{
if
(
IsDisposed
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录