Skip to content

[WIP] Use Task.Run instead ThreadPool.QueueUserWorkItem #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[WIP] Use Task.Run instead ThreadPool.QueueUserWorkItem #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15bc689
Use Task.Run instead ThreadPool.QueueUserWorkItem
danipen May 16, 2022
a3fab0a
Protect NRE if a call to Stop() is performed without calling Start()
danipen May 16, 2022
ddc679d
Merge branch 'master' into use-tasks-instead-threads
danipen Oct 23, 2022
9f78d28
Add wasm dependencies
danipen Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,3 +381,4 @@ onigwrap/src/onigwrap.lib
onigwrap/src/onigwrap.exp
onigwrap/src/onigwrap.dll
onigwrap/src/onig_s.lib
onigwrap/src/libonigwrap.wasm
Binary file added src/TextMateSharp/Internal/Oniguruma/Native/browser-wasm/libonigwrap.wasm
View file
Open in desktop
Binary file not shown.
10 changes: 7 additions & 3 deletions src/TextMateSharp/Model/TMModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;

using TextMateSharp.Grammars;

Expand Down Expand Up @@ -38,6 +39,7 @@ class TokenizerThread
private string name;
private TMModel model;
private TMState lastState;
private Task task;

public TokenizerThread(string name, TMModel model)
{
Expand All @@ -50,15 +52,18 @@ public void Run()
{
IsStopped = false;

ThreadPool.QueueUserWorkItem(ThreadWorker);
task = Task.Run(ThreadWorker);
}

public void Stop()
{
IsStopped = true;
this.model._resetEvent.Set();
task?.Wait(TimeSpan.FromSeconds(1));
task?.Dispose();
}

void ThreadWorker(object state)
void ThreadWorker()
{
if (IsStopped)
{
Expand Down Expand Up @@ -336,7 +341,6 @@ private void Stop()
}

this._thread.Stop();
_resetEvent.Set();
this._thread = null;
}

Expand Down
12 changes: 12 additions & 0 deletions src/TextMateSharp/TextMateSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ TextMateSharp uses a wrapper around Oniguruma regex engine. Read below to learn
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>libonigwrap.dylib</TargetPath>
</ContentWithTargetPath>
<!-- native oniguruma library for web assembly -->
<ContentWithTargetPath Include="Internal\Oniguruma\Native\browser-wasm\libonigwrap.wasm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>libonigwrap.wasm</TargetPath>
</ContentWithTargetPath>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -64,6 +69,13 @@ TextMateSharp uses a wrapper around Oniguruma regex engine. Read below to learn
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<!-- native oniguruma library for wasm in nuget package -->
<Content Include="Internal\Oniguruma\Native\browser-wasm\libonigwrap.wasm">
<Link>libonigwrap.wasm</Link>
<PackagePath>runtimes/browser-wasm/native/libonigwrap.wasm</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
Expand Down