3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-08-01 15:49:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

Auto detect number of threads to use

Browse source 
use min 2 threads, max 4, depending on the number of hardware threads
This commit is contained in:
badaix 2019-11-25 23:54:00 +01:00
parent b6a4ffa758
commit b00ee4aaf8
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/snapserver.cpp
View file

@ -80,8 +80,8 @@ int main(int argc, char* argv[])
auto streamValue = conf.add<Value<string>>( auto streamValue = conf.add<Value<string>>(
"s", "stream.stream", "URI of the PCM input stream.\nFormat: TYPE://host/path?name=NAME\n[&codec=CODEC]\n[&sampleformat=SAMPLEFORMAT]", pcmStream, "s", "stream.stream", "URI of the PCM input stream.\nFormat: TYPE://host/path?name=NAME\n[&codec=CODEC]\n[&sampleformat=SAMPLEFORMAT]", pcmStream,
&pcmStream); &pcmStream);
size_t num_threads = 2; int num_threads = -1;
conf.add<Value<size_t>>("", "server.threads", "number of server threads", num_threads, &num_threads); conf.add<Value<int>>("", "server.threads", "number of server threads", num_threads, &num_threads);
conf.add<Value<string>>("", "stream.sampleformat", "Default sample format", settings.stream.sampleFormat, &settings.stream.sampleFormat); conf.add<Value<string>>("", "stream.sampleformat", "Default sample format", settings.stream.sampleFormat, &settings.stream.sampleFormat);
conf.add<Value<string>>("c", "stream.codec", "Default transport codec\n(flac|ogg|opus|pcm)[:options]\nType codec:? to get codec specific options", conf.add<Value<string>>("c", "stream.codec", "Default transport codec\n(flac|ogg|opus|pcm)[:options]\nType codec:? to get codec specific options",
@ -267,9 +267,11 @@ int main(int argc, char* argv[])
std::unique_ptr<StreamServer> streamServer(new StreamServer(io_context, settings)); std::unique_ptr<StreamServer> streamServer(new StreamServer(io_context, settings));
streamServer->start(); streamServer->start();
LOG(DEBUG) << "number of threads: " << num_threads << ", hw threads: " << std::thread::hardware_concurrency() << "\n"; if (num_threads <= 0)
num_threads = std::max(2, std::min(4, static_cast<int>(std::thread::hardware_concurrency())));
LOG(INFO) << "number of threads: " << num_threads << ", hw threads: " << std::thread::hardware_concurrency() << "\n";
std::vector<std::thread> threads; std::vector<std::thread> threads;
for (size_t n = 0; n < num_threads; ++n) for (int n = 0; n < num_threads; ++n)
threads.emplace_back([&] { io_context.run(); }); threads.emplace_back([&] { io_context.run(); });
auto sig = install_signal_handler({SIGHUP, SIGTERM, SIGINT}).get(); auto sig = install_signal_handler({SIGHUP, SIGTERM, SIGINT}).get();