summaryrefslogtreecommitdiffstats
path: root/src/daemon/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-07-25 20:51:15 +0000
committerLennart Poettering <lennart@poettering.net>2006-07-25 20:51:15 +0000
commit61ce8bb0024764fa059aa5f5f1f5c2a0189c40bc (patch)
treee18a9c3aeba2c1c0775780562b2d061be760e96d /src/daemon/main.c
parent563fab983f065fdad14696ce3f13d3df6a2b0370 (diff)
add new command line option --no-cpu-limit. This is useful when running PulseAudio in valgrind's massif or callgrind tools
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1149 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/main.c')
-rw-r--r--src/daemon/main.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 3ced3bf6..38d465f8 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -588,10 +588,12 @@ int main(int argc, char *argv[]) {
c->running_as_daemon = 1;
oil_init();
-
- r = pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
- assert(r == 0);
-
+
+ if (!conf->no_cpu_limit) {
+ r = pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
+ assert(r == 0);
+ }
+
buf = pa_strbuf_new();
if (conf->default_script_file)
r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail);
@@ -645,7 +647,9 @@ int main(int argc, char *argv[]) {
pa_core_free(c);
- pa_cpu_limit_done();
+ if (!conf->no_cpu_limit)
+ pa_cpu_limit_done();
+
pa_signal_done();
pa_mainloop_free(mainloop);