Skip to content

L
linux
Commit a1ce5ba2 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files
Options

cpupowerutils: utils - ConfigStyle bugfixes 

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 2cd005ca
Expand all Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 108 deletions
tools/power/cpupower/utils/cpufreq-info.c
View file @ a1ce5ba2
This diff is collapsed.
tools/power/cpupower/utils/cpufreq-set.c
View file @ a1ce5ba2
...@@ -43,12 +43,12 @@ void freq_set_help(void) ...@@ -43,12 +43,12 @@ void freq_set_help(void)
} }
static struct option set_opts[] = { static struct option set_opts[] = {
{ .name="min", .has_arg=required_argument, .flag=NULL, .val='d'}, { .name = "min", .has_arg = required_argument, .flag = NULL, .val = 'd'},
{ .name="max", .has_arg=required_argument, .flag=NULL, .val='u'}, { .name = "max", .has_arg = required_argument, .flag = NULL, .val = 'u'},
{ .name="governor", .has_arg=required_argument, .flag=NULL, .val='g'}, { .name = "governor", .has_arg = required_argument, .flag = NULL, .val = 'g'},
{ .name="freq", .has_arg=required_argument, .flag=NULL, .val='f'}, { .name = "freq", .has_arg = required_argument, .flag = NULL, .val = 'f'},
{ .name="help", .has_arg=no_argument, .flag=NULL, .val='h'}, { .name = "help", .has_arg = no_argument, .flag = NULL, .val = 'h'},
{ .name="related", .has_arg=no_argument, .flag=NULL, .val='r'}, { .name = "related", .has_arg = no_argument, .flag = NULL, .val='r'},
{ }, { },
}; };
...@@ -64,7 +64,7 @@ static void print_error(void) ...@@ -64,7 +64,7 @@ static void print_error(void)
}; };
struct freq_units { struct freq_units {
char* str_unit; char *str_unit;
int power_of_ten; int power_of_ten;
}; };
...@@ -204,7 +204,8 @@ static int do_one_cpu(unsigned int cpu, struct cpufreq_policy *new_pol, ...@@ -204,7 +204,8 @@ static int do_one_cpu(unsigned int cpu, struct cpufreq_policy *new_pol,
else if (new_pol->max) else if (new_pol->max)
return cpufreq_modify_policy_max(cpu, new_pol->max); return cpufreq_modify_policy_max(cpu, new_pol->max);
else if (new_pol->governor) else if (new_pol->governor)
return cpufreq_modify_policy_governor(cpu, new_pol->governor); return cpufreq_modify_policy_governor(cpu,
new_pol->governor);
default: default:
/* slow path */ /* slow path */
...@@ -290,7 +291,7 @@ int cmd_freq_set(int argc, char **argv) ...@@ -290,7 +291,7 @@ int cmd_freq_set(int argc, char **argv)
new_pol.governor = gov; new_pol.governor = gov;
break; break;
} }
} while(cont); } while (cont);
/* parameter checking */ /* parameter checking */
if (double_parm) { if (double_parm) {
......
tools/power/cpupower/utils/cpuidle-info.c
View file @ a1ce5ba2
...@@ -31,8 +31,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) ...@@ -31,8 +31,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose)
if (idlestates == 0) { if (idlestates == 0) {
printf(_("CPU %u: No idle states\n"), cpu); printf(_("CPU %u: No idle states\n"), cpu);
return; return;
} } else if (idlestates <= 0) {
else if (idlestates <= 0) {
printf(_("CPU %u: Can't read idle state info\n"), cpu); printf(_("CPU %u: Can't read idle state info\n"), cpu);
return; return;
} }
...@@ -92,7 +91,7 @@ static void cpuidle_general_output(void) ...@@ -92,7 +91,7 @@ static void cpuidle_general_output(void)
} }
printf(_("CPUidle driver: %s\n"), tmp); printf(_("CPUidle driver: %s\n"), tmp);
free (tmp); free(tmp);
tmp = sysfs_get_cpuidle_governor(); tmp = sysfs_get_cpuidle_governor();
if (!tmp) { if (!tmp) {
...@@ -101,7 +100,7 @@ static void cpuidle_general_output(void) ...@@ -101,7 +100,7 @@ static void cpuidle_general_output(void)
} }
printf(_("CPUidle governor: %s\n"), tmp); printf(_("CPUidle governor: %s\n"), tmp);
free (tmp); free(tmp);
} }
static void proc_cpuidle_cpu_output(unsigned int cpu) static void proc_cpuidle_cpu_output(unsigned int cpu)
...@@ -117,8 +116,7 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) ...@@ -117,8 +116,7 @@ static void proc_cpuidle_cpu_output(unsigned int cpu)
* printf(_("CPU %u: No C-states available\n"), cpu); * printf(_("CPU %u: No C-states available\n"), cpu);
* return; * return;
*/ */
} } else if (cstates <= 0) {
else if (cstates <= 0) {
printf(_("CPU %u: Can't read C-state info\n"), cpu); printf(_("CPU %u: Can't read C-state info\n"), cpu);
return; return;
} }
...@@ -143,7 +141,8 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) ...@@ -143,7 +141,8 @@ static void proc_cpuidle_cpu_output(unsigned int cpu)
/* --freq / -f */ /* --freq / -f */
void idle_info_help(void) { void idle_info_help(void)
{
printf(_ ("Usage: cpupower idleinfo [options]\n")); printf(_ ("Usage: cpupower idleinfo [options]\n"));
printf(_ ("Options:\n")); printf(_ ("Options:\n"));
printf(_ (" -s, --silent Only show general C-state information\n")); printf(_ (" -s, --silent Only show general C-state information\n"));
...@@ -155,9 +154,9 @@ void idle_info_help(void) { ...@@ -155,9 +154,9 @@ void idle_info_help(void) {
} }
static struct option info_opts[] = { static struct option info_opts[] = {
{ .name="silent", .has_arg=no_argument, .flag=NULL, .val='s'}, { .name = "silent", .has_arg = no_argument, .flag = NULL, .val = 's'},
{ .name="proc", .has_arg=no_argument, .flag=NULL, .val='o'}, { .name = "proc", .has_arg = no_argument, .flag = NULL, .val = 'o'},
{ .name="help", .has_arg=no_argument, .flag=NULL, .val='h'}, { .name = "help", .has_arg = no_argument, .flag = NULL, .val = 'h'},
{ }, { },
}; };
...@@ -202,7 +201,7 @@ int cmd_idle_info(int argc, char **argv) ...@@ -202,7 +201,7 @@ int cmd_idle_info(int argc, char **argv)
output_param = ret; output_param = ret;
break; break;
} }
} while(cont); } while (cont);
switch (output_param) { switch (output_param) {
case -1: case -1:
...@@ -241,5 +240,5 @@ int cmd_idle_info(int argc, char **argv) ...@@ -241,5 +240,5 @@ int cmd_idle_info(int argc, char **argv)
break; break;
} }
} }
return (EXIT_SUCCESS); return EXIT_SUCCESS;
} }
tools/power/cpupower/utils/cpupower-info.c
View file @ a1ce5ba2
...@@ -30,10 +30,10 @@ void info_help(void) ...@@ -30,10 +30,10 @@ void info_help(void)
} }
static struct option set_opts[] = { static struct option set_opts[] = {
{ .name="perf-bias", .has_arg=optional_argument, .flag=NULL, .val='b'}, { .name = "perf-bias", .has_arg = optional_argument, .flag = NULL, .val = 'b'},
{ .name="sched-mc", .has_arg=optional_argument, .flag=NULL, .val='m'}, { .name = "sched-mc", .has_arg = optional_argument, .flag = NULL, .val = 'm'},
{ .name="sched-smt", .has_arg=optional_argument, .flag=NULL, .val='s'}, { .name = "sched-smt", .has_arg = optional_argument, .flag = NULL, .val = 's'},
{ .name="help", .has_arg=no_argument, .flag=NULL, .val='h'}, { .name = "help", .has_arg = no_argument, .flag = NULL, .val = 'h'},
{ }, { },
}; };
...@@ -57,12 +57,11 @@ int cmd_info(int argc, char **argv) ...@@ -57,12 +57,11 @@ int cmd_info(int argc, char **argv)
int perf_bias:1; int perf_bias:1;
}; };
int params; int params;
} params = {}; } params = {};
int ret = 0; int ret = 0;
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
textdomain (PACKAGE); textdomain(PACKAGE);
/* parameter parsing */ /* parameter parsing */
while ((ret = getopt_long(argc, argv, "msbh", set_opts, NULL)) != -1) { while ((ret = getopt_long(argc, argv, "msbh", set_opts, NULL)) != -1) {
...@@ -123,7 +122,7 @@ int cmd_info(int argc, char **argv) ...@@ -123,7 +122,7 @@ int cmd_info(int argc, char **argv)
if (params.perf_bias) { if (params.perf_bias) {
if (!run_as_root) { if (!run_as_root) {
params.perf_bias = 0; params.perf_bias = 0;
printf (_("Intel's performance bias setting needs root privileges\n")); printf(_("Intel's performance bias setting needs root privileges\n"));
} else if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS)) { } else if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS)) {
printf(_("System does not support Intel's performance" printf(_("System does not support Intel's performance"
" bias setting\n")); " bias setting\n"));
......
tools/power/cpupower/utils/cpupower-set.c
View file @ a1ce5ba2
...@@ -30,10 +30,10 @@ void set_help(void) ...@@ -30,10 +30,10 @@ void set_help(void)
} }
static struct option set_opts[] = { static struct option set_opts[] = {
{ .name="perf-bias", .has_arg=optional_argument, .flag=NULL, .val='b'}, { .name = "perf-bias", .has_arg = optional_argument, .flag = NULL, .val = 'b'},
{ .name="sched-mc", .has_arg=optional_argument, .flag=NULL, .val='m'}, { .name = "sched-mc", .has_arg = optional_argument, .flag = NULL, .val = 'm'},
{ .name="sched-smt", .has_arg=optional_argument, .flag=NULL, .val='s'}, { .name = "sched-smt", .has_arg = optional_argument, .flag = NULL, .val = 's'},
{ .name="help", .has_arg=no_argument, .flag=NULL, .val='h'}, { .name = "help", .has_arg = no_argument, .flag = NULL, .val = 'h'},
{ }, { },
}; };
...@@ -57,17 +57,17 @@ int cmd_set(int argc, char **argv) ...@@ -57,17 +57,17 @@ int cmd_set(int argc, char **argv)
int perf_bias:1; int perf_bias:1;
}; };
int params; int params;
} params; } params;
int sched_mc = 0, sched_smt = 0, perf_bias = 0; int sched_mc = 0, sched_smt = 0, perf_bias = 0;
int ret = 0; int ret = 0;
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
textdomain (PACKAGE); textdomain(PACKAGE);
params.params = 0; params.params = 0;
/* parameter parsing */ /* parameter parsing */
while ((ret = getopt_long(argc, argv, "m:s:b:h", set_opts, NULL)) != -1) { while ((ret = getopt_long(argc, argv, "m:s:b:h",
set_opts, NULL)) != -1) {
switch (ret) { switch (ret) {
case 'h': case 'h':
set_help(); set_help();
......
tools/power/cpupower/utils/cpupower.c
View file @ a1ce5ba2
...@@ -51,7 +51,7 @@ static struct cmd_struct commands[] = { ...@@ -51,7 +51,7 @@ static struct cmd_struct commands[] = {
{ "info", cmd_info, info_help, 0 }, { "info", cmd_info, info_help, 0 },
{ "monitor", cmd_monitor, monitor_help, 0 }, { "monitor", cmd_monitor, monitor_help, 0 },
{ "help", cmd_help, print_help, 0 }, { "help", cmd_help, print_help, 0 },
// { "bench", cmd_bench, NULL, 1 }, /* { "bench", cmd_bench, NULL, 1 }, */
}; };
int cmd_help(int argc, const char **argv) int cmd_help(int argc, const char **argv)
...@@ -95,7 +95,8 @@ static void print_help(void) ...@@ -95,7 +95,8 @@ static void print_help(void)
printf(_("\nUse cpupower help subcommand for getting help for above subcommands.\n")); printf(_("\nUse cpupower help subcommand for getting help for above subcommands.\n"));
} }
static void print_version(void) { static void print_version(void)
{
printf(PACKAGE " " VERSION "\n"); printf(PACKAGE " " VERSION "\n");
printf(_("Report errors and bugs to %s, please.\n"), PACKAGE_BUGREPORT); printf(_("Report errors and bugs to %s, please.\n"), PACKAGE_BUGREPORT);
} }
...@@ -109,10 +110,10 @@ static void handle_options(int *argc, const char ***argv) ...@@ -109,10 +110,10 @@ static void handle_options(int *argc, const char ***argv)
for (x = 0; x < *argc && ((*argv)[x])[0] == '-'; x++) { for (x = 0; x < *argc && ((*argv)[x])[0] == '-'; x++) {
const char *param = (*argv)[x]; const char *param = (*argv)[x];
if (!strcmp(param, "-h") || !strcmp(param, "--help")){ if (!strcmp(param, "-h") || !strcmp(param, "--help")) {
print_help(); print_help();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (!strcmp(param, "-c") || !strcmp(param, "--cpu")){ } else if (!strcmp(param, "-c") || !strcmp(param, "--cpu")) {
if (*argc < 2) { if (*argc < 2) {
print_help(); print_help();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
...@@ -132,13 +133,14 @@ static void handle_options(int *argc, const char ***argv) ...@@ -132,13 +133,14 @@ static void handle_options(int *argc, const char ***argv)
/* Cut out param: cpupower -c 1 info -> cpupower info */ /* Cut out param: cpupower -c 1 info -> cpupower info */
new_argc += 2; new_argc += 2;
continue; continue;
} else if (!strcmp(param, "-v") || !strcmp(param, "--version")){ } else if (!strcmp(param, "-v") ||
!strcmp(param, "--version")) {
print_version(); print_version();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
#ifdef DEBUG #ifdef DEBUG
} else if (!strcmp(param, "-d") || !strcmp(param, "--debug")){ } else if (!strcmp(param, "-d") || !strcmp(param, "--debug")) {
be_verbose = 1; be_verbose = 1;
new_argc ++; new_argc++;
continue; continue;
#endif #endif
} else { } else {
...@@ -171,7 +173,7 @@ int main(int argc, const char *argv[]) ...@@ -171,7 +173,7 @@ int main(int argc, const char *argv[])
} }
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
textdomain (PACKAGE); textdomain(PACKAGE);
/* Turn "perf cmd --help" into "perf help cmd" */ /* Turn "perf cmd --help" into "perf help cmd" */
if (argc > 1 && !strcmp(argv[1], "--help")) { if (argc > 1 && !strcmp(argv[1], "--help")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7