Skip to content

Use Channel instead of BufferBlock #343

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

Merged
merged 4 commits into from
Feb 15, 2021
Merged

Use Channel instead of BufferBlock #343

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
8a2a710
Use Channel instead of BufferBlock
taooceros Feb 15, 2021
a7811f3
fix an issue
taooceros Feb 15, 2021
b017bde
fix format
taooceros Feb 15, 2021
350499a
Optimize Logic and code
taooceros Feb 15, 2021
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
31 changes: 22 additions & 9 deletions Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Storage;
using Flow.Launcher.Infrastructure.Logger;
using System.Threading.Channels;

namespace Flow.Launcher.ViewModel
{
Expand Down Expand Up @@ -46,7 +47,7 @@ public class MainViewModel : BaseModel, ISavable

private readonly Internationalization _translator = InternationalizationManager.Instance;

private BufferBlock<ResultsForUpdate> _resultsUpdateQueue;
private ChannelWriter<ResultsForUpdate> _resultsUpdateChannelWriter;
private Task _resultsViewUpdateTask;

#endregion
Expand Down Expand Up @@ -85,25 +86,31 @@ public MainViewModel(Settings settings)

private void RegisterViewUpdate()
{
_resultsUpdateQueue = new BufferBlock<ResultsForUpdate>();
var resultUpdateChannel = Channel.CreateUnbounded<ResultsForUpdate>();
_resultsUpdateChannelWriter = resultUpdateChannel.Writer;
_resultsViewUpdateTask =
Task.Run(updateAction).ContinueWith(continueAction, TaskContinuationOptions.OnlyOnFaulted);

async Task updateAction()
{
var queue = new Dictionary<string, ResultsForUpdate>();
while (await _resultsUpdateQueue.OutputAvailableAsync())
var channelReader = resultUpdateChannel.Reader;

// it is not supposed to be false because it won't be complete
while (await channelReader.WaitToReadAsync())
{
queue.Clear();
await Task.Delay(20);
while (_resultsUpdateQueue.TryReceive(out var item))
while (channelReader.TryRead(out var item))
{
if (!item.Token.IsCancellationRequested)
queue[item.ID] = item;
}

UpdateResultView(queue.Values);
queue.Clear();
}

Log.Error("MainViewModel", "Unexpected ResultViewUpdate ends");
};

void continueAction(Task t)
Expand All @@ -128,7 +135,10 @@ private void RegisterResultsUpdatedEvent()
if (e.Query.RawQuery == QueryText) // TODO: allow cancellation
{
PluginManager.UpdatePluginMetadata(e.Results, pair.Metadata, e.Query);
_resultsUpdateQueue.Post(new ResultsForUpdate(e.Results, pair.Metadata, e.Query, _updateToken));
if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(e.Results, pair.Metadata, e.Query, _updateToken)))
{
Log.Error("MainViewModel", "Unable to add item to Result Update Queue");
};
}
};
}
Expand Down Expand Up @@ -529,9 +539,12 @@ async Task QueryTask(PluginPair plugin)
await Task.Yield();

var results = await PluginManager.QueryForPlugin(plugin, query, currentCancellationToken);
if (!currentCancellationToken.IsCancellationRequested && results != null)
_resultsUpdateQueue.Post(new ResultsForUpdate(results, plugin.Metadata, query,
currentCancellationToken));
if (currentCancellationToken.IsCancellationRequested || results == null) return;

if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(results, plugin.Metadata, query, currentCancellationToken)))
{
Log.Error("MainViewModel", "Unable to add item to Result Update Queue");
};
}
}, currentCancellationToken)
.ContinueWith(t => Log.Exception("|MainViewModel|Plugins Query Exceptions", t.Exception),
Expand Down
9 changes: 1 addition & 8 deletions Flow.Launcher/ViewModel/ResultsForUpdate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Flow.Launcher.ViewModel
{
public class ResultsForUpdate
public struct ResultsForUpdate
{
public List<Result> Results { get; }

Expand All @@ -16,13 +16,6 @@ public class ResultsForUpdate
public Query Query { get; }
public CancellationToken Token { get; }

public ResultsForUpdate(List<Result> results, string resultID, CancellationToken token)
{
Results = results;
ID = resultID;
Token = token;
}

public ResultsForUpdate(List<Result> results, PluginMetadata metadata, Query query, CancellationToken token)
{
Results = results;
Expand Down
11 changes: 4 additions & 7 deletions Flow.Launcher/ViewModel/ResultsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,12 @@ private void UpdateResults(List<ResultViewModel> newResults, CancellationToken t
private List<ResultViewModel> NewResults(List<Result> newRawResults, string resultId)
{
if (newRawResults.Count == 0)
return Results.ToList();
return Results;

var results = Results as IEnumerable<ResultViewModel>;

var newResults = newRawResults.Select(r => new ResultViewModel(r, _settings));

return results.Where(r => r.Result.PluginID != resultId)
return Results.Where(r => r.Result.PluginID != resultId)
.Concat(newResults)
.OrderByDescending(r => r.Result.Score)
.ToList();
Expand All @@ -198,11 +197,9 @@ private List<ResultViewModel> NewResults(List<Result> newRawResults, string resu
private List<ResultViewModel> NewResults(IEnumerable<ResultsForUpdate> resultsForUpdates)
{
if (!resultsForUpdates.Any())
return Results.ToList();
return Results;

var results = Results as IEnumerable<ResultViewModel>;

return results.Where(r => r != null && !resultsForUpdates.Any(u => u.Metadata.ID == r.Result.PluginID))
return Results.Where(r => r != null && !resultsForUpdates.Any(u => u.ID == r.Result.PluginID))
.Concat(resultsForUpdates.SelectMany(u => u.Results, (u, r) => new ResultViewModel(r, _settings)))
.OrderByDescending(rv => rv.Result.Score)
.ToList();
Expand Down