diff options
author | vnugent <public@vaughnnugent.com> | 2024-02-14 14:10:27 -0500 |
---|---|---|
committer | vnugent <public@vaughnnugent.com> | 2024-02-14 14:10:27 -0500 |
commit | 2b1314c1475e7e1831c691cf349cb89c66fa320c (patch) | |
tree | 091fc132a2bee2e79a68d8c6d5eb20f1d989a3d2 /lib/Net.Messaging.FBM/src/Server | |
parent | f4e4db7c5320976406feb252ae8f8bdbe9b3e351 (diff) |
Squashed commit of the following:
commit ddd8a651b6eb43cfdd49d84056f8b9c34b543992
Author: vnugent <public@vaughnnugent.com>
Date: Wed Feb 14 00:15:50 2024 -0500
ci: reduce output noise and update Argon2 build
commit cf942959ff2feea03d3eda2ff2a263bdac4d6bc6
Author: vnugent <public@vaughnnugent.com>
Date: Mon Feb 12 18:39:18 2024 -0500
chore: update packages and minor fixes
commit ab506af9e2de2876b11bb45b3c7e787616c80155
Author: vnugent <public@vaughnnugent.com>
Date: Fri Feb 9 21:27:24 2024 -0500
fix: patch and update core runtime service injection
commit 7ed5e8b19164c28d3a238bd56878d2161fbea2e4
Author: vnugent <public@vaughnnugent.com>
Date: Thu Feb 8 18:26:11 2024 -0500
fork dotnetplugins and make some intial updates/upgrades
commit f4cab88d67be5da0953b14bd46fc972d4acc8606
Author: vnugent <public@vaughnnugent.com>
Date: Thu Feb 8 12:16:13 2024 -0500
update some heap api functions
commit 6035bf7ed8412f1da361cc5feddd860abfaf4fc1
Author: vnugent <public@vaughnnugent.com>
Date: Wed Feb 7 22:09:11 2024 -0500
working file-watcher notifications/rework
commit 698f8edf694ad9700ee2ce2220e692b496448ff9
Author: vnugent <public@vaughnnugent.com>
Date: Wed Feb 7 20:37:28 2024 -0500
remove mem-template and add file-watcher utility
commit b17591e0fb363222fcd7d93c2bad4ab1b102385f
Author: vnugent <public@vaughnnugent.com>
Date: Wed Feb 7 18:28:21 2024 -0500
add small memmove support for known small blocks
commit 631be4d4b27fdbcd4b0526e17a128bb0d86911eb
Author: vnugent <public@vaughnnugent.com>
Date: Wed Feb 7 18:08:02 2024 -0500
setup some readonly ref arguments and convert copy apis to readonly refs
commit 2ba8dec68d5cb192e61ad0141d4b460076d3f90a
Author: vnugent <public@vaughnnugent.com>
Date: Mon Feb 5 18:30:38 2024 -0500
restructure internal memmove strategies
commit 25cf02872da980893ad7fb51d4eccc932380582b
Author: vnugent <public@vaughnnugent.com>
Date: Sun Feb 4 01:29:18 2024 -0500
add http stream interface, profiling -> file read updates
commit 757668c44e78864dc69d5713a2cfba6db2ed9a2a
Author: vnugent <public@vaughnnugent.com>
Date: Fri Feb 2 14:27:04 2024 -0500
streamline data-copy api with proper large block support and net8 feature updates
commit f22c1765fd72ab40a10d8ec92a8cb6d9ec1b1a04
Author: vnugent <public@vaughnnugent.com>
Date: Mon Jan 29 16:16:23 2024 -0500
check for compression lib updates to close #2 and fix some ci build stuff
commit f974bfdef6a795b4a1c04602502ef506ef2587a9
Author: vnugent <public@vaughnnugent.com>
Date: Tue Jan 23 17:36:17 2024 -0500
switch allocator libs to lgpl2.1
commit 1fe5e01b329cd27b675000f1a557b784d3c88b56
Author: vnugent <public@vaughnnugent.com>
Date: Tue Jan 23 17:05:59 2024 -0500
consolidate allocator packages and close #1
commit 74e1107e522f00b670526193396217f40a6bade7
Author: vnugent <public@vaughnnugent.com>
Date: Tue Jan 23 15:43:40 2024 -0500
cache extension api tweaks
commit 96ca2b0388a6326b9bb74f3ab2f62eaede6681e0
Author: vnugent <public@vaughnnugent.com>
Date: Mon Jan 22 17:54:23 2024 -0500
explicit tcp server args reuse
Diffstat (limited to 'lib/Net.Messaging.FBM/src/Server')
-rw-r--r-- | lib/Net.Messaging.FBM/src/Server/FBMListener.cs | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/lib/Net.Messaging.FBM/src/Server/FBMListener.cs b/lib/Net.Messaging.FBM/src/Server/FBMListener.cs index 30fa1ac..c248f9b 100644 --- a/lib/Net.Messaging.FBM/src/Server/FBMListener.cs +++ b/lib/Net.Messaging.FBM/src/Server/FBMListener.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: VNLib.Net.Messaging.FBM @@ -41,20 +41,18 @@ namespace VNLib.Net.Messaging.FBM.Server /// A FBM protocol listener. Listens for messages on a <see cref="WebSocketSession"/> /// and raises events on requests. /// </summary> - public class FBMListener + /// <remarks> + /// Creates a new <see cref="FBMListener"/> instance ready for + /// processing connections + /// </remarks> + /// <param name="heap">The heap to alloc buffers from</param> + /// <exception cref="ArgumentNullException"></exception> + public class FBMListener(IFBMMemoryManager heap) { public const int SEND_SEMAPHORE_TIMEOUT_MS = 10 * 1000; - private readonly IFBMMemoryManager MemoryManger; - - /// <summary> - /// Creates a new <see cref="FBMListener"/> instance ready for - /// processing connections - /// </summary> - /// <param name="heap">The heap to alloc buffers from</param> - /// <exception cref="ArgumentNullException"></exception> - public FBMListener(IFBMMemoryManager heap) => MemoryManger = heap ?? throw new ArgumentNullException(nameof(heap)); + private readonly IFBMMemoryManager MemoryManger = heap ?? throw new ArgumentNullException(nameof(heap)); #pragma warning disable CA2007 // Consider calling ConfigureAwait on the awaited task @@ -68,8 +66,8 @@ namespace VNLib.Net.Messaging.FBM.Server /// <returns>A <see cref="Task"/> that completes when the connection closes</returns> public async Task ListenAsync(WebSocketSession wss, IFBMServerMessageHandler handler, FBMListenerSessionParams args) { - _ = wss ?? throw new ArgumentNullException(nameof(wss)); - _ = handler ?? throw new ArgumentNullException(nameof(handler)); + ArgumentNullException.ThrowIfNull(wss); + ArgumentNullException.ThrowIfNull(handler); ListeningSession session = new(wss, handler, in args, MemoryManger); @@ -79,7 +77,9 @@ namespace VNLib.Net.Messaging.FBM.Server //Start a task to process the queue Task queueWorker = QueueWorkerDoWork(workQueue, session); - //Alloc buffer + /* + * Alloc a top level receive buffer directly from the memory manager + */ IFBMMemoryHandle memHandle = MemoryManger.InitHandle(); MemoryManger.AllocBuffer(memHandle, args.RecvBufferSize); @@ -232,7 +232,7 @@ namespace VNLib.Net.Messaging.FBM.Server * WARNING! * this code relies on the managed websocket impl that the websocket will read * the entire buffer before returning. If this is not the case, this code will - * overwrite the memory buffer on the next call to move next. + * overwrite the memory buffer on the next call to MoveNext(). */ //Move to next segment @@ -316,10 +316,12 @@ namespace VNLib.Net.Messaging.FBM.Server Cancellation.Cancel(); //If dispose happens without any outstanding requests, we can dispose the session - if (_counter == 0) + if (_pendingRequests == 0) { CleanupInternal(); } + + //Internal data cannot be cleaned, because requests are still outstanding, fallback to reference counting } private void CleanupInternal() @@ -331,7 +333,7 @@ namespace VNLib.Net.Messaging.FBM.Server } - private uint _counter; + private uint _pendingRequests; /// <summary> /// Rents a new <see cref="FBMContext"/> instance from the pool @@ -341,15 +343,12 @@ namespace VNLib.Net.Messaging.FBM.Server /// <exception cref="ObjectDisposedException"></exception> public FBMContext RentContext() { - if (Cancellation.IsCancellationRequested) - { - throw new ObjectDisposedException("The instance has been disposed"); - } + ObjectDisposedException.ThrowIf(Cancellation.IsCancellationRequested, this); //Rent context FBMContext ctx = CtxStore.Rent(); - //Increment counter - Interlocked.Increment(ref _counter); + //Increment reference count counter + Interlocked.Increment(ref _pendingRequests); return ctx; } @@ -365,7 +364,7 @@ namespace VNLib.Net.Messaging.FBM.Server //Return the context CtxStore.Return(ctx); - uint current = Interlocked.Decrement(ref _counter); + uint current = Interlocked.Decrement(ref _pendingRequests); //No more contexts in use, dispose internals if (Cancellation.IsCancellationRequested && current == 0) |