--- linuxsampler/trunk/src/linuxsampler.cpp 2005/02/07 00:19:30 360 +++ linuxsampler/trunk/src/linuxsampler.cpp 2005/12/22 19:29:52 816 @@ -3,6 +3,7 @@ * LinuxSampler - modular, streaming capable sampler * * * * Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck * + * Copyright (C) 2005 Christian Schoenebeck * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -24,6 +25,7 @@ #include #include "Sampler.h" +#include "engines/EngineFactory.h" #include "drivers/midi/MidiInputDeviceFactory.h" #include "drivers/audio/AudioOutputDeviceFactory.h" #include "engines/gig/Profiler.h" @@ -36,8 +38,12 @@ Sampler* pSampler = NULL; LSCPServer* pLSCPServer = NULL; pthread_t main_thread; +pid_t main_pid; +bool bPrintStatistics = false; bool profile = false; bool tune = true; +unsigned long int lscp_addr; +unsigned short int lscp_port; void parse_options(int argc, char **argv); void signal_handler(int signal); @@ -48,8 +54,11 @@ // initialize the stack trace mechanism with our binary file StackTraceInit(argv[0], -1); + main_pid = getpid(); main_thread = pthread_self(); + + // setting signal handler for catching SIGINT (thus e.g. ) signal(SIGINT, signal_handler); @@ -66,23 +75,22 @@ sigaction(SIGUSR1, &sact, NULL); sigaction(SIGUSR2, &sact, NULL); + lscp_addr = htonl(LSCP_ADDR); + lscp_port = htons(LSCP_PORT); + // parse and assign command line options parse_options(argc, argv); dmsg(1,("LinuxSampler %s\n", VERSION)); dmsg(1,("Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck\n")); + dmsg(1,("Copyright (C) 2005 Christian Schoenebeck\n")); - if (tune) - { - // detect and print system / CPU specific features - String sFeatures; - Features::detect(); -#if ARCH_X86 - if (Features::supportsMMX()) sFeatures += " MMX"; - if (Features::supportsSSE()) sFeatures += " SSE"; -#endif // ARCH_X86 - if (!sFeatures.size()) sFeatures = " None"; - dmsg(1,("Detected features:%s\n",sFeatures.c_str())); + if (tune) { + // detect and print system / CPU specific features + Features::detect(); + dmsg(1,("Detected features: %s\n", Features::featuresAsString().c_str())); + // prevent slow denormal FPU modes + Features::enableDenormalsAreZeroMode(); } // create LinuxSampler instance @@ -94,59 +102,74 @@ dmsg(1,("Registered audio output drivers: %s\n", AudioOutputDeviceFactory::AvailableDriversAsString().c_str())); // start LSCP network server - dmsg(1,("Starting LSCP network server (on TCP port %d)...", LSCP_PORT)); - pLSCPServer = new LSCPServer(pSampler); + struct in_addr addr; + addr.s_addr = lscp_addr; + dmsg(1,("Starting LSCP network server (%s:%d)...", inet_ntoa(addr), ntohs(lscp_port))); + pLSCPServer = new LSCPServer(pSampler, lscp_addr, lscp_port); pLSCPServer->StartThread(); pLSCPServer->WaitUntilInitialized(); dmsg(1,("OK\n")); if (profile) { - dmsg(1,("Calibrating profiler...")); - gig::Profiler::Calibrate(); - gig::Profiler::Reset(); - dmsg(1,("OK\n")); + dmsg(1,("Calibrating profiler...")); + gig::Profiler::Calibrate(); + gig::Profiler::Reset(); + gig::Profiler::enable(); + dmsg(1,("OK\n")); } - printf("LinuxSampler initialization completed.\n"); + printf("LinuxSampler initialization completed. :-)\n\n"); std::list rtEvents; rtEvents.push_back(LSCPEvent::event_voice_count); rtEvents.push_back(LSCPEvent::event_stream_count); rtEvents.push_back(LSCPEvent::event_buffer_fill); + rtEvents.push_back(LSCPEvent::event_total_voice_count); + + while (true) { + if (bPrintStatistics) { + std::set engines = EngineFactory::EngineInstances(); + std::set::iterator itEngine = engines.begin(); + for (int i = 0; itEngine != engines.end(); itEngine++, i++) { + Engine* pEngine = *itEngine; + printf("Engine %d) Voices: %3.3d (Max: %3.3d) Streams: %3.3d (Max: %3.3d)\n", i, + pEngine->VoiceCount(), pEngine->VoiceCountMax(), + pEngine->DiskStreamCount(), pEngine->DiskStreamCountMax() + ); + fflush(stdout); + } + } - while(true) - { - /*printf("Voices: %3.3d (Max: %3.3d) Streams: %3.3d (Max: %3.3d, Unused: %3.3d)\r", - pEngine->ActiveVoiceCount, pEngine->ActiveVoiceCountMax, - pEngine->pDiskThread->ActiveStreamCount, pEngine->pDiskThread->ActiveStreamCountMax, Stream::GetUnusedStreams()); - fflush(stdout);*/ sleep(1); if (profile) { - unsigned int samplingFreq = 48000; //FIXME: hardcoded for now - unsigned int bv = gig::Profiler::GetBogoVoices(samplingFreq); - if (bv != 0) - { - printf(" BogoVoices: %i \r", bv); - fflush(stdout); - } + unsigned int samplingFreq = 48000; //FIXME: hardcoded for now + unsigned int bv = gig::Profiler::GetBogoVoices(samplingFreq); + if (bv != 0) + { + printf(" BogoVoices: %i \r", bv); + fflush(stdout); + } } - + if (LSCPServer::EventSubscribers(rtEvents)) { - LSCPServer::LockRTNotify(); - std::map channels = pSampler->GetSamplerChannels(); - std::map::iterator iter = channels.begin(); - for (; iter != channels.end(); iter++) { - SamplerChannel* pSamplerChannel = iter->second; - Engine* pEngine = pSamplerChannel->GetEngine(); - if (!pEngine) continue; - LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_voice_count, iter->first, pEngine->VoiceCount())); - LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_stream_count, iter->first, pEngine->DiskStreamCount())); - LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_buffer_fill, iter->first, pEngine->DiskStreamBufferFillPercentage())); - } - LSCPServer::UnlockRTNotify(); + LSCPServer::LockRTNotify(); + std::map channels = pSampler->GetSamplerChannels(); + std::map::iterator iter = channels.begin(); + for (; iter != channels.end(); iter++) { + SamplerChannel* pSamplerChannel = iter->second; + EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel(); + if (!pEngineChannel) continue; + Engine* pEngine = pEngineChannel->GetEngine(); + if (!pEngine) continue; + LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_voice_count, iter->first, pEngine->VoiceCount())); + LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_stream_count, iter->first, pEngine->DiskStreamCount())); + LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_buffer_fill, iter->first, pEngine->DiskStreamBufferFillPercentage())); + LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_total_voice_count, pSampler->GetVoiceCount())); + } + LSCPServer::UnlockRTNotify(); } } @@ -200,7 +223,7 @@ } void kill_app() { - kill(main_thread, SIGKILL); + kill(main_pid, SIGKILL); } void parse_options(int argc, char **argv) { @@ -212,11 +235,18 @@ {"version",0,0,0}, {"profile",0,0,0}, {"no-tune",0,0,0}, + {"statistics",0,0,0}, + {"lscp-addr",1,0,0}, + {"lscp-port",1,0,0}, {0,0,0,0} }; while (true) { - res = getopt_long_only(argc, argv, "", long_options, &option_index); + /* + Stephane Letz : letz@grame.fr + getopt_long_only does not exist on OSX : replaced by getopt_long for now. + */ + res = getopt_long(argc, argv, "", long_options, &option_index); if(res == -1) break; if (res == 0) { switch(option_index) { @@ -226,6 +256,9 @@ printf("--version prints version information\n"); printf("--profile profile synthesis algorithms\n"); printf("--no-tune disable assembly optimization\n"); + printf("--statistics periodically prints statistics\n"); + printf("--lscp-addr set LSCP address (default: any)\n"); + printf("--lscp-port set LSCP port (default: 8888)\n"); exit(EXIT_SUCCESS); break; case 1: // --version @@ -233,10 +266,27 @@ exit(EXIT_SUCCESS); break; case 2: // --profile - profile = true; + profile = true; break; case 3: // --no-tune - tune = false; + tune = false; + break; + case 4: // --statistics + bPrintStatistics = true; + break; + case 5: // --lscp-addr + struct in_addr addr; + if (inet_aton(optarg, &addr) == 0) + printf("WARNING: Failed to parse lscp-addr argument, ignoring!\n"); + else + lscp_addr = addr.s_addr; + break; + case 6: // --lscp-port + long unsigned int port = 0; + if ((sscanf(optarg, "%u", &port) != 1) || (port == 0) || (port > 65535)) + printf("WARNING: Failed to parse lscp-port argument, ignoring!\n"); + else + lscp_port = htons(port); break; } }