Skip to content

THRIFT-5422 add threadpool server to netstd test suite impl #2398

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

Closed
Jens-G wants to merge 1 commit into from
Closed

THRIFT-5422 add threadpool server to netstd test suite impl #2398

Show file tree
Hide file tree
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
12 changes: 7 additions & 5 deletions lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;

#pragma warning disable IDE0079 // remove unnecessary pragmas
#pragma warning disable IDE0063 // using can be simplified, we don't

namespace Thrift.Server
{
/// <summary>
Expand Down Expand Up @@ -125,8 +128,7 @@ public TThreadPoolAsyncServer(ITProcessorFactory processorFactory,
{
if ((threadConfig.MaxWorkerThreads > 0) || (threadConfig.MaxIOThreads > 0))
{
int work, comm;
ThreadPool.GetMaxThreads(out work, out comm);
ThreadPool.GetMaxThreads(out int work, out int comm);
if (threadConfig.MaxWorkerThreads > 0)
work = threadConfig.MaxWorkerThreads;
if (threadConfig.MaxIOThreads > 0)
Expand All @@ -137,8 +139,7 @@ public TThreadPoolAsyncServer(ITProcessorFactory processorFactory,

if ((threadConfig.MinWorkerThreads > 0) || (threadConfig.MinIOThreads > 0))
{
int work, comm;
ThreadPool.GetMinThreads(out work, out comm);
ThreadPool.GetMinThreads(out int work, out int comm);
if (threadConfig.MinWorkerThreads > 0)
work = threadConfig.MinWorkerThreads;
if (threadConfig.MinIOThreads > 0)
Expand Down Expand Up @@ -209,7 +210,7 @@ public override async Task ServeAsync(CancellationToken cancellationToken)
}
finally
{
ServerCancellationToken = default(CancellationToken);
ServerCancellationToken = default;
}
}

Expand Down Expand Up @@ -255,6 +256,7 @@ private void Execute(object threadContext)
//actually arriving or the client may hang up without ever makeing a request.
if (ServerEventHandler != null)
ServerEventHandler.ProcessContextAsync(connectionContext, inputTransport, cancellationToken).Wait();

//Process client request (blocks until transport is readable)
if (!processor.ProcessAsync(inputProtocol, outputProtocol, cancellationToken).Result)
break;
Expand Down
29 changes: 24 additions & 5 deletions test/netstd/Server/TestServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,19 @@ internal enum BufferChoice
Framed
}

internal enum ServerChoice
{
Simple,
ThreadPool
}


internal class ServerParam
{
internal BufferChoice buffering = BufferChoice.None;
internal ProtocolChoice protocol = ProtocolChoice.Binary;
internal TransportChoice transport = TransportChoice.Socket;
internal ServerChoice server = ServerChoice.Simple;
internal int port = 9090;
internal string pipe = null;

Expand Down Expand Up @@ -103,13 +111,17 @@ internal void Parse(List<string> args)
{
protocol = ProtocolChoice.Json;
}
else if (args[i] == "--server-type=simple")
{
server = ServerChoice.Simple;
}
else if (args[i] == "--threaded" || args[i] == "--server-type=threaded")
{
throw new NotImplementedException(args[i]);
}
else if (args[i] == "--threadpool" || args[i] == "--server-type=threadpool")
{
throw new NotImplementedException(args[i]);
server = ServerChoice.ThreadPool;
}
else if (args[i] == "--prototype" || args[i] == "--processor=prototype")
{
Expand Down Expand Up @@ -613,16 +625,23 @@ public static int Execute(List<string> args)
var testProcessor = new ThriftTest.AsyncProcessor(testHandler);
var processorFactory = new TSingletonProcessorFactory(testProcessor);

TServer serverEngine = new TSimpleAsyncServer(processorFactory, trans, transFactory, transFactory, proto, proto, logger);
var poolconfig = new TThreadPoolAsyncServer.Configuration(); // use platform defaults
TServer serverEngine = param.server switch
{
ServerChoice.Simple => new TSimpleAsyncServer(processorFactory, trans, transFactory, transFactory, proto, proto, logger),
ServerChoice.ThreadPool => new TThreadPoolAsyncServer(processorFactory, trans, transFactory, transFactory, proto, proto, poolconfig, logger),
_ => new TSimpleAsyncServer(processorFactory, trans, transFactory, transFactory, proto, proto, logger)
};

//Server event handler
var serverEvents = new MyServerEventHandler();
serverEngine.SetEventHandler(serverEvents);

// Run it
var where = (!string.IsNullOrEmpty(param.pipe)) ? "on pipe " + param.pipe : "on port " + param.port;
Console.WriteLine("Starting the AsyncBaseServer " + where +
" with processor TPrototypeProcessorFactory prototype factory " +
var where = (!string.IsNullOrEmpty(param.pipe)) ? "pipe " + param.pipe : "port " + param.port;
Console.WriteLine("Running "+ serverEngine.GetType().Name +
" at "+ where +
" using "+ processorFactory.GetType().Name + " processor prototype factory " +
(param.buffering == BufferChoice.Buffered ? " with buffered transport" : "") +
(param.buffering == BufferChoice.Framed ? " with framed transport" : "") +
(param.transport == TransportChoice.TlsSocket ? " with encryption" : "") +
Expand Down