Commit d3f5d2a1 authored by Janakarajan Natarajan's avatar Janakarajan Natarajan Committed by Shuah Khan
Browse files

cpupower: Move needs_root variable into a sub-struct 



Move the needs_root variable into a sub-struct. This is in preparation
for adding a new flag for cpuidle_monitor.

Update all uses of the needs_root variable to reflect this change.

Signed-off-by: default avatarJanakarajan Natarajan <Janakarajan.Natarajan@amd.com>
Acked-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent d80a4ac2

tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ struct cpuidle_monitor amd_fam14h_monitor = { 
	.stop			= amd_fam14h_stop,

	.do_register		= amd_fam14h_register,

	.unregister		= amd_fam14h_unregister,

	.needs_root		= 1,

	.flags.needs_root	= 1,

	.overflow_s		= OVERFLOW_MS / 1000,

};

#endif /* #if defined(__i386__) || defined(__x86_64__) */

tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -207,6 +207,6 @@ struct cpuidle_monitor cpuidle_sysfs_monitor = { 
	.stop			= cpuidle_stop,

	.do_register		= cpuidle_register,

	.unregister		= cpuidle_unregister,

	.needs_root		= 0,

	.flags.needs_root	= 0,

	.overflow_s		= UINT_MAX,

};

tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ int cmd_monitor(int argc, char **argv) 
		dprint("Try to register: %s\n", all_monitors[num]->name);

		test_mon = all_monitors[num]->do_register();

		if (test_mon) {

			if (test_mon->needs_root && !run_as_root) {

			if (test_mon->flags.needs_root && !run_as_root) {

				fprintf(stderr, _("Available monitor %s needs "

					  "root access\n"), test_mon->name);

				continue;

tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ struct cpuidle_monitor { 
	struct cpuidle_monitor* (*do_register) (void);

	void (*unregister)(void);

	unsigned int overflow_s;

	int needs_root;

	struct {

		unsigned int needs_root:1;

	} flags;

};



extern long long timespec_diff_us(struct timespec start, struct timespec end);

tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct cpuidle_monitor intel_hsw_ext_monitor = { 
	.stop			= hsw_ext_stop,

	.do_register		= hsw_ext_register,

	.unregister		= hsw_ext_unregister,

	.needs_root		= 1,

	.flags.needs_root	= 1,

	.overflow_s		= 922000000 /* 922337203 seconds TSC overflow

					       at 20GHz */

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE