[pulseaudio-commits] r1149 - in /trunk/src/daemon: cmdline.c daemon-conf.c daemon-conf.h daemon.conf.in main.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Tue Jul 25 13:51:16 PDT 2006
Author: lennart
Date: Tue Jul 25 22:51:15 2006
New Revision: 1149
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1149&root=pulseaudio&view=rev
Log:
add new command line option --no-cpu-limit. This is useful when running PulseAudio in valgrind's massif or callgrind tools
Modified:
trunk/src/daemon/cmdline.c
trunk/src/daemon/daemon-conf.c
trunk/src/daemon/daemon-conf.h
trunk/src/daemon/daemon.conf.in
trunk/src/daemon/main.c
Modified: trunk/src/daemon/cmdline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.c?rev=1149&root=pulseaudio&r1=1148&r2=1149&view=diff
==============================================================================
--- trunk/src/daemon/cmdline.c (original)
+++ trunk/src/daemon/cmdline.c Tue Jul 25 22:51:15 2006
@@ -59,6 +59,7 @@
ARG_KILL,
ARG_USE_PID_FILE,
ARG_CHECK,
+ ARG_NO_CPU_LIMIT,
ARG_SYSTEM
};
@@ -86,6 +87,7 @@
{"use-pid-file", 2, 0, ARG_USE_PID_FILE},
{"check", 0, 0, ARG_CHECK},
{"system", 2, 0, ARG_SYSTEM},
+ {"no-cpu-limit", 2, 0, ARG_NO_CPU_LIMIT},
{NULL, 0, 0, 0}
};
@@ -128,7 +130,9 @@
" (one of src-sinc-medium-quality,\n"
" src-sinc-best-quality,src-sinc-fastest\n"
" src-zero-order-hold,src-linear,trivial)\n"
- " --use-pid-file[=BOOL] Create a PID file\n\n"
+ " --use-pid-file[=BOOL] Create a PID file\n"
+ " --no-cpu-limit[=BOOL] Do not install CPU load limiter on\n"
+ " platforms that support it.\n\n"
"STARTUP SCRIPT:\n"
" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module with\n"
@@ -286,6 +290,14 @@
goto fail;
}
break;
+
+ case ARG_NO_CPU_LIMIT:
+ if ((conf->no_cpu_limit = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
+ pa_log(__FILE__": --no-cpu-limit expects boolean argument");
+ goto fail;
+ }
+ break;
+
default:
goto fail;
Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?rev=1149&root=pulseaudio&r1=1148&r2=1149&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Tue Jul 25 22:51:15 2006
@@ -72,7 +72,8 @@
.resample_method = PA_RESAMPLER_SRC_SINC_FASTEST,
.config_file = NULL,
.use_pid_file = 1,
- .system_instance = 0
+ .system_instance = 0,
+ .no_cpu_limit = 0
#ifdef HAVE_SYS_RESOURCE_H
, .rlimit_as = { .value = 0, .is_set = 0 },
.rlimit_core = { .value = 0, .is_set = 0 },
@@ -246,6 +247,7 @@
{ "resample-method", parse_resample_method, NULL },
{ "use-pid-file", pa_config_parse_bool, NULL },
{ "system-instance", pa_config_parse_bool, NULL },
+ { "no-cpu-limit", pa_config_parse_bool, NULL },
#ifdef HAVE_SYS_RESOURCE_H
{ "rlimit-as", parse_rlimit, NULL },
{ "rlimit-core", parse_rlimit, NULL },
@@ -278,21 +280,22 @@
table[12].data = c;
table[13].data = &c->use_pid_file;
table[14].data = &c->system_instance;
-#ifdef HAVE_SYS_RESOURCE_H
- table[15].data = &c->rlimit_as;
- table[16].data = &c->rlimit_core;
- table[17].data = &c->rlimit_data;
- table[18].data = &c->rlimit_fsize;
- table[19].data = &c->rlimit_nofile;
- table[20].data = &c->rlimit_stack;
+ table[15].data = &c->no_cpu_limit;
+#ifdef HAVE_SYS_RESOURCE_H
+ table[16].data = &c->rlimit_as;
+ table[17].data = &c->rlimit_core;
+ table[18].data = &c->rlimit_data;
+ table[19].data = &c->rlimit_fsize;
+ table[20].data = &c->rlimit_nofile;
+ table[21].data = &c->rlimit_stack;
#ifdef RLIMIT_NPROC
- table[21].data = &c->rlimit_nproc;
+ table[22].data = &c->rlimit_nproc;
#endif
#ifdef RLIMIT_MEMLOCK
#ifndef RLIMIT_NPROC
#error "Houston, we have a numbering problem!"
#endif
- table[22].data = &c->rlimit_memlock;
+ table[23].data = &c->rlimit_memlock;
#endif
#endif
@@ -363,6 +366,7 @@
pa_strbuf_printf(s, "resample-method = %s\n", pa_resample_method_to_string(c->resample_method));
pa_strbuf_printf(s, "use-pid-file = %i\n", c->use_pid_file);
pa_strbuf_printf(s, "system-instance = %i\n", !!c->system_instance);
+ pa_strbuf_printf(s, "no-cpu-limit = %i\n", !!c->no_cpu_limit);
#ifdef HAVE_SYS_RESOURCE_H
pa_strbuf_printf(s, "rlimit-as = %li\n", c->rlimit_as.is_set ? (long int) c->rlimit_as.value : -1);
pa_strbuf_printf(s, "rlimit-core = %li\n", c->rlimit_core.is_set ? (long int) c->rlimit_core.value : -1);
Modified: trunk/src/daemon/daemon-conf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.h?rev=1149&root=pulseaudio&r1=1148&r2=1149&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.h (original)
+++ trunk/src/daemon/daemon-conf.h Tue Jul 25 22:51:15 2006
@@ -58,7 +58,8 @@
scache_idle_time,
auto_log_target,
use_pid_file,
- system_instance;
+ system_instance,
+ no_cpu_limit;
char *script_commands, *dl_search_path, *default_script_file;
pa_log_target_t log_target;
pa_log_level_t log_level;
Modified: trunk/src/daemon/daemon.conf.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon.conf.in?rev=1149&root=pulseaudio&r1=1148&r2=1149&view=diff
==============================================================================
--- trunk/src/daemon/daemon.conf.in (original)
+++ trunk/src/daemon/daemon.conf.in Tue Jul 25 22:51:15 2006
@@ -79,6 +79,11 @@
## effectively disables multiple instances.
; use-pid-file = 1
+## Do not install the CPU load limit, even on platforms where it is
+## supported. This option is useful when debugging/profiling
+## PulseAudio to disable disturbing SIGXCPU signals.
+; no-cpu-limit = 0
+
## Run the daemon as system-wide instance, requires root priviliges
; system-instance = 0
Modified: trunk/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/main.c?rev=1149&root=pulseaudio&r1=1148&r2=1149&view=diff
==============================================================================
--- trunk/src/daemon/main.c (original)
+++ trunk/src/daemon/main.c Tue Jul 25 22:51:15 2006
@@ -588,10 +588,12 @@
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 @@
pa_core_free(c);
- pa_cpu_limit_done();
+ if (!conf->no_cpu_limit)
+ pa_cpu_limit_done();
+
pa_signal_done();
pa_mainloop_free(mainloop);
More information about the pulseaudio-commits
mailing list