From: Chanwoo Choi Date: Sat, 4 Feb 2017 10:48:11 +0000 (+0900) Subject: pass: parser: Change 'limit_max_cpu' name to 'limit_min_cpu' X-Git-Tag: submit/tizen/20170328.004502~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3744be83404bddf045e270980c02fac7773e92db;p=platform%2Fcore%2Fsystem%2Fpass.git pass: parser: Change 'limit_max_cpu' name to 'limit_min_cpu' The PASS uses the 'limit_max_cpu' as the minimum number of online cpu. This name is not matched with the meaning of 'limit_max_cpu'. So, this patch changes the name of 'limit_max_cpu' to 'limit_min_cpu' to improve the readability of property in configuration files. Change-Id: I35650f622ecf482606cdbbdf6c7c365582bace15 Signed-off-by: Chanwoo Choi --- diff --git a/src/pass/pass-cluster0.conf b/src/pass/pass-cluster0.conf index f77a751..98a73d6 100644 --- a/src/pass/pass-cluster0.conf +++ b/src/pass/pass-cluster0.conf @@ -19,7 +19,7 @@ pass_governor_timeout=0.4 [Level0] limit_max_freq=1000000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=0 num_up_cond=1 num_up_cond_freq=800000 @@ -30,7 +30,7 @@ num_right_cond_busy_cpu=1 [Level1] limit_max_freq=1000000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=0 num_up_cond=1 num_up_cond_freq=800000 @@ -43,7 +43,7 @@ num_right_cond_busy_cpu=2 [Level2] limit_max_freq=1000000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=0 num_up_cond=1 num_up_cond_freq=800000 @@ -56,7 +56,7 @@ num_right_cond_busy_cpu=3 [Level3] limit_max_freq=1000000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=0 num_up_cond=1 num_up_cond_freq=800000 @@ -67,7 +67,7 @@ num_right_cond=0 [Level4] limit_max_freq=1200000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -79,7 +79,7 @@ num_right_cond_busy_cpu=1 [Level5] limit_max_freq=1200000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -93,7 +93,7 @@ num_right_cond_busy_cpu=2 [Level6] limit_max_freq=1200000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -107,7 +107,7 @@ num_right_cond_busy_cpu=3 [Level7] limit_max_freq=1200000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -119,7 +119,7 @@ num_right_cond=0 [Level8] limit_max_freq=1300000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=1200000 num_up_cond=1 @@ -131,7 +131,7 @@ num_right_cond_busy_cpu=1 [Level9] limit_max_freq=1300000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=1200000 num_up_cond=1 @@ -145,7 +145,7 @@ num_right_cond_busy_cpu=2 [Level10] limit_max_freq=1300000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=1 num_down_cond_freq=1200000 num_up_cond=1 @@ -159,7 +159,7 @@ num_right_cond_busy_cpu=3 [Level11] limit_max_freq=1300000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=1 num_down_cond_freq=1200000 num_up_cond=1 diff --git a/src/pass/pass-cluster1.conf b/src/pass/pass-cluster1.conf index bf7a7c3..9f65eee 100644 --- a/src/pass/pass-cluster1.conf +++ b/src/pass/pass-cluster1.conf @@ -19,7 +19,7 @@ pass_governor_timeout=0.4 [Level0] limit_max_freq=1000000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=0 num_up_cond=1 num_up_cond_freq=1000000 @@ -30,7 +30,7 @@ num_right_cond_busy_cpu=1 [Level1] limit_max_freq=1000000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=0 num_up_cond=1 num_up_cond_freq=1000000 @@ -43,7 +43,7 @@ num_right_cond_busy_cpu=2 [Level2] limit_max_freq=1000000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=0 num_up_cond=1 num_up_cond_freq=1000000 @@ -56,7 +56,7 @@ num_right_cond_busy_cpu=3 [Level3] limit_max_freq=1000000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=0 num_up_cond=1 num_up_cond_freq=1000000 @@ -67,7 +67,7 @@ num_right_cond=0 [Level4] limit_max_freq=1200000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -79,7 +79,7 @@ num_right_cond_busy_cpu=1 [Level5] limit_max_freq=1200000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -93,7 +93,7 @@ num_right_cond_busy_cpu=2 [Level6] limit_max_freq=1200000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -107,7 +107,7 @@ num_right_cond_busy_cpu=3 [Level7] limit_max_freq=1200000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=1 num_down_cond_freq=1000000 num_up_cond=1 @@ -119,7 +119,7 @@ num_right_cond=0 [Level8] limit_max_freq=1300000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=1100000 num_up_cond=1 @@ -131,7 +131,7 @@ num_right_cond_busy_cpu=1 [Level9] limit_max_freq=1300000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=1100000 num_up_cond=1 @@ -145,7 +145,7 @@ num_right_cond_busy_cpu=2 [Level10] limit_max_freq=1300000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=1 num_down_cond_freq=1100000 num_up_cond=1 @@ -159,7 +159,7 @@ num_right_cond_busy_cpu=3 [Level11] limit_max_freq=1300000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=1 num_down_cond_freq=1100000 num_up_cond=1 @@ -171,7 +171,7 @@ num_right_cond=0 [Level12] limit_max_freq=1500000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=1300000 num_up_cond=1 @@ -183,7 +183,7 @@ num_right_cond_busy_cpu=1 [Level13] limit_max_freq=1500000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=1300000 num_up_cond=1 @@ -197,7 +197,7 @@ num_right_cond_busy_cpu=2 [Level14] limit_max_freq=1500000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=1 num_down_cond_freq=1300000 num_up_cond=1 @@ -211,7 +211,7 @@ num_right_cond_busy_cpu=3 [Level15] limit_max_freq=1500000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=1 num_down_cond_freq=1300000 num_up_cond=1 @@ -223,7 +223,7 @@ num_right_cond=0 [Level16] limit_max_freq=1700000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=1500000 num_up_cond=0 @@ -234,7 +234,7 @@ num_right_cond_busy_cpu=1 [Level17] limit_max_freq=1700000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=1500000 num_up_cond=0 @@ -247,7 +247,7 @@ num_right_cond_busy_cpu=2 [Level18] limit_max_freq=1700000 -limit_max_cpu=3 +limit_min_cpu=3 num_down_cond=1 num_down_cond_freq=1500000 num_up_cond=0 @@ -260,7 +260,7 @@ num_right_cond_busy_cpu=3 [Level19] limit_max_freq=1700000 -limit_max_cpu=4 +limit_min_cpu=4 num_down_cond=1 num_down_cond_freq=1500000 num_up_cond=0 diff --git a/src/pass/pass-gov.c b/src/pass/pass-gov.c index d8ecab0..7dab679 100644 --- a/src/pass/pass-gov.c +++ b/src/pass/pass-gov.c @@ -167,7 +167,7 @@ static void pass_hotplug_stop(struct pass_policy *policy) if (!policy->hotplug) return; - policy->hotplug->online = table[level].limit_max_cpu; + policy->hotplug->online = table[level].limit_min_cpu; policy->hotplug->max_online = policy->cpufreq.num_nr_cpus; } @@ -175,7 +175,7 @@ static int pass_hotplug_dummy_governor(struct pass_policy *policy) { int level = policy->curr_level; - return policy->pass_table[level].limit_max_cpu; + return policy->pass_table[level].limit_min_cpu; } /* @@ -227,7 +227,7 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level) int curr_level = policy->curr_level; int limit_max_freq; int limit_min_freq; - int limit_max_cpu; + int limit_min_cpu; int online; int ret; @@ -246,15 +246,15 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level) */ limit_max_freq = table[new_level].limit_max_freq; limit_min_freq = table[new_level].limit_min_freq; - limit_max_cpu = table[new_level].limit_max_cpu; + limit_min_cpu = table[new_level].limit_min_cpu; policy->prev_level = policy->curr_level; policy->curr_level = new_level; /* Turn on/off CPUs according the maximum number of online CPU */ if (hotplug) { - if (hotplug->max_online != limit_max_cpu) - hotplug->max_online = limit_max_cpu; + if (hotplug->max_online != limit_min_cpu) + hotplug->max_online = limit_min_cpu; if (hotplug->governor) online = hotplug->governor(policy); @@ -289,7 +289,7 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level) pass_res->cdata.res_name, (curr_level > new_level ? "DOWN" : "UP"), curr_level, new_level, - limit_max_freq, limit_min_freq, limit_max_cpu); + limit_max_freq, limit_min_freq, limit_min_cpu); */ return 0; @@ -313,11 +313,11 @@ static void pass_calculate_busy_cpu(struct pass_policy *policy) unsigned int sum_load; unsigned int sum_runnable_load; unsigned int nr_runnings; - int limit_max_cpu; + int limit_min_cpu; int i; int j; - limit_max_cpu = table[level].limit_max_cpu; + limit_min_cpu = table[level].limit_min_cpu; for (i = 0; i < policy->num_pass_cpu_stats; i++) { cur_freq = stats[i].freq; @@ -350,8 +350,8 @@ static void pass_calculate_busy_cpu(struct pass_policy *policy) } stats[i].num_busy_cpu = busy_cpu; - stats[i].avg_load = sum_load / limit_max_cpu; - stats[i].avg_runnable_load = sum_runnable_load / limit_max_cpu; + stats[i].avg_load = sum_load / limit_min_cpu; + stats[i].avg_runnable_load = sum_runnable_load / limit_min_cpu; if (nr_runnings) { stats[i].avg_thread_load = (sum_load * 100) / nr_runnings; diff --git a/src/pass/pass-micro.conf b/src/pass/pass-micro.conf index 48ce2de..d98b666 100644 --- a/src/pass/pass-micro.conf +++ b/src/pass/pass-micro.conf @@ -19,7 +19,7 @@ pass_governor_timeout=0.4 [Level0] limit_max_freq=600000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=0 num_up_cond=1 @@ -31,7 +31,7 @@ num_right_cond=0 [Level1] limit_max_freq=700000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=500000 @@ -46,7 +46,7 @@ num_right_cond=0 [Level2] limit_max_freq=800000 -limit_max_cpu=1 +limit_min_cpu=1 num_down_cond=1 num_down_cond_freq=700000 @@ -61,7 +61,7 @@ num_right_cond=0 [Level3] limit_max_freq=700000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=600000 @@ -76,7 +76,7 @@ num_right_cond=0 [Level4] limit_max_freq=700000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=600000 @@ -91,7 +91,7 @@ num_right_cond=0 [Level5] limit_max_freq=800000 -limit_max_cpu=2 +limit_min_cpu=2 num_down_cond=1 num_down_cond_freq=700000 diff --git a/src/pass/pass-parser.c b/src/pass/pass-parser.c index cc5fbe4..5ae6cf1 100644 --- a/src/pass/pass-parser.c +++ b/src/pass/pass-parser.c @@ -122,8 +122,8 @@ static int pass_parse_level(struct parse_result *result, policy->pass_table[level].limit_max_freq = atoi(result->value); else if (MATCH(result->name, "limit_min_freq")) policy->pass_table[level].limit_min_freq = atoi(result->value); - else if (MATCH(result->name, "limit_max_cpu")) - policy->pass_table[level].limit_max_cpu = atoi(result->value); + else if (MATCH(result->name, "limit_min_cpu")) + policy->pass_table[level].limit_min_cpu = atoi(result->value); else if (MATCH(result->name, "num_down_cond")) policy->pass_table[level].num_down_cond = atoi(result->value); @@ -365,10 +365,10 @@ int pass_get_table(struct pass_policy *policy, char *pass_conf_path) _I("%s| policy->pass_table[%d].limit_min_freq : %d\n", pass_res->cdata.res_name, level, policy->pass_table[level].limit_min_freq); - if (policy->pass_table[level].limit_max_cpu) - _I("%s| policy->pass_table[%d].limit_max_cpu : %d\n", + if (policy->pass_table[level].limit_min_cpu) + _I("%s| policy->pass_table[%d].limit_min_cpu : %d\n", pass_res->cdata.res_name, level, - policy->pass_table[level].limit_max_cpu); + policy->pass_table[level].limit_min_cpu); if (policy->pass_table[level].gov_timeout) _I("%s| policy->pass_table[%d].gov_timeout : %f\n", pass_res->cdata.res_name, level, diff --git a/src/pass/pass.c b/src/pass/pass.c index 599ea46..726bc64 100644 --- a/src/pass/pass.c +++ b/src/pass/pass.c @@ -156,8 +156,8 @@ static int pass_resource_init(struct pass_policy *policy) for (i = 0; i < policy->num_levels; i++) { if (max_freq < policy->pass_table[i].limit_max_freq) max_freq = policy->pass_table[i].limit_max_freq; - if (max_cpu < policy->pass_table[i].limit_max_cpu) - max_cpu = policy->pass_table[i].limit_max_cpu; + if (max_cpu < policy->pass_table[i].limit_min_cpu) + max_cpu = policy->pass_table[i].limit_min_cpu; } policy->cpufreq.max_freq = max_freq; policy->cpufreq.num_nr_cpus = max_cpu; diff --git a/src/pass/pass.h b/src/pass/pass.h index 80b5497..427dc0e 100644 --- a/src/pass/pass.h +++ b/src/pass/pass.h @@ -139,7 +139,7 @@ struct pass_table { /* Constraints condition for powersaving */ int limit_max_freq; int limit_min_freq; - int limit_max_cpu; + int limit_min_cpu; /* Governor timer's timeout for each pass level */ double gov_timeout;