From f398cddaf0b4fcd3b81e58e5009f80ea7c6f7e59 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Jun 2022 08:37:25 +0000 Subject: [PATCH] Replaced all usages of ConcurrentDictionary with NonBlocking.ConcurrentDictionary --- src/NadekoBot.Tests/ConcurrentHashSetTests.cs | 93 ++ .../Common/Collections/ConcurrentHashSet.cs | 840 ++---------------- src/NadekoBot/GlobalUsings.cs | 3 +- .../Administration/VcRole/VcRoleService.cs | 6 +- .../Gambling/Events/GameStatusEvent.cs | 1 + .../Modules/Gambling/Events/ReactionEvent.cs | 2 +- src/NadekoBot/Modules/Xp/XpService.cs | 2 +- 7 files changed, 157 insertions(+), 790 deletions(-) create mode 100644 src/NadekoBot.Tests/ConcurrentHashSetTests.cs diff --git a/src/NadekoBot.Tests/ConcurrentHashSetTests.cs b/src/NadekoBot.Tests/ConcurrentHashSetTests.cs new file mode 100644 index 000000000..6530e3562 --- /dev/null +++ b/src/NadekoBot.Tests/ConcurrentHashSetTests.cs @@ -0,0 +1,93 @@ +using System.Collections.Generic; +using NUnit.Framework; + +namespace NadekoBot.Tests; + +public class ConcurrentHashSetTests +{ + private ConcurrentHashSet<(int?, int?)> _set; + + [SetUp] + public void SetUp() + { + _set = new(); + } + + [Test] + public void AddTest() + { + var result = _set.Add((1, 2)); + + Assert.AreEqual(true, result); + + result = _set.Add((1, 2)); + + Assert.AreEqual(false, result); + } + + [Test] + public void TryRemoveTest() + { + _set.Add((1, 2)); + var result = _set.TryRemove((1, 2)); + + Assert.AreEqual(true, result); + + result = _set.TryRemove((1, 2)); + Assert.AreEqual(false, result); + } + + [Test] + public void CountTest() + { + _set.Add((1, 2)); // 1 + _set.Add((1, 2)); // 1 + + _set.Add((2, 2)); // 2 + + _set.Add((3, 2)); // 3 + _set.Add((3, 2)); // 3 + + Assert.AreEqual(3, _set.Count); + } + + [Test] + public void ClearTest() + { + _set.Add((1, 2)); + _set.Add((1, 3)); + _set.Add((1, 4)); + + _set.Clear(); + + Assert.AreEqual(0, _set.Count); + } + + [Test] + public void ContainsTest() + { + _set.Add((1, 2)); + _set.Add((3, 2)); + + Assert.AreEqual(true, _set.Contains((1, 2))); + Assert.AreEqual(true, _set.Contains((3, 2))); + Assert.AreEqual(false, _set.Contains((2, 1))); + Assert.AreEqual(false, _set.Contains((2, 3))); + } + + [Test] + public void RemoveWhereTest() + { + _set.Add((1, 2)); + _set.Add((1, 3)); + _set.Add((1, 4)); + _set.Add((2, 5)); + + // remove tuples which have even second item + _set.RemoveWhere(static x => x.Item2 % 2 == 0); + + Assert.AreEqual(2, _set.Count); + Assert.AreEqual(true, _set.Contains((1, 3))); + Assert.AreEqual(true, _set.Contains((2, 5))); + } +} \ No newline at end of file diff --git a/src/NadekoBot/Common/Collections/ConcurrentHashSet.cs b/src/NadekoBot/Common/Collections/ConcurrentHashSet.cs index fa1c22ebc..324a6b26d 100644 --- a/src/NadekoBot/Common/Collections/ConcurrentHashSet.cs +++ b/src/NadekoBot/Common/Collections/ConcurrentHashSet.cs @@ -1,4 +1,4 @@ -#nullable disable +#nullable enable #pragma warning disable // License MIT // Source: https://github.com/i3arnon/ConcurrentHashSet @@ -7,433 +7,23 @@ using System.Diagnostics; namespace System.Collections.Generic; -/// -/// Represents a thread-safe hash-based unique collection. -/// -/// The type of the items in the collection. -/// -/// All public members of are thread-safe and may be used -/// concurrently from multiple threads. -/// -[DebuggerDisplay("Count = {Count}")] +[DebuggerDisplay("{_backingStore.Count}")] public sealed class ConcurrentHashSet : IReadOnlyCollection, ICollection { - private const int DEFAULT_CAPACITY = 31; - private const int MAX_LOCK_NUMBER = 1024; - - private static int DefaultConcurrencyLevel - => PlatformHelper.ProcessorCount; - - /// - /// Gets a value that indicates whether the is empty. - /// - /// - /// true if the is empty; otherwise, - /// false. - /// - public bool IsEmpty - { - get - { - var acquiredLocks = 0; - try - { - AcquireAllLocks(ref acquiredLocks); - - for (var i = 0; i < tables.CountPerLock.Length; i++) - { - if (tables.CountPerLock[i] != 0) - return false; - } - } - finally - { - ReleaseLocks(0, acquiredLocks); - } - - return true; - } - } - - bool ICollection.IsReadOnly - => false; - - /// - /// Gets the number of items contained in the - /// - /// . - /// - /// - /// The number of items contained in the - /// - /// . - /// - /// - /// Count has snapshot semantics and represents the number of items in the - /// - /// at the moment when Count was accessed. - /// - public int Count - { - get - { - var count = 0; - var acquiredLocks = 0; - try - { - AcquireAllLocks(ref acquiredLocks); - - for (var i = 0; i < tables.CountPerLock.Length; i++) - count += tables.CountPerLock[i]; - } - finally - { - ReleaseLocks(0, acquiredLocks); - } - - return count; - } - } - - private readonly IEqualityComparer _comparer; - private readonly bool _growLockArray; - - private int budget; - private volatile Tables tables; - - /// - /// Initializes a new instance of the - /// - /// class that is empty, has the default concurrency level, has the default initial capacity, and - /// uses the default comparer for the item type. - /// + private readonly ConcurrentDictionary _backingStore; + public ConcurrentHashSet() - : this(DefaultConcurrencyLevel, DEFAULT_CAPACITY, true, EqualityComparer.Default) - { - } + => _backingStore = new(); - /// - /// Initializes a new instance of the - /// - /// class that is empty, has the specified concurrency level and capacity, and uses the default - /// comparer for the item type. - /// - /// - /// The estimated number of threads that will update the - /// concurrently. - /// - /// - /// The initial number of elements that the - /// - /// can contain. - /// - /// - /// is - /// less than 1. - /// - /// - /// is less than - /// 0. - /// - public ConcurrentHashSet(int concurrencyLevel, int capacity) - : this(concurrencyLevel, capacity, false, EqualityComparer.Default) - { - } + public ConcurrentHashSet(IEnumerable values, IEqualityComparer? comparer = null) + => _backingStore = new(values.Select(x => new KeyValuePair(x, true)), comparer); - /// - /// Initializes a new instance of the - /// class that contains elements copied from the specified - /// - /// , has the default concurrency - /// level, has the default initial capacity, and uses the default comparer for the item type. - /// - /// - /// The - /// - /// whose elements are copied to - /// the new - /// . - /// - /// is a null reference. - public ConcurrentHashSet(IEnumerable collection) - : this(collection, EqualityComparer.Default) - { - } - - /// - /// Initializes a new instance of the - /// class that is empty, has the specified concurrency level and capacity, and uses the specified - /// . - /// - /// - /// The - /// implementation to use when comparing items. - /// - /// is a null reference. - public ConcurrentHashSet(IEqualityComparer comparer) - : this(DefaultConcurrencyLevel, DEFAULT_CAPACITY, true, comparer) - { - } - - /// - /// Initializes a new instance of the - /// class that contains elements copied from the specified - /// - /// , has the default concurrency level, has the default - /// initial capacity, and uses the specified - /// . - /// - /// - /// The - /// - /// whose elements are copied to - /// the new - /// . - /// - /// - /// The - /// implementation to use when comparing items. - /// - /// - /// is a null reference - /// (Nothing in Visual Basic). -or- - /// is a null reference (Nothing in Visual Basic). - /// - public ConcurrentHashSet(IEnumerable collection, IEqualityComparer comparer) - : this(comparer) - { - if (collection is null) - throw new ArgumentNullException(nameof(collection)); - - InitializeFromCollection(collection); - } - - - /// - /// Initializes a new instance of the - /// class that contains elements copied from the specified , - /// has the specified concurrency level, has the specified initial capacity, and uses the specified - /// . - /// - /// - /// The estimated number of threads that will update the - /// concurrently. - /// - /// - /// The whose elements are copied to the new - /// . - /// - /// - /// The implementation to use - /// when comparing items. - /// - /// - /// is a null reference. - /// -or- - /// is a null reference. - /// - /// - /// is less than 1. - /// - public ConcurrentHashSet(int concurrencyLevel, IEnumerable collection, IEqualityComparer comparer) - : this(concurrencyLevel, DEFAULT_CAPACITY, false, comparer) - { - if (collection is null) - throw new ArgumentNullException(nameof(collection)); - if (comparer is null) - throw new ArgumentNullException(nameof(comparer)); - - InitializeFromCollection(collection); - } - - /// - /// Initializes a new instance of the - /// class that is empty, has the specified concurrency level, has the specified initial capacity, and - /// uses the specified . - /// - /// - /// The estimated number of threads that will update the - /// concurrently. - /// - /// - /// The initial number of elements that the - /// - /// can contain. - /// - /// - /// The - /// implementation to use when comparing items. - /// - /// - /// is less than 1. -or- - /// is less than 0. - /// - /// is a null reference. - public ConcurrentHashSet(int concurrencyLevel, int capacity, IEqualityComparer comparer) - : this(concurrencyLevel, capacity, false, comparer) - { - } - - private ConcurrentHashSet( - int concurrencyLevel, - int capacity, - bool growLockArray, - IEqualityComparer comparer) - { - if (concurrencyLevel < 1) - throw new ArgumentOutOfRangeException(nameof(concurrencyLevel)); - if (capacity < 0) - throw new ArgumentOutOfRangeException(nameof(capacity)); - - // The capacity should be at least as large as the concurrency level. Otherwise, we would have locks that don't guard - // any buckets. - if (capacity < concurrencyLevel) - capacity = concurrencyLevel; - - var locks = new object[concurrencyLevel]; - for (var i = 0; i < locks.Length; i++) - locks[i] = new(); - - var countPerLock = new int[locks.Length]; - var buckets = new Node[capacity]; - tables = new(buckets, locks, countPerLock); - - _growLockArray = growLockArray; - budget = buckets.Length / locks.Length; - _comparer = comparer ?? throw new ArgumentNullException(nameof(comparer)); - } - - /// - /// Removes all items from the . - /// - public void Clear() - { - var locksAcquired = 0; - try - { - AcquireAllLocks(ref locksAcquired); - - var newTables = new Tables(new Node[DEFAULT_CAPACITY], tables.Locks, new int[tables.CountPerLock.Length]); - tables = newTables; - budget = Math.Max(1, newTables.Buckets.Length / newTables.Locks.Length); - } - finally - { - ReleaseLocks(0, locksAcquired); - } - } - - /// - /// Determines whether the contains the specified - /// item. - /// - /// The item to locate in the . - /// true if the contains the item; otherwise, false. - public bool Contains(T item) - { - var hashcode = _comparer.GetHashCode(item!); - - // We must capture the _buckets field in a local variable. It is set to a new table on each table resize. - var localTables = tables; - - var bucketNo = GetBucket(hashcode, localTables.Buckets.Length); - - // We can get away w/out a lock here. - // The Volatile.Read ensures that the load of the fields of 'n' doesn't move before the load from buckets[i]. - var current = Volatile.Read(ref localTables.Buckets[bucketNo]); - - while (current is not null) - { - if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item)) - return true; - - current = current.Next; - } - - return false; - } - - void ICollection.Add(T item) - => Add(item); - - void ICollection.CopyTo(T[] array, int arrayIndex) - { - if (array is null) - throw new ArgumentNullException(nameof(array)); - if (arrayIndex < 0) - throw new ArgumentOutOfRangeException(nameof(arrayIndex)); - - var locksAcquired = 0; - try - { - AcquireAllLocks(ref locksAcquired); - - var count = 0; - - for (var i = 0; i < tables.Locks.Length && count >= 0; i++) - count += tables.CountPerLock[i]; - - if (array.Length - count < arrayIndex || count < 0) //"count" itself or "count + arrayIndex" can overflow - { - throw new ArgumentException( - "The index is equal to or greater than the length of the array, or the number of elements in the set is greater than the available space from index to the end of the destination array."); - } - - CopyToItems(array, arrayIndex); - } - finally - { - ReleaseLocks(0, locksAcquired); - } - } - - bool ICollection.Remove(T item) - => TryRemove(item); + public IEnumerator GetEnumerator() + => _backingStore.Keys.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - /// - /// Returns an enumerator that iterates through the - /// - /// . - /// - /// An enumerator for the . - /// - /// The enumerator returned from the collection is safe to use concurrently with - /// reads and writes to the collection, however it does not represent a moment-in-time snapshot - /// of the collection. The contents exposed through the enumerator may contain modifications - /// made to the collection after was called. - /// - public IEnumerator GetEnumerator() - { - var buckets = tables.Buckets; - - for (var i = 0; i < buckets.Length; i++) - { - // The Volatile.Read ensures that the load of the fields of 'current' doesn't move before the load from buckets[i]. - var current = Volatile.Read(ref buckets[i]); - - while (current is not null) - { - yield return current.Item; - current = current.Next; - } - } - } - /// /// Adds the specified item to the . /// @@ -447,375 +37,57 @@ public sealed class ConcurrentHashSet : IReadOnlyCollection, ICollection public bool Add(T item) - => AddInternal(item, _comparer.GetHashCode(item), true); + => _backingStore.TryAdd(item, true); + + void ICollection.Add(T item) + => Add(item); + + public void Clear() + => _backingStore.Clear(); + + public bool Contains(T item) + => _backingStore.ContainsKey(item); + + public void CopyTo(T[] array, int arrayIndex) + { + ArgumentNullException.ThrowIfNull(array); + + if (arrayIndex < 0) + throw new ArgumentOutOfRangeException(nameof(arrayIndex)); + + if (arrayIndex >= array.Length) + throw new ArgumentOutOfRangeException(nameof(arrayIndex)); + + CopyToInternal(array, arrayIndex); + } + + private void CopyToInternal(T[] array, int arrayIndex) + { + var len = array.Length; + foreach (var (k, _) in _backingStore) + { + if (arrayIndex >= len) + throw new IndexOutOfRangeException(nameof(arrayIndex)); + + array[arrayIndex++] = k; + } + } + + bool ICollection.Remove(T item) + => TryRemove(item); - /// - /// Attempts to remove the item from the . - /// - /// The item to remove. - /// true if an item was removed successfully; otherwise, false. public bool TryRemove(T item) + => _backingStore.TryRemove(item, out _); + + public void RemoveWhere(Func predicate) { - var hashcode = _comparer.GetHashCode(item); - while (true) - { - var localTables = tables; - - GetBucketAndLockNo(hashcode, - out var bucketNo, - out var lockNo, - localTables.Buckets.Length, - localTables.Locks.Length); - - lock (localTables.Locks[lockNo]) - { - // If the table just got resized, we may not be holding the right lock, and must retry. - // This should be a rare occurrence. - if (localTables != tables) - continue; - - Node previous = null; - for (var current = localTables.Buckets[bucketNo]; current is not null; current = current.Next) - { - Debug.Assert((previous is null && current == localTables.Buckets[bucketNo]) - || previous!.Next == current); - - if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item)) - { - if (previous is null) - Volatile.Write(ref localTables.Buckets[bucketNo], current.Next); - else - previous.Next = current.Next; - - localTables.CountPerLock[lockNo]--; - return true; - } - - previous = current; - } - } - - return false; - } + foreach (var elem in this.Where(predicate)) + TryRemove(elem); } - private void InitializeFromCollection(IEnumerable collection) - { - foreach (var item in collection) - AddInternal(item, _comparer.GetHashCode(item), false); + public int Count + => _backingStore.Count; - if (budget == 0) - budget = tables.Buckets.Length / tables.Locks.Length; - } - - private bool AddInternal(T item, int hashcode, bool acquireLock) - { - while (true) - { - var localTables = tables; - GetBucketAndLockNo(hashcode, - out var bucketNo, - out var lockNo, - localTables.Buckets.Length, - localTables.Locks.Length); - - var resizeDesired = false; - var lockTaken = false; - try - { - if (acquireLock) - Monitor.Enter(localTables.Locks[lockNo], ref lockTaken); - - // If the table just got resized, we may not be holding the right lock, and must retry. - // This should be a rare occurrence. - if (localTables != tables) - continue; - - // Try to find this item in the bucket - Node previous = null; - for (var current = localTables.Buckets[bucketNo]; current is not null; current = current.Next) - { - Debug.Assert((previous is null && current == localTables.Buckets[bucketNo]) - || previous!.Next == current); - if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item)) - return false; - - previous = current; - } - - // The item was not found in the bucket. Insert the new item. - Volatile.Write(ref localTables.Buckets[bucketNo], new(item, hashcode, localTables.Buckets[bucketNo])); - checked - { - localTables.CountPerLock[lockNo]++; - } - - // - // If the number of elements guarded by this lock has exceeded the budget, resize the bucket table. - // It is also possible that GrowTable will increase the budget but won't resize the bucket table. - // That happens if the bucket table is found to be poorly utilized due to a bad hash function. - // - if (localTables.CountPerLock[lockNo] > budget) - resizeDesired = true; - } - finally - { - if (lockTaken) - Monitor.Exit(localTables.Locks[lockNo]); - } - - // - // The fact that we got here means that we just performed an insertion. If necessary, we will grow the table. - // - // Concurrency notes: - // - Notice that we are not holding any locks at when calling GrowTable. This is necessary to prevent deadlocks. - // - As a result, it is possible that GrowTable will be called unnecessarily. But, GrowTable will obtain lock 0 - // and then verify that the table we passed to it as the argument is still the current table. - // - if (resizeDesired) - GrowTable(localTables); - - return true; - } - } - - private static int GetBucket(int hashcode, int bucketCount) - { - var bucketNo = (hashcode & 0x7fffffff) % bucketCount; - Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount); - return bucketNo; - } - - private static void GetBucketAndLockNo( - int hashcode, - out int bucketNo, - out int lockNo, - int bucketCount, - int lockCount) - { - bucketNo = (hashcode & 0x7fffffff) % bucketCount; - lockNo = bucketNo % lockCount; - - Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount); - Debug.Assert(lockNo >= 0 && lockNo < lockCount); - } - - private void GrowTable(Tables localTables) - { - const int maxArrayLength = 0X7FEFFFFF; - var locksAcquired = 0; - try - { - // The thread that first obtains _locks[0] will be the one doing the resize operation - AcquireLocks(0, 1, ref locksAcquired); - - // Make sure nobody resized the table while we were waiting for lock 0: - if (localTables != tables) - // We assume that since the table reference is different, it was already resized (or the budget - // was adjusted). If we ever decide to do table shrinking, or replace the table for other reasons, - // we will have to revisit this logic. - return; - - // Compute the (approx.) total size. Use an Int64 accumulation variable to avoid an overflow. - long approxCount = 0; - for (var i = 0; i < localTables.CountPerLock.Length; i++) - approxCount += localTables.CountPerLock[i]; - - // - // If the bucket array is too empty, double the budget instead of resizing the table - // - if (approxCount < localTables.Buckets.Length / 4) - { - budget = 2 * budget; - if (budget < 0) - budget = int.MaxValue; - - return; - } - - // Compute the new table size. We find the smallest integer larger than twice the previous table size, and not divisible by - // 2,3,5 or 7. We can consider a different table-sizing policy in the future. - var newLength = 0; - var maximizeTableSize = false; - try - { - checked - { - // Double the size of the buckets table and add one, so that we have an odd integer. - newLength = (localTables.Buckets.Length * 2) + 1; - - // Now, we only need to check odd integers, and find the first that is not divisible - // by 3, 5 or 7. - while (newLength % 3 == 0 || newLength % 5 == 0 || newLength % 7 == 0) - newLength += 2; - - Debug.Assert(newLength % 2 != 0); - - if (newLength > maxArrayLength) - maximizeTableSize = true; - } - } - catch (OverflowException) - { - maximizeTableSize = true; - } - - if (maximizeTableSize) - { - newLength = maxArrayLength; - - // We want to make sure that GrowTable will not be called again, since table is at the maximum size. - // To achieve that, we set the budget to int.MaxValue. - // - // (There is one special case that would allow GrowTable() to be called in the future: - // calling Clear() on the ConcurrentHashSet will shrink the table and lower the budget.) - budget = int.MaxValue; - } - - // Now acquire all other locks for the table - AcquireLocks(1, localTables.Locks.Length, ref locksAcquired); - - var newLocks = localTables.Locks; - - // Add more locks - if (_growLockArray && localTables.Locks.Length < MAX_LOCK_NUMBER) - { - newLocks = new object[localTables.Locks.Length * 2]; - Array.Copy(localTables.Locks, 0, newLocks, 0, localTables.Locks.Length); - for (var i = localTables.Locks.Length; i < newLocks.Length; i++) - newLocks[i] = new(); - } - - var newBuckets = new Node[newLength]; - var newCountPerLock = new int[newLocks.Length]; - - // Copy all data into a new table, creating new nodes for all elements - for (var i = 0; i < localTables.Buckets.Length; i++) - { - var current = localTables.Buckets[i]; - while (current is not null) - { - var next = current.Next; - GetBucketAndLockNo(current.Hashcode, - out var newBucketNo, - out var newLockNo, - newBuckets.Length, - newLocks.Length); - - newBuckets[newBucketNo] = new(current.Item, current.Hashcode, newBuckets[newBucketNo]); - - checked - { - newCountPerLock[newLockNo]++; - } - - current = next; - } - } - - // Adjust the budget - budget = Math.Max(1, newBuckets.Length / newLocks.Length); - - // Replace tables with the new versions - tables = new(newBuckets, newLocks, newCountPerLock); - } - finally - { - // Release all locks that we took earlier - ReleaseLocks(0, locksAcquired); - } - } - - public int RemoveWhere(Func predicate) - { - var elems = this.Where(predicate); - var removed = 0; - foreach (var elem in elems) - { - if (TryRemove(elem)) - removed++; - } - - return removed; - } - - private void AcquireAllLocks(ref int locksAcquired) - { - // First, acquire lock 0 - AcquireLocks(0, 1, ref locksAcquired); - - // Now that we have lock 0, the _locks array will not change (i.e., grow), - // and so we can safely read _locks.Length. - AcquireLocks(1, tables.Locks.Length, ref locksAcquired); - Debug.Assert(locksAcquired == tables.Locks.Length); - } - - private void AcquireLocks(int fromInclusive, int toExclusive, ref int locksAcquired) - { - Debug.Assert(fromInclusive <= toExclusive); - var locks = tables.Locks; - - for (var i = fromInclusive; i < toExclusive; i++) - { - var lockTaken = false; - try - { - Monitor.Enter(locks[i], ref lockTaken); - } - finally - { - if (lockTaken) - locksAcquired++; - } - } - } - - private void ReleaseLocks(int fromInclusive, int toExclusive) - { - Debug.Assert(fromInclusive <= toExclusive); - - for (var i = fromInclusive; i < toExclusive; i++) - Monitor.Exit(tables.Locks[i]); - } - - private void CopyToItems(T[] array, int index) - { - var buckets = tables.Buckets; - for (var i = 0; i < buckets.Length; i++) - for (var current = buckets[i]; current is not null; current = current.Next) - { - array[index] = current.Item; - index++; //this should never flow, CopyToItems is only called when there's no overflow risk - } - } - - private sealed class Tables - { - public readonly Node[] Buckets; - public readonly object[] Locks; - - public volatile int[] CountPerLock; - - public Tables(Node[] buckets, object[] locks, int[] countPerLock) - { - Buckets = buckets; - Locks = locks; - CountPerLock = countPerLock; - } - } - - private sealed class Node - { - public readonly int Hashcode; - public readonly T Item; - - public volatile Node Next; - - public Node(T item, int hashcode, Node next) - { - Item = item; - Hashcode = hashcode; - Next = next; - } - } + public bool IsReadOnly + => false; } \ No newline at end of file diff --git a/src/NadekoBot/GlobalUsings.cs b/src/NadekoBot/GlobalUsings.cs index 47f23928b..4f8beedac 100644 --- a/src/NadekoBot/GlobalUsings.cs +++ b/src/NadekoBot/GlobalUsings.cs @@ -1,4 +1,5 @@ -global using System.Collections.Concurrent; +// global using System.Collections.Concurrent; +global using NonBlocking; // packages global using Serilog; diff --git a/src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs b/src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs index 3c6f1caff..e4513f50a 100644 --- a/src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs +++ b/src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs @@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Administration.Services; public class VcRoleService : INService { public ConcurrentDictionary> VcRoles { get; } - public ConcurrentDictionary> ToAssign { get; } + public ConcurrentDictionary> ToAssign { get; } private readonly DbService _db; private readonly DiscordSocketClient _client; @@ -37,7 +37,7 @@ public class VcRoleService : INService { while (true) { - Task Selector(ConcurrentQueue<(bool, IGuildUser, IRole)> queue) + Task Selector(System.Collections.Concurrent.ConcurrentQueue<(bool, IGuildUser, IRole)> queue) { return Task.Run(async () => { @@ -203,7 +203,7 @@ public class VcRoleService : INService private void Assign(bool v, SocketGuildUser gusr, IRole role) { - var queue = ToAssign.GetOrAdd(gusr.Guild.Id, new ConcurrentQueue<(bool, IGuildUser, IRole)>()); + var queue = ToAssign.GetOrAdd(gusr.Guild.Id, new System.Collections.Concurrent.ConcurrentQueue<(bool, IGuildUser, IRole)>()); queue.Enqueue((v, gusr, role)); } } \ No newline at end of file diff --git a/src/NadekoBot/Modules/Gambling/Events/GameStatusEvent.cs b/src/NadekoBot/Modules/Gambling/Events/GameStatusEvent.cs index 730357d82..9e9142a2b 100644 --- a/src/NadekoBot/Modules/Gambling/Events/GameStatusEvent.cs +++ b/src/NadekoBot/Modules/Gambling/Events/GameStatusEvent.cs @@ -1,5 +1,6 @@ #nullable disable using NadekoBot.Services.Database.Models; +using System.Collections.Concurrent; namespace NadekoBot.Modules.Gambling.Common.Events; diff --git a/src/NadekoBot/Modules/Gambling/Events/ReactionEvent.cs b/src/NadekoBot/Modules/Gambling/Events/ReactionEvent.cs index bececebda..dfb13934e 100644 --- a/src/NadekoBot/Modules/Gambling/Events/ReactionEvent.cs +++ b/src/NadekoBot/Modules/Gambling/Events/ReactionEvent.cs @@ -20,7 +20,7 @@ public class ReactionEvent : ICurrencyEvent private readonly bool _isPotLimited; private readonly ITextChannel _channel; private readonly ConcurrentHashSet _awardedUsers = new(); - private readonly ConcurrentQueue _toAward = new(); + private readonly System.Collections.Concurrent.ConcurrentQueue _toAward = new(); private readonly Timer _t; private readonly Timer _timeout; private readonly bool _noRecentlyJoinedServer; diff --git a/src/NadekoBot/Modules/Xp/XpService.cs b/src/NadekoBot/Modules/Xp/XpService.cs index 58b38125e..fe0af4f05 100644 --- a/src/NadekoBot/Modules/Xp/XpService.cs +++ b/src/NadekoBot/Modules/Xp/XpService.cs @@ -37,7 +37,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand private readonly ConcurrentDictionary> _excludedChannels; private readonly ConcurrentHashSet _excludedServers; - private readonly ConcurrentQueue _addMessageXp = new(); + private readonly System.Collections.Concurrent.ConcurrentQueue _addMessageXp = new(); private XpTemplate template; private readonly DiscordSocketClient _client;