3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-22 13:36:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

configurable process priority

Browse source
This commit is contained in:
badaix 2015-07-30 19:51:07 +02:00
parent 389bc92b2f
commit 83d7ca8856
2 changed files with 107 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/snapClient.cpp
View file

@ -61,12 +61,14 @@ PcmDevice getPcmDevice(const std::string& soundcard)
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
try
{
string soundcard; string soundcard;
string ip; string ip;
// int bufferMs; // int bufferMs;
size_t port; size_t port;
size_t latency; size_t latency;
bool runAsDaemon; int runAsDaemon;
bool listPcmDevices; bool listPcmDevices;
po::options_description desc("Allowed options"); po::options_description desc("Allowed options");
@ -77,8 +79,8 @@ int main (int argc, char *argv[])
("ip,i", po::value<string>(&ip), "server IP") ("ip,i", po::value<string>(&ip), "server IP")
("port,p", po::value<size_t>(&port)->default_value(98765), "server port") ("port,p", po::value<size_t>(&port)->default_value(98765), "server port")
("soundcard,s", po::value<string>(&soundcard)->default_value("default"), "index or name of the soundcard") ("soundcard,s", po::value<string>(&soundcard)->default_value("default"), "index or name of the soundcard")
("daemon,d", po::bool_switch(&runAsDaemon)->default_value(false), "daemonize") ("daemon,d", po::value<int>(&runAsDaemon)->implicit_value(-5), "daemonize, optional process priority [-20..19]")
("latency", po::value<size_t>(&latency)->default_value(0), "latency") ("latency", po::value<size_t>(&latency)->default_value(0), "latency of the soundcard")
; ;
po::variables_map vm; po::variables_map vm;
@ -119,10 +121,14 @@ int main (int argc, char *argv[])
signal(SIGTERM, signal_handler); signal(SIGTERM, signal_handler);
signal(SIGINT, signal_handler); signal(SIGINT, signal_handler);
if (runAsDaemon) if (vm.count("daemon"))
{ {
daemonize("/var/run/snapclient.pid"); daemonize("/var/run/snapclient.pid");
setpriority(PRIO_PROCESS, 0, -5); if (runAsDaemon < -20)
runAsDaemon = -20;
else if (runAsDaemon > 19)
runAsDaemon = 10;
setpriority(PRIO_PROCESS, 0, runAsDaemon);
logS(kLogNotice) << "daemon started" << std::endl; logS(kLogNotice) << "daemon started" << std::endl;
} }
@ -157,8 +163,14 @@ int main (int argc, char *argv[])
usleep(100*1000); usleep(100*1000);
controller.stop(); controller.stop();
} }
daemonShutdown(); }
catch (const std::exception& e)
{
logS(kLogErr) << "Exception: " << e.what() << std::endl;
}
logS(kLogNotice) << "daemon terminated." << endl;
daemonShutdown();
return 0; return 0;
} }

15
server/snapServer.cpp
View file

@ -47,7 +47,7 @@ int main(int argc, char* argv[])
try try
{ {
ControlServerSettings settings; ControlServerSettings settings;
bool runAsDaemon; int runAsDaemon;
string sampleFormat; string sampleFormat;
po::options_description desc("Allowed options"); po::options_description desc("Allowed options");
@ -58,7 +58,7 @@ int main(int argc, char* argv[])
("sampleformat,s", po::value<string>(&sampleFormat)->default_value("44100:16:2"), "sample format") ("sampleformat,s", po::value<string>(&sampleFormat)->default_value("44100:16:2"), "sample format")
("codec,c", po::value<string>(&settings.codec)->default_value("flac"), "transport codec [flac|ogg|pcm][:options]. Type codec:? to get codec specific options") ("codec,c", po::value<string>(&settings.codec)->default_value("flac"), "transport codec [flac|ogg|pcm][:options]. Type codec:? to get codec specific options")
("fifo,f", po::value<string>(&settings.fifoName)->default_value("/tmp/snapfifo"), "name of the input fifo file") ("fifo,f", po::value<string>(&settings.fifoName)->default_value("/tmp/snapfifo"), "name of the input fifo file")
("daemon,d", po::bool_switch(&runAsDaemon)->default_value(false), "daemonize") ("daemon,d", po::value<int>(&runAsDaemon)->implicit_value(-5), "daemonize, optional process priority [-20..19]")
("buffer,b", po::value<int32_t>(&settings.bufferMs)->default_value(1000), "buffer [ms]") ("buffer,b", po::value<int32_t>(&settings.bufferMs)->default_value(1000), "buffer [ms]")
; ;
@ -102,10 +102,14 @@ int main(int argc, char* argv[])
signal(SIGTERM, signal_handler); signal(SIGTERM, signal_handler);
signal(SIGINT, signal_handler); signal(SIGINT, signal_handler);
if (runAsDaemon) if (vm.count("daemon"))
{ {
daemonize("/var/run/snapserver.pid"); daemonize("/var/run/snapserver.pid");
setpriority(PRIO_PROCESS, 0, -5); if (runAsDaemon < -20)
runAsDaemon = -20;
else if (runAsDaemon > 19)
runAsDaemon = 10;
setpriority(PRIO_PROCESS, 0, runAsDaemon);
logS(kLogNotice) << "daemon started." << endl; logS(kLogNotice) << "daemon started." << endl;
} }
@ -114,6 +118,8 @@ int main(int argc, char* argv[])
services.push_back(AvahiService("_snapcast._tcp", settings.port)); services.push_back(AvahiService("_snapcast._tcp", settings.port));
publishAvahi.publish(services); publishAvahi.publish(services);
if (settings.bufferMs < 400)
settings.bufferMs = 400;
settings.sampleFormat = sampleFormat; settings.sampleFormat = sampleFormat;
ControlServer* controlServer = new ControlServer(settings); ControlServer* controlServer = new ControlServer(settings);
controlServer->start(); controlServer->start();
@ -128,6 +134,7 @@ int main(int argc, char* argv[])
logS(kLogNotice) << "daemon terminated." << endl; logS(kLogNotice) << "daemon terminated." << endl;
daemonShutdown(); daemonShutdown();
return 0;
} }