From: Karel Zak <kzak@redhat.com>
Date: Tue, 19 Jan 2016 13:46:30 +0000 (+0100)
Subject: chrt: set function refactoring
X-Git-Tag: v2.28-rc1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4820a7373a5809446d7d7ea56b774c0841853b91;p=thirdparty%2Futil-linux.git

chrt: set function refactoring

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index fc518eaa10..f0490d9053 100644
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -224,11 +224,33 @@ static void show_min_max(void)
 	}
 }
 
+static void set_sched(struct chrt_ctl *ctl)
+{
+	struct sched_param sp = { .sched_priority = ctl->priority };
+
+	if (ctl->all_tasks) {
+		pid_t tid;
+		struct proc_tasks *ts = proc_open_tasks(ctl->pid);
+
+		if (!ts)
+			err(EXIT_FAILURE, _("cannot obtain the list of tasks"));
+
+		while (!proc_next_tid(ts, &tid))
+			if (sched_setscheduler(tid, ctl->policy, &sp) == -1)
+				err(EXIT_FAILURE, _("failed to set tid %d's policy"), tid);
+
+		proc_close_tasks(ts);
+
+	} else if (sched_setscheduler(ctl->pid, ctl->policy, &sp) == -1)
+		err(EXIT_FAILURE, _("failed to set pid %d's policy"), ctl->pid);
+
+	ctl->altered = 1;
+}
+
 int main(int argc, char **argv)
 {
 	struct chrt_ctl _ctl = { .pid = -1 }, *ctl = &_ctl;
-	struct sched_param sp;
-	int i;
+	int c;
 
 	static const struct option longopts[] = {
 		{ "all-tasks",  0, NULL, 'a' },
@@ -251,11 +273,11 @@ int main(int argc, char **argv)
 	textdomain(PACKAGE);
 	atexit(close_stdout);
 
-	while((i = getopt_long(argc, argv, "+abfiphmoRrvV", longopts, NULL)) != -1)
+	while((c = getopt_long(argc, argv, "+abfiphmoRrvV", longopts, NULL)) != -1)
 	{
 		int ret = EXIT_FAILURE;
 
-		switch (i) {
+		switch (c) {
 		case 'a':
 			ctl->all_tasks = 1;
 			break;
@@ -326,22 +348,8 @@ int main(int argc, char **argv)
 
 	if (ctl->pid == -1)
 		ctl->pid = 0;
-	sp.sched_priority = ctl->priority;
-
-	if (ctl->all_tasks) {
-		pid_t tid;
-		struct proc_tasks *ts = proc_open_tasks(ctl->pid);
-
-		if (!ts)
-			err(EXIT_FAILURE, _("cannot obtain the list of tasks"));
-		while (!proc_next_tid(ts, &tid))
-			if (sched_setscheduler(tid, ctl->policy, &sp) == -1)
-				err(EXIT_FAILURE, _("failed to set tid %d's policy"), tid);
-		proc_close_tasks(ts);
-	} else if (sched_setscheduler(ctl->pid, ctl->policy, &sp) == -1)
-		err(EXIT_FAILURE, _("failed to set pid %d's policy"), ctl->pid);
 
-	ctl->altered = 1;
+	set_sched(ctl);
 
 	if (ctl->verbose)
 		show_sched_info(ctl);