Skip to content

Always run inline for socket callbacks #44465

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
davidfowl merged 1 commit into from
Oct 11, 2022
Merged

Always run inline for socket callbacks #44465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 2 additions & 12 deletions src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ public SocketConnectionContextFactory(SocketConnectionFactoryOptions options, IL
var maxWriteBufferSize = _options.MaxWriteBufferSize ?? 0;
var applicationScheduler = options.UnsafePreferInlineScheduling ? PipeScheduler.Inline : PipeScheduler.ThreadPool;

// Socket callbacks run on the threads polling for IO if we're using the old Windows thread pool
var dispatchSocketCallbacks = OperatingSystem.IsWindows() &&
(Environment.GetEnvironmentVariable("DOTNET_ThreadPool_UsePortableThreadPoolForIO") == "0" ||
Environment.GetEnvironmentVariable("COMPlus_ThreadPool_UsePortableThreadPoolForIO") == "0");

PipeScheduler SelectSocketsScheduler(PipeScheduler dispatchingScheduler) =>
dispatchSocketCallbacks ? dispatchingScheduler : PipeScheduler.Inline;

if (_settingsCount > 0)
{
_settings = new QueueSettings[_settingsCount];
Expand All @@ -58,14 +50,13 @@ PipeScheduler SelectSocketsScheduler(PipeScheduler dispatchingScheduler) =>
{
var memoryPool = _options.MemoryPoolFactory();
var transportScheduler = options.UnsafePreferInlineScheduling ? PipeScheduler.Inline : new IOQueue();
var socketsScheduler = SelectSocketsScheduler(transportScheduler);

_settings[i] = new QueueSettings()
{
Scheduler = transportScheduler,
InputOptions = new PipeOptions(memoryPool, applicationScheduler, transportScheduler, maxReadBufferSize, maxReadBufferSize / 2, useSynchronizationContext: false),
OutputOptions = new PipeOptions(memoryPool, transportScheduler, applicationScheduler, maxWriteBufferSize, maxWriteBufferSize / 2, useSynchronizationContext: false),
SocketSenderPool = new SocketSenderPool(socketsScheduler),
SocketSenderPool = new SocketSenderPool(PipeScheduler.Inline),
MemoryPool = memoryPool,
};
}
Expand All @@ -74,7 +65,6 @@ PipeScheduler SelectSocketsScheduler(PipeScheduler dispatchingScheduler) =>
{
var memoryPool = _options.MemoryPoolFactory();
var transportScheduler = options.UnsafePreferInlineScheduling ? PipeScheduler.Inline : PipeScheduler.ThreadPool;
var socketsScheduler = SelectSocketsScheduler(transportScheduler);

_settings = new QueueSettings[]
{
Expand All @@ -83,7 +73,7 @@ PipeScheduler SelectSocketsScheduler(PipeScheduler dispatchingScheduler) =>
Scheduler = transportScheduler,
InputOptions = new PipeOptions(memoryPool, applicationScheduler, transportScheduler, maxReadBufferSize, maxReadBufferSize / 2, useSynchronizationContext: false),
OutputOptions = new PipeOptions(memoryPool, transportScheduler, applicationScheduler, maxWriteBufferSize, maxWriteBufferSize / 2, useSynchronizationContext: false),
SocketSenderPool = new SocketSenderPool(socketsScheduler),
SocketSenderPool = new SocketSenderPool(PipeScheduler.Inline),
MemoryPool = memoryPool,
}
};
Expand Down