Browse Source

Merge pull request #763 from zawodskoj/master

Fix for #762 - thread pool leak
release/3.x.x
Christian 5 years ago
committed by GitHub
parent
commit
c3193c568a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
  1. +1
    -1
      .github/ISSUE_TEMPLATE/bug_report.md
  2. +1
    -1
      .github/ISSUE_TEMPLATE/custom.md
  3. +1
    -1
      .github/ISSUE_TEMPLATE/feature_request.md
  4. +1
    -1
      Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs
  5. +5
    -5
      Source/MQTTnet/Internal/BlockingQueue.cs

+ 1
- 1
.github/ISSUE_TEMPLATE/bug_report.md View File

@@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve.
title: ''
labels: ''
labels: 'bug'
assignees: ''

---


+ 1
- 1
.github/ISSUE_TEMPLATE/custom.md View File

@@ -2,7 +2,7 @@
name: Custom issue template
about: Do you have a question related to the project? Use this template.
title: ''
labels: ''
labels: 'question'
assignees: ''

---


+ 1
- 1
.github/ISSUE_TEMPLATE/feature_request.md View File

@@ -2,7 +2,7 @@
name: Feature request
about: Suggest an idea for this project.
title: ''
labels: ''
labels: 'feature-request'
assignees: ''

---


+ 1
- 1
Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs View File

@@ -349,7 +349,7 @@ namespace MQTTnet.Extensions.ManagedClient
// of the messages, the DropOldestQueuedMessage strategy would
// be unable to know which message is actually the oldest and would
// instead drop the first item in the queue.
var message = _messageQueue.PeekAndWait();
var message = _messageQueue.PeekAndWait(cancellationToken);
if (message == null)
{
continue;


+ 5
- 5
Source/MQTTnet/Internal/BlockingQueue.cs View File

@@ -8,7 +8,7 @@ namespace MQTTnet.Internal
{
private readonly object _syncRoot = new object();
private readonly LinkedList<TItem> _items = new LinkedList<TItem>();
private readonly ManualResetEvent _gate = new ManualResetEvent(false);
private readonly ManualResetEventSlim _gate = new ManualResetEventSlim(false);

public int Count
{
@@ -32,7 +32,7 @@ namespace MQTTnet.Internal
}
}

public TItem Dequeue()
public TItem Dequeue(CancellationToken cancellationToken = default(CancellationToken))
{
while (true)
{
@@ -52,11 +52,11 @@ namespace MQTTnet.Internal
}
}

_gate.WaitOne();
_gate.Wait(cancellationToken);
}
}
public TItem PeekAndWait()
public TItem PeekAndWait(CancellationToken cancellationToken = default(CancellationToken))
{
while (true)
{
@@ -73,7 +73,7 @@ namespace MQTTnet.Internal
}
}

_gate.WaitOne();
_gate.Wait(cancellationToken);
}
}



Loading…
Cancel
Save