ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-10 18:22:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Increase parsing thread stack size to avoid stack overflow (#486)

Browse Source 
* Increase parsing thread stack size to avoid stack overflow

* Fix extra space

* Remove extra spaces
This commit is contained in:
Karl Burtram
2017-10-10 16:33:04 -07:00
committed by GitHub
parent 11cb154d6d
commit 4945aead96
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs
View File

@@ -17,6 +17,8 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
/// </summary>
public class BindingQueue<T> : IDisposable where T : IBindingContext, new()
{
internal const int QueueThreadStackSize = 5 * 1024 * 1024;
private CancellationTokenSource processQueueCancelToken = new CancellationTokenSource();
private ManualResetEvent itemQueuedEvent = new ManualResetEvent(initialState: false);
@@ -264,15 +266,18 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
// execute the binding operation
object result = null;
CancellationTokenSource cancelToken = new CancellationTokenSource();
var bindTask = Task.Run(() =>
// run the operation in a separate thread
var bindThread = new Thread(() =>
{
result = queueItem.BindOperation(
bindingContext,
cancelToken.Token);
});
cancelToken.Token);
}, BindingQueue<T>.QueueThreadStackSize);
bindThread.Start();
// check if the binding tasks completed within the binding timeout
if (bindTask.Wait(bindTimeout))
// check if the binding tasks completed within the binding timeout
if (bindThread.Join(bindTimeout))
{
queueItem.Result = result;
}
@@ -285,12 +290,17 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
{
queueItem.Result = queueItem.TimeoutOperation(bindingContext);
}
lockTaken = false;
bindTask.ContinueWith((a) => bindingContext.BindingLock.Set());
}
}
Task.Run(() =>
{
// wait for the operation to complete before releasing the lock
bindThread.Join();
bindingContext.BindingLock.Set();
});
}
}
catch (Exception ex)
{
// catch and log any exceptions raised in the binding calls

18
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
View File

@@ -762,13 +762,19 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
{
if (connInfo == null || !parseInfo.IsConnected)
{
// parse current SQL file contents to retrieve a list of errors
ParseResult parseResult = Parser.IncrementalParse(
scriptFile.Contents,
parseInfo.ParseResult,
this.DefaultParseOptions);
// parse on separate thread so stack size can be increased
var parseThread = new Thread(() =>
{
// parse current SQL file contents to retrieve a list of errors
ParseResult parseResult = Parser.IncrementalParse(
scriptFile.Contents,
parseInfo.ParseResult,
this.DefaultParseOptions);
parseInfo.ParseResult = parseResult;
parseInfo.ParseResult = parseResult;
}, ConnectedBindingQueue.QueueThreadStackSize);
parseThread.Start();
parseThread.Join();
}
else
{