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

Switch back to Tasks in binding queue (#510)

Browse Source
This commit is contained in:
Karl Burtram
2017-10-19 16:05:24 -07:00
committed by GitHub
parent c2b2d16b6c
commit 328fb30db2
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
CancellationTokenSource cancelToken = new CancellationTokenSource(); CancellationTokenSource cancelToken = new CancellationTokenSource();
// run the operation in a separate thread // run the operation in a separate thread
var bindThread = new Thread(() => var bindTask = Task.Run(() =>
{ {
try try
{ {
@@ -304,11 +304,10 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
result = queueItem.ErrorHandler(ex); result = queueItem.ErrorHandler(ex);
} }
} }
}, BindingQueue<T>.QueueThreadStackSize); });
bindThread.Start();
// check if the binding tasks completed within the binding timeout // check if the binding tasks completed within the binding timeout
if (bindThread.Join(bindTimeout)) if (bindTask.Wait(bindTimeout))
{ {
queueItem.Result = result; queueItem.Result = result;
} }
@@ -324,12 +323,9 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
lockTaken = false; lockTaken = false;
Task.Run(() => bindTask
{ .ContinueWith((a) => bindingContext.BindingLock.Set())
// wait for the operation to complete before releasing the lock .ContinueWithOnFaulted(t => Logger.Write(LogLevel.Error, "Binding queue threw exception " + t.Exception.ToString()));
bindThread.Join();
bindingContext.BindingLock.Set();
}).ContinueWithOnFaulted(t => Logger.Write(LogLevel.Error, "Binding queue threw exception " + t.Exception.ToString()));
} }
} }
catch (Exception ex) catch (Exception ex)