The use of the 'ignore_nice' sysfs file is confusing to anyone using. This patch makes it so when you now set it to the default value of 1, process nice time is also ignored in the cpu 'busyness' calculation. We also rename 'ignore_nice' to 'ignore_nice_task' so that userland tools notice the inverse behaviour sooner. Prior to this patch to set it to '1' to make process nice time count...even confused me :) WARNING: this obvious breaks any userland tools that expect things to be the other way round; hence why, as suggested, the rename of the 'ignore_nice' file to 'ignore_nice_tasks' Signed-off-by: Alexander Clouter <[email protected]>
diff -r -u -d linux-2.6.14-rc2.orig/drivers/cpufreq/cpufreq_conservative.c linux-2.6.14-rc2/drivers/cpufreq/cpufreq_conservative.c
--- linux-2.6.14-rc2.orig/drivers/cpufreq/cpufreq_conservative.c 2005-10-03 20:05:30.742334750 +0100
+++ linux-2.6.14-rc2/drivers/cpufreq/cpufreq_conservative.c 2005-10-06 21:10:47.785133750 +0100
@@ -93,7 +93,7 @@
{
return kstat_cpu(cpu).cpustat.idle +
kstat_cpu(cpu).cpustat.iowait +
- ( !dbs_tuners_ins.ignore_nice ?
+ ( dbs_tuners_ins.ignore_nice ?
kstat_cpu(cpu).cpustat.nice :
0);
}
@@ -127,7 +127,7 @@
show_one(sampling_down_factor, sampling_down_factor);
show_one(up_threshold, up_threshold);
show_one(down_threshold, down_threshold);
-show_one(ignore_nice, ignore_nice);
+show_one(ignore_nice_tasks, ignore_nice);
show_one(freq_step, freq_step);
static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
@@ -207,7 +207,7 @@
return count;
}
-static ssize_t store_ignore_nice(struct cpufreq_policy *policy,
+static ssize_t store_ignore_nice_tasks(struct cpufreq_policy *policy,
const char *buf, size_t count)
{
unsigned int input;
@@ -272,7 +272,7 @@
define_one_rw(sampling_down_factor);
define_one_rw(up_threshold);
define_one_rw(down_threshold);
-define_one_rw(ignore_nice);
+define_one_rw(ignore_nice_tasks);
define_one_rw(freq_step);
static struct attribute * dbs_attributes[] = {
@@ -282,7 +282,7 @@
&sampling_down_factor.attr,
&up_threshold.attr,
&down_threshold.attr,
- &ignore_nice.attr,
+ &ignore_nice_tasks.attr,
&freq_step.attr,
NULL
};
@@ -515,7 +515,7 @@
def_sampling_rate = (latency / 1000) *
DEF_SAMPLING_RATE_LATENCY_MULTIPLIER;
dbs_tuners_ins.sampling_rate = def_sampling_rate;
- dbs_tuners_ins.ignore_nice = 0;
+ dbs_tuners_ins.ignore_nice = 1;
dbs_tuners_ins.freq_step = 5;
dbs_timer_init();
diff -r -u -d linux-2.6.14-rc2.orig/drivers/cpufreq/cpufreq_ondemand.c linux-2.6.14-rc2/drivers/cpufreq/cpufreq_ondemand.c
--- linux-2.6.14-rc2.orig/drivers/cpufreq/cpufreq_ondemand.c 2005-10-03 20:05:30.742334750 +0100
+++ linux-2.6.14-rc2/drivers/cpufreq/cpufreq_ondemand.c 2005-10-06 21:10:23.979646000 +0100
@@ -86,7 +86,7 @@
{
return kstat_cpu(cpu).cpustat.idle +
kstat_cpu(cpu).cpustat.iowait +
- ( !dbs_tuners_ins.ignore_nice ?
+ ( dbs_tuners_ins.ignore_nice ?
kstat_cpu(cpu).cpustat.nice :
0);
}
@@ -119,7 +119,7 @@
show_one(sampling_rate, sampling_rate);
show_one(sampling_down_factor, sampling_down_factor);
show_one(up_threshold, up_threshold);
-show_one(ignore_nice, ignore_nice);
+show_one(ignore_nice_tasks, ignore_nice);
static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
const char *buf, size_t count)
@@ -179,7 +179,7 @@
return count;
}
-static ssize_t store_ignore_nice(struct cpufreq_policy *policy,
+static ssize_t store_ignore_nice_tasks(struct cpufreq_policy *policy,
const char *buf, size_t count)
{
unsigned int input;
@@ -220,7 +220,7 @@
define_one_rw(sampling_rate);
define_one_rw(sampling_down_factor);
define_one_rw(up_threshold);
-define_one_rw(ignore_nice);
+define_one_rw(ignore_nice_tasks);
static struct attribute * dbs_attributes[] = {
&sampling_rate_max.attr,
@@ -228,7 +228,7 @@
&sampling_rate.attr,
&sampling_down_factor.attr,
&up_threshold.attr,
- &ignore_nice.attr,
+ &ignore_nice_tasks.attr,
NULL
};
@@ -424,7 +424,7 @@
def_sampling_rate = (latency / 1000) *
DEF_SAMPLING_RATE_LATENCY_MULTIPLIER;
dbs_tuners_ins.sampling_rate = def_sampling_rate;
- dbs_tuners_ins.ignore_nice = 0;
+ dbs_tuners_ins.ignore_nice = 1;
dbs_timer_init();
}
Attachment:
signature.asc
Description: Digital signature
- Prev by Date: Re: [RFC] add sysfs to dynamically control blk request tag maintenance
- Next by Date: [patch 1/1] cpufreq: documentation for 'ondemand' and 'conservative'
- Previous by thread: Re: RFC drivers/usb/storage/libusual
- Next by thread: [patch 1/1] cpufreq: documentation for 'ondemand' and 'conservative'
- Index(es):
 |